From 182a52a4bc28f8c5cea1b1a7bf0c3b31813ad09b Mon Sep 17 00:00:00 2001 From: devxb Date: Wed, 27 Dec 2023 10:41:34 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=9C=A0=EC=A0=80=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9D=98=20Character=EB=A5=BC=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9=EC=8B=9C=ED=82=A8=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/teumteum/user/domain/Character.java | 19 ------------------- .../java/net/teumteum/user/domain/User.java | 4 ++-- .../db/migration/V1__create_users.sql | 1 - .../net/teumteum/user/domain/UserFixture.java | 5 +++-- src/test/resources/schema.sql | 1 - 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/net/teumteum/user/domain/Character.java diff --git a/src/main/java/net/teumteum/user/domain/Character.java b/src/main/java/net/teumteum/user/domain/Character.java deleted file mode 100644 index 362df1ce..00000000 --- a/src/main/java/net/teumteum/user/domain/Character.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.teumteum.user.domain; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import lombok.AllArgsConstructor; -import lombok.NoArgsConstructor; - -@Embeddable -@NoArgsConstructor -@AllArgsConstructor -public class Character { - - @Column(name = "character_id") - private Long characterId; - - @Column(name = "background_color_id") - private Long backgroundColorId; - -} diff --git a/src/main/java/net/teumteum/user/domain/User.java b/src/main/java/net/teumteum/user/domain/User.java index 9d4943e1..63dcaede 100644 --- 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 index 970683d1..18b7dfca 100644 --- 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 index fa3cb794..652f43ca 100644 --- 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 index 970683d1..18b7dfca 100644 --- 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),