#87 fix: 모든 엔티티 대체키 반영

기존 id -> token으로 변경 id -> Long 타입 token -> String 타입
TeamSynergyy · Jun 10, 2024 · 6db3df7 · 6db3df7
1 parent 2f68349
commit 6db3df7
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 24 deletions.
diff --git a/src/main/java/com/seoultech/synergybe/domain/postlike/PostLike.java b/src/main/java/com/seoultech/synergybe/domain/postlike/PostLike.java
@@ -17,7 +17,10 @@
 public class PostLike extends BaseTime {
     @Id
     @Column(name = "post_like_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "post_like_token")
+    private String postLikeToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
@@ -32,8 +35,9 @@ public class PostLike extends BaseTime {
     private LikeStatus likeStatus = LikeStatus.LIKE;
 
     @Builder
-    public PostLike(String id, User user, Post post) {
+    public PostLike(Long id, String postLikeToken, User user, Post post) {
         this.id = id;
+        this.postLikeToken = postLikeToken;
         this.user = user;
         this.post = post;
         post.getLikes().add(this);

diff --git a/src/main/java/com/seoultech/synergybe/domain/project/Project.java b/src/main/java/com/seoultech/synergybe/domain/project/Project.java
@@ -33,12 +33,10 @@
 public class Project extends BaseTime {
     @Id
     @Column(name = "project_id")
-    private String id;
+    private Long id;
 
-//    @Id
-//    @Column(name = "project_sequence")
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    private Long seq;
+    @Column(name = "project_token")
+    private String projectToken;
 
     @Embedded
     private ProjectName name;
@@ -88,9 +86,10 @@ public class Project extends BaseTime {
     private List<Schedule> schedules = new ArrayList<>();
 
     @Builder
-    public Project(String id, String name, String content, ProjectField field, Point location, LocalDateTime startAt,
+    public Project(Long id, String projectToken, String name, String content, ProjectField field, Point location, LocalDateTime startAt,
                    LocalDateTime endAt, String leaderId) {
         this.id = id;
+        this.projectToken = projectToken;
         this.name = new ProjectName(name);
         this.content = new ProjectContent(content);
         this.field = field;

diff --git a/src/main/java/com/seoultech/synergybe/domain/projectlike/ProjectLike.java b/src/main/java/com/seoultech/synergybe/domain/projectlike/ProjectLike.java
@@ -18,7 +18,10 @@
 public class ProjectLike extends BaseTime {
     @Id
     @Column(name = "project_like_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "project_like_token")
+    private String projectLikeToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
@@ -35,8 +38,9 @@ public class ProjectLike extends BaseTime {
 
 
     @Builder
-    public ProjectLike(String id, User user, Project project) {
+    public ProjectLike(Long id, String projectLikeToken, User user, Project project) {
         this.id = id;
+        this.projectLikeToken = projectLikeToken;
         this.user = user;
         this.project = project;
         project.getLikes().add(this);

diff --git a/src/main/java/com/seoultech/synergybe/domain/projectuser/ProjectUser.java b/src/main/java/com/seoultech/synergybe/domain/projectuser/ProjectUser.java
@@ -16,7 +16,10 @@
 public class ProjectUser extends BaseTime {
     @Id
     @Column(name = "project_user_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "project_user_token")
+    private String projectUserToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "project_id")
@@ -27,8 +30,9 @@ public class ProjectUser extends BaseTime {
     private User user;
 
     @Builder
-    public ProjectUser(String id, Project project, User user) {
+    public ProjectUser(Long id, String projectUserToken, Project project, User user) {
         this.id = id;
+        this.projectUserToken = projectUserToken;
         this.project = project;
         this.user = user;
     }

diff --git a/src/main/java/com/seoultech/synergybe/domain/rate/Rate.java b/src/main/java/com/seoultech/synergybe/domain/rate/Rate.java
@@ -25,7 +25,10 @@
 public class Rate extends BaseTime {
     @Id
     @Column(name = "rate_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "rate_token")
+    private String rateToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "project_id")
@@ -49,8 +52,9 @@ public class Rate extends BaseTime {
     private RateContent content;
 
     @Builder
-    public Rate(String id, Project project, User giveUser, User receiveUser, int score, String content) {
+    public Rate(Long id, String rateToken, Project project, User giveUser, User receiveUser, int score, String content) {
         this.id = id;
+        this.rateToken = rateToken;
         this.project = project;
         this.giveUser = giveUser;
         this.receiveUser = receiveUser;

diff --git a/src/main/java/com/seoultech/synergybe/domain/schedule/Schedule.java b/src/main/java/com/seoultech/synergybe/domain/schedule/Schedule.java
@@ -27,7 +27,10 @@
 public class Schedule extends BaseTime {
     @Id
     @Column(name = "schedule_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "schedule_token")
+    private String scheduleToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "project_id")
@@ -48,8 +51,9 @@ public class Schedule extends BaseTime {
     private SchedulePeriod period;
 
     @Builder
-    public Schedule(String id, Project project, String title, String content, String label, LocalDateTime startAt, LocalDateTime endAt) {
+    public Schedule(Long id, String scheduleToken, Project project, String title, String content, String label, LocalDateTime startAt, LocalDateTime endAt) {
         this.id = id;
+        this.scheduleToken = scheduleToken;
         this.title = new ScheduleTitle(title);
         this.content = new ScheduleContent(content);
         this.label = label;

diff --git a/src/main/java/com/seoultech/synergybe/domain/ticket/Ticket.java b/src/main/java/com/seoultech/synergybe/domain/ticket/Ticket.java
@@ -31,7 +31,10 @@
 public class Ticket extends BaseTime {
     @Id
     @Column(name = "ticket_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "ticket_token")
+    private String ticketToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "project_id")
@@ -60,9 +63,10 @@ public class Ticket extends BaseTime {
     private IsDeleted isDeleted = new IsDeleted(IS_DELETED_DEFAULT);
 
     @Builder
-    public Ticket(String id, String name, String content, Integer orderNumber, String tag, Project project,
+    public Ticket(Long id, String ticketToken, String name, String content, Integer orderNumber, String tag, Project project,
                   String tagColor) {
         this.id = id;
+        this.ticketToken = ticketToken;
         this.name = new TicketName(name);
         this.content = new TicketContent(content);
         this.information = new TicketTagInformation(tag, tagColor);

diff --git a/src/main/java/com/seoultech/synergybe/domain/ticketUser/TicketUser.java b/src/main/java/com/seoultech/synergybe/domain/ticketUser/TicketUser.java
@@ -15,7 +15,10 @@
 public class TicketUser extends BaseTime {
     @Id
     @Column(name = "ticket_user_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "ticket_user_token")
+    private String ticketUserToken;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "ticket_id")
@@ -26,8 +29,9 @@ public class TicketUser extends BaseTime {
     private User user;
 
     @Builder
-    public TicketUser(String id, Ticket ticket, User user) {
+    public TicketUser(Long id, String ticketUserToken, Ticket ticket, User user) {
         this.id = id;
+        this.ticketUserToken = ticketUserToken;
         this.ticket = ticket;
         this.user = user;
     }

diff --git a/src/main/java/com/seoultech/synergybe/domain/user/User.java b/src/main/java/com/seoultech/synergybe/domain/user/User.java
@@ -16,7 +16,10 @@ public class User extends BaseTime {
 
     @Id
     @Column(name = "user_id")
-    private String id;
+    private Long id;
+
+    @Column(name = "user_token")
+    private String userToken;
 
     @Embedded
     private UserEmail email;
@@ -35,14 +38,16 @@ public class User extends BaseTime {
 
     @Builder
     public User(
-            String id,
+            Long id,
+            String userToken,
             String email,
             String password,
             String name,
             CustomPasswordEncoder passwordEncoder,
             String major
     ) {
         this.id = id;
+        this.userToken = userToken;
         this.email = new UserEmail(email);
         this.password = new UserPassword(password, passwordEncoder);
         this.name = new UserName(name);

diff --git a/src/main/java/com/seoultech/synergybe/domain/user/UserRefreshToken.java b/src/main/java/com/seoultech/synergybe/domain/user/UserRefreshToken.java
@@ -19,14 +19,14 @@ public class UserRefreshToken {
     private Long id;
 
     @Column(name = "user_id")
-    private String userId;
+    private Long userId;
 
 
     @Embedded
     private RefreshToken refreshToken;
 
     public UserRefreshToken(
-            String userId
+            Long userId
     ) {
         this.userId = userId;
         this.refreshToken = new RefreshToken();