-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from SWM-M3PRO/feature/M3-139-entityResetting
M3-139 엔티티 다시 세팅하기
- Loading branch information
Showing
12 changed files
with
251 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
src/main/java/com/m3pro/groundflip/domain/entity/PixelUser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
package com.m3pro.groundflip.domain.entity; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.FetchType; | ||
import jakarta.persistence.GeneratedValue; | ||
import jakarta.persistence.GenerationType; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.JoinColumn; | ||
import jakarta.persistence.ManyToOne; | ||
import jakarta.persistence.Table; | ||
import lombok.AccessLevel; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Entity | ||
@Table(name = "pixel_user") | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@AllArgsConstructor | ||
@Builder | ||
public class PixelUser extends BaseTimeEntity { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
@Column(name = "pixel_user_id") | ||
private Long id; | ||
|
||
@ManyToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "user_id") | ||
private User user; | ||
|
||
@ManyToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "pixel_id") | ||
private Pixel pixel; | ||
|
||
@ManyToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "community_id") | ||
private Community community; | ||
|
||
private LocalDateTime deletedAt; | ||
} |
34 changes: 34 additions & 0 deletions
34
src/main/java/com/m3pro/groundflip/domain/entity/StepRecord.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package com.m3pro.groundflip.domain.entity; | ||
|
||
import java.sql.Date; | ||
|
||
import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.GeneratedValue; | ||
import jakarta.persistence.GenerationType; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.Table; | ||
import lombok.AccessLevel; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Entity | ||
@Table(name = "step_record") | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@AllArgsConstructor | ||
@Builder | ||
public class StepRecord extends BaseTimeEntity { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
@Column(name = "step_record_id") | ||
private Long id; | ||
|
||
private Date date; | ||
|
||
private Integer steps; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,48 @@ | ||
package com.m3pro.groundflip.domain.entity;import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity;import jakarta.persistence.Column;import jakarta.persistence.Entity;import jakarta.persistence.GeneratedValue;import jakarta.persistence.GenerationType;import jakarta.persistence.Id;import jakarta.persistence.Table;import lombok.AccessLevel;import lombok.AllArgsConstructor;import lombok.Builder;import lombok.Getter;import lombok.NoArgsConstructor;@Getter@Entity@Table(name = "user")@NoArgsConstructor(access = AccessLevel.PROTECTED)@AllArgsConstructor@Builderpublic class User extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "user_id") private Long id; private String nickname;} | ||
package com.m3pro.groundflip.domain.entity; | ||
|
||
import java.util.Date; | ||
|
||
import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity; | ||
import com.m3pro.groundflip.enums.Gender; | ||
import com.m3pro.groundflip.enums.Provider; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.GeneratedValue; | ||
import jakarta.persistence.GenerationType; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.Table; | ||
import jakarta.validation.constraints.Email; | ||
import jakarta.validation.constraints.Pattern; | ||
import lombok.AccessLevel; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Entity | ||
@Table(name = "user") | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@AllArgsConstructor | ||
@Builder | ||
public class User extends BaseTimeEntity { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
@Column(name = "user_id") | ||
private Long id; | ||
|
||
@Pattern(regexp = "[가-힣a-zA-Z0-9]{3,10}", message = "닉네임은 한글, 영어, 숫자를 조합해 3글자 이상, 10글자 이하입니다.") | ||
private String nickname; | ||
|
||
private Date birthYear; | ||
|
||
private Gender gender; | ||
|
||
private Provider provider; | ||
|
||
private String email; | ||
|
||
private Date deletedAt; | ||
} |
44 changes: 43 additions & 1 deletion
44
src/main/java/com/m3pro/groundflip/domain/entity/UserCommunity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,43 @@ | ||
package com.m3pro.groundflip.domain.entity;import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity;import jakarta.persistence.Column;import jakarta.persistence.Entity;import jakarta.persistence.FetchType;import jakarta.persistence.GeneratedValue;import jakarta.persistence.GenerationType;import jakarta.persistence.Id;import jakarta.persistence.JoinColumn;import jakarta.persistence.ManyToOne;import jakarta.persistence.Table;import lombok.AccessLevel;import lombok.AllArgsConstructor;import lombok.Builder;import lombok.Getter;import lombok.NoArgsConstructor;@Getter@Entity@Table(name = "user_community")@NoArgsConstructor(access = AccessLevel.PROTECTED)@AllArgsConstructor@Builderpublic class UserCommunity extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "user_community_id") private Long id; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "community_id") private Community community;} | ||
package com.m3pro.groundflip.domain.entity; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
import com.m3pro.groundflip.domain.entity.global.BaseTimeEntity; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.FetchType; | ||
import jakarta.persistence.GeneratedValue; | ||
import jakarta.persistence.GenerationType; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.JoinColumn; | ||
import jakarta.persistence.ManyToOne; | ||
import jakarta.persistence.Table; | ||
import lombok.AccessLevel; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Entity | ||
@Table(name = "user_community") | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
@AllArgsConstructor | ||
@Builder | ||
public class UserCommunity extends BaseTimeEntity { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
@Column(name = "user_community_id") | ||
private Long id; | ||
|
||
@ManyToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "user_id") | ||
private User user; | ||
|
||
@ManyToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "community_id") | ||
private Community community; | ||
|
||
private LocalDateTime deletedAt; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.m3pro.groundflip.enums; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
|
||
@AllArgsConstructor | ||
@Getter | ||
public enum Gender { | ||
MALE("남성"), | ||
FEMALE("여성"); | ||
|
||
private final String gender; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.m3pro.groundflip.enums; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
|
||
@AllArgsConstructor | ||
@Getter | ||
public enum Provider { | ||
MALE("네이버"), | ||
GOOGLE("구글"), | ||
APPLE("애플"), | ||
KAKAO("카카오"); | ||
|
||
private final String provider; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,35 @@ | ||
DROP PROCEDURE IF EXISTS insertPixel;DELIMITER $$CREATE PROCEDURE insertPixel ()BEGIN DECLARE lat_per_pixel DOUBLE DEFAULT 0.0000724; DECLARE lon_per_pixel DOUBLE DEFAULT 0.000909; DECLARE upper_left_lat DOUBLE DEFAULT 38.240675; DECLARE upper_left_lon DOUBLE DEFAULT 125.905952; DECLARE current_lat DOUBLE; DECLARE current_lon DOUBLE; DECLARE i BIGINT DEFAULT 0; DECLARE j BIGINT DEFAULT 0; SET current_lat = upper_left_lat; SET current_lon = upper_left_lon; WHILE i < 7000 DO START TRANSACTION; SET current_lat = upper_left_lat - (i * lat_per_pixel); SET j = 0; WHILE j < 4156 DO SET current_lon = upper_left_lon + (j * lon_per_pixel);INSERT INTO pixel (latitude, longitude, x, y, created_at, modified_at) VALUES (current_lat, current_lon, i, j, NOW(), NOW());SET j = j + 1;END WHILE; SET current_lon = upper_left_lon; -- Reset current longitude to the initial value SET i = i + 1;COMMIT;END WHILE;END $$DELIMITER ;-- Call the stored procedure to insert the coordinatesCALL InsertPixel(); | ||
DROP PROCEDURE IF EXISTS insertPixel; | ||
DELIMITER $$ | ||
CREATE PROCEDURE insertPixel() | ||
BEGIN | ||
DECLARE lat_per_pixel DOUBLE DEFAULT 0.0000724; | ||
DECLARE lon_per_pixel DOUBLE DEFAULT 0.000909; | ||
DECLARE upper_left_lat DOUBLE DEFAULT 38.240675; | ||
DECLARE upper_left_lon DOUBLE DEFAULT 125.905952; | ||
DECLARE current_lat DOUBLE; | ||
DECLARE current_lon DOUBLE; | ||
DECLARE i BIGINT DEFAULT 0; | ||
DECLARE j BIGINT DEFAULT 0; | ||
SET current_lat = upper_left_lat; | ||
SET current_lon = upper_left_lon; | ||
START TRANSACTION; | ||
WHILE i < 7000 | ||
DO | ||
SET current_lat = upper_left_lat - (i * lat_per_pixel); | ||
SET j = 0; | ||
WHILE j < 4156 | ||
DO | ||
SET current_lon = upper_left_lon + (j * lon_per_pixel); | ||
INSERT INTO pixel (coordinate, x, y, created_at, modified_at) | ||
VALUES (ST_GeomFromText(CONCAT('POINT(', current_lat, ' ', current_lon, ')'), 4326), i, j, NOW(), | ||
NOW()); | ||
SET j = j + 1; | ||
END WHILE; | ||
SET current_lon = upper_left_lon; -- Reset current longitude to the initial value | ||
SET i = i + 1; | ||
END WHILE; | ||
COMMIT; | ||
END $$ | ||
DELIMITER ; | ||
-- Call the stored procedure to insert the coordinates | ||
CALL InsertPixel(); |