From f3d8f664425760f7ebba8c4bc3a7a011f56b18cc Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sat, 28 Jun 2025 04:13:37 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20preparationStatus=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../solidconnection/auth/dto/SignUpRequest.java | 12 ++++++++---- ...{PreparationStatus.java => ExchangeStatus.java} | 6 ++++-- .../solidconnection/siteuser/domain/SiteUser.java | 14 +++++++------- .../solidconnection/e2e/DynamicFixture.java | 4 ++-- .../authentication/SiteUserAuthenticationTest.java | 4 ++-- .../siteuser/fixture/SiteUserFixtureBuilder.java | 4 ++-- .../repository/SiteUserRepositoryTest.java | 4 ++-- 7 files changed, 27 insertions(+), 21 deletions(-) rename src/main/java/com/example/solidconnection/siteuser/domain/{PreparationStatus.java => ExchangeStatus.java} (82%) diff --git a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java index b43671e82..8f72d25da 100644 --- a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java +++ b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java @@ -1,9 +1,10 @@ package com.example.solidconnection.auth.dto; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.ExchangeStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import java.util.List; @@ -12,7 +13,10 @@ public record SignUpRequest( String signUpToken, List interestedRegions, List interestedCountries, - PreparationStatus preparationStatus, + + @JsonProperty("preparationStatus") + ExchangeStatus exchangeStatus, + String profileImageUrl, @NotBlank(message = "닉네임을 입력해주세요.") @@ -23,7 +27,7 @@ public SiteUser toOAuthSiteUser(String email, AuthType authType) { email, this.nickname, this.profileImageUrl, - this.preparationStatus, + this.exchangeStatus, Role.MENTEE, authType ); @@ -34,7 +38,7 @@ public SiteUser toEmailSiteUser(String email, String encodedPassword) { email, this.nickname, this.profileImageUrl, - this.preparationStatus, + this.exchangeStatus, Role.MENTEE, AuthType.EMAIL, encodedPassword diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java b/src/main/java/com/example/solidconnection/siteuser/domain/ExchangeStatus.java similarity index 82% rename from src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java rename to src/main/java/com/example/solidconnection/siteuser/domain/ExchangeStatus.java index 6f86853c0..6373f8729 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/ExchangeStatus.java @@ -1,8 +1,10 @@ package com.example.solidconnection.siteuser.domain; -public enum PreparationStatus { +public enum ExchangeStatus { + CONSIDERING, // 교환학생 지원 고민 상태 PREPARING_FOR_DEPARTURE, // 교환학생 합격 후 파견 준비 상태 STUDYING_ABROAD, // 해외 학교에서 공부중인 상태 - AFTER_EXCHANGE + AFTER_EXCHANGE, + ; } diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index 98c18b56a..7c065c8e1 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -64,7 +64,7 @@ public class SiteUser { @Column(nullable = false) @Enumerated(EnumType.STRING) - private PreparationStatus preparationStage; + private ExchangeStatus exchangeStatus; @Column(nullable = false) @Enumerated(EnumType.STRING) @@ -98,12 +98,12 @@ public SiteUser( String email, String nickname, String profileImageUrl, - PreparationStatus preparationStage, + ExchangeStatus exchangeStatus, Role role) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.preparationStage = preparationStage; + this.exchangeStatus = exchangeStatus; this.role = role; this.authType = AuthType.KAKAO; } @@ -112,13 +112,13 @@ public SiteUser( String email, String nickname, String profileImageUrl, - PreparationStatus preparationStage, + ExchangeStatus exchangeStatus, Role role, AuthType authType) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.preparationStage = preparationStage; + this.exchangeStatus = exchangeStatus; this.role = role; this.authType = authType; } @@ -128,14 +128,14 @@ public SiteUser( String email, String nickname, String profileImageUrl, - PreparationStatus preparationStage, + ExchangeStatus exchangeStatus, Role role, AuthType authType, String password) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.preparationStage = preparationStage; + this.exchangeStatus = exchangeStatus; this.role = role; this.authType = authType; this.password = password; diff --git a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java index 5187877d2..3c128c69b 100644 --- a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java +++ b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java @@ -1,6 +1,6 @@ package com.example.solidconnection.e2e; -import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.ExchangeStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -11,7 +11,7 @@ public static SiteUser createSiteUserByEmailAndNickname(String email, String nic email, nickname, "profileImage", - PreparationStatus.CONSIDERING, + ExchangeStatus.CONSIDERING, Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java index 8c3b9e216..29b47869d 100644 --- a/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java +++ b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.security.authentication; import com.example.solidconnection.security.userdetails.SiteUserDetails; -import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.ExchangeStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import org.junit.jupiter.api.Test; @@ -63,7 +63,7 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - PreparationStatus.CONSIDERING, + ExchangeStatus.CONSIDERING, Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java index 46db8bae4..901de4d6a 100644 --- a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.siteuser.fixture; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.ExchangeStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -62,7 +62,7 @@ public SiteUser create() { email, nickname, profileImageUrl, - PreparationStatus.CONSIDERING, + ExchangeStatus.CONSIDERING, role, authType, passwordEncoder.encode(password) diff --git a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java index b8c51c148..115e40e77 100644 --- a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.siteuser.repository; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.ExchangeStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.TestContainerDataJpaTest; @@ -83,7 +83,7 @@ private SiteUser createSiteUser(String email, String nickname, AuthType authType email, nickname, "profileImageUrl", - PreparationStatus.CONSIDERING, + ExchangeStatus.CONSIDERING, Role.MENTEE, authType ); From c587feff385055fb3feb9c0f4ada797ec0434a29 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sat, 28 Jun 2025 04:13:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PreparationStatus -> ExchangeStudentStatus chore: 컬럼명 변경 flyway 스크립트 추가 --- .../resources/db/migration/V17__rename_preparation_status.sql | 1 + src/main/resources/secret | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/V17__rename_preparation_status.sql diff --git a/src/main/resources/db/migration/V17__rename_preparation_status.sql b/src/main/resources/db/migration/V17__rename_preparation_status.sql new file mode 100644 index 000000000..0eba9ae66 --- /dev/null +++ b/src/main/resources/db/migration/V17__rename_preparation_status.sql @@ -0,0 +1 @@ +ALTER TABLE site_user RENAME COLUMN preparation_stage TO exchange_status; diff --git a/src/main/resources/secret b/src/main/resources/secret index 84002e866..5ddc9c656 160000 --- a/src/main/resources/secret +++ b/src/main/resources/secret @@ -1 +1 @@ -Subproject commit 84002e86670d380219f580c6605fb7c66ed7d977 +Subproject commit 5ddc9c656dc1e6c9b25ba9ea014aaa65edc74a1c From b1305bfabfe30f7de505f3a7b5b7f76deebab10a Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Tue, 1 Jul 2025 17:00:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20flyway=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._preparation_status.sql => V18__rename_preparation_status.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/{V17__rename_preparation_status.sql => V18__rename_preparation_status.sql} (100%) diff --git a/src/main/resources/db/migration/V17__rename_preparation_status.sql b/src/main/resources/db/migration/V18__rename_preparation_status.sql similarity index 100% rename from src/main/resources/db/migration/V17__rename_preparation_status.sql rename to src/main/resources/db/migration/V18__rename_preparation_status.sql