refactor: 유저도메인의 Character를 통합시킨다

depromeet · Dec 27, 2023 · 182a52a · 182a52a
1 parent f2ce63a
commit 182a52a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/src/main/java/net/teumteum/user/domain/Character.java b/src/main/java/net/teumteum/user/domain/Character.java
diff --git a/src/main/java/net/teumteum/user/domain/User.java b/src/main/java/net/teumteum/user/domain/User.java
@@ -32,8 +32,8 @@ public class User {
     @DateTimeFormat(pattern = "yyyy.MM.dd")
     private String birth;
 
-    @Embedded
-    private Character character;
+    @Column(name = "character_id")
+    private Long characterId;
 
     @Column(name = "manner_temperature")
     private int mannerTemperature;

diff --git a/src/main/resources/db/migration/V1__create_users.sql b/src/main/resources/db/migration/V1__create_users.sql
@@ -2,7 +2,6 @@ create table if not exists users(
   certificated boolean,
   manner_temperature integer,
   mbti varchar(4),
-  background_color_id bigint,
   character_id bigint,
   id bigint not null,
   birth varchar(10),

diff --git a/src/test/java/net/teumteum/user/domain/UserFixture.java b/src/test/java/net/teumteum/user/domain/UserFixture.java
@@ -1,5 +1,6 @@
 package net.teumteum.user.domain;
 
+import jakarta.persistence.Column;
 import java.util.List;
 import lombok.Builder;
 
@@ -20,7 +21,7 @@ public static User newUserByBuilder(UserBuilder userBuilder) {
             userBuilder.id,
             userBuilder.name,
             userBuilder.birth,
-            userBuilder.character,
+            userBuilder.characterId,
             userBuilder.mannerTemperature,
             userBuilder.oauth,
             userBuilder.activityArea,
@@ -42,7 +43,7 @@ public static class UserBuilder {
         @Builder.Default
         private String birth = "2000.02.05";
         @Builder.Default
-        private Character character = new Character(1L, 1L);
+        private Long characterId = 1L;
         @Builder.Default
         private int mannerTemperature = 36;
         @Builder.Default

diff --git a/src/test/resources/schema.sql b/src/test/resources/schema.sql
@@ -2,7 +2,6 @@ create table if not exists users(
   certificated boolean,
   manner_temperature integer,
   mbti varchar(4),
-  background_color_id bigint,
   character_id bigint,
   id bigint not null,
   birth varchar(10),