fix: apply ulid

ALLBACK-2022 · Oct 9, 2023 · f58e2ab · f58e2ab
1 parent 3a65168
commit f58e2ab
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -40,6 +40,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'com.github.f4b6a3:ulid-creator:5.2.2'
 
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'

diff --git a/backend/src/main/java/com/doodledoodle/backend/dictionary/entity/Dictionary.java b/backend/src/main/java/com/doodledoodle/backend/dictionary/entity/Dictionary.java
@@ -7,6 +7,10 @@
 
 import javax.persistence.*;
 
+/**
+ * 서비스 특성상 초기 SQL 파일로 데이터 저장 후 스프링 코드 상에서 조회만 되는 엔티티입니다.
+ */
+
 @Getter
 @Entity
 @EqualsAndHashCode(of = "englishName")

diff --git a/backend/src/main/java/com/doodledoodle/backend/draw/entity/Draw.java b/backend/src/main/java/com/doodledoodle/backend/draw/entity/Draw.java
@@ -4,6 +4,7 @@
 import com.doodledoodle.backend.global.audit.AuditListener;
 import com.doodledoodle.backend.global.audit.Auditable;
 import com.doodledoodle.backend.global.audit.BaseTime;
+import com.github.f4b6a3.ulid.UlidCreator;
 import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
 
@@ -18,17 +19,16 @@
 public class Draw implements Auditable {
 
     @Id
-    @GeneratedValue(generator = "uuid2")
-    @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    private UUID id;
+    @Column(name = "id", columnDefinition = "BINARY(16)")
+    private UUID id = UlidCreator.getMonotonicUlid().toUuid();
 
     private String imageUrl;
 
     @Column(nullable = false)
     private Integer playerNo;
 
-    @JoinColumn
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(columnDefinition = "BINARY(16)")
     private Game game;
 
     @Setter

diff --git a/backend/src/main/java/com/doodledoodle/backend/game/entity/Game.java b/backend/src/main/java/com/doodledoodle/backend/game/entity/Game.java
@@ -4,6 +4,7 @@
 import com.doodledoodle.backend.global.audit.AuditListener;
 import com.doodledoodle.backend.global.audit.Auditable;
 import com.doodledoodle.backend.global.audit.BaseTime;
+import com.github.f4b6a3.ulid.UlidCreator;
 import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
 
@@ -17,9 +18,8 @@
 public class Game implements Auditable {
 
     @Id
-    @GeneratedValue(generator = "uuid2")
-    @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    private UUID id;
+    @Column(name = "id", columnDefinition = "BINARY(16)")
+    private UUID id = UlidCreator.getMonotonicUlid().toUuid();
 
     @JoinColumn
     @ManyToOne(fetch = FetchType.LAZY)

diff --git a/backend/src/main/java/com/doodledoodle/backend/result/entity/Result.java b/backend/src/main/java/com/doodledoodle/backend/result/entity/Result.java
@@ -17,14 +17,12 @@
 @EqualsAndHashCode(of = "draw")
 @EntityListeners(AuditListener.class)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Table(indexes =
-        {@Index(name = "game_id_index", columnList = "game_id"),
-                @Index(name = "draw_id_index", columnList = "draw_id")})
 public class Result implements Auditable {
 
     @Id
     @GeneratedValue(generator = "uuid2")
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
+    @Column(name = "id", columnDefinition = "BINARY(16)")
     private UUID id;
 
     @JoinColumn
@@ -34,12 +32,12 @@ public class Result implements Auditable {
     @Column(nullable = false)
     private Double similarity;
 
-    @JoinColumn
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(columnDefinition = "BINARY(16)")
     private Game game;
 
-    @JoinColumn
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(columnDefinition = "BINARY(16)")
     private Draw draw;
 
     @Column(nullable = false)