Skip to content

Commit 5a006a4

Browse files
authored
refactor: 교환학생 준비 상태의 컬럼명 변경 (#351)
* refactor: preparationStatus 필드 이름 변경 * refactor: 엔티티 필드명 변경 - PreparationStatus -> ExchangeStudentStatus chore: 컬럼명 변경 flyway 스크립트 추가 * chore: flyway 스크립트 버전 수정
1 parent aa0ff59 commit 5a006a4

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.example.solidconnection.auth.dto;
22

33
import com.example.solidconnection.siteuser.domain.AuthType;
4-
import com.example.solidconnection.siteuser.domain.PreparationStatus;
4+
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
55
import com.example.solidconnection.siteuser.domain.Role;
66
import com.example.solidconnection.siteuser.domain.SiteUser;
7+
import com.fasterxml.jackson.annotation.JsonProperty;
78
import jakarta.validation.constraints.NotBlank;
89

910
import java.util.List;
@@ -12,7 +13,10 @@ public record SignUpRequest(
1213
String signUpToken,
1314
List<String> interestedRegions,
1415
List<String> interestedCountries,
15-
PreparationStatus preparationStatus,
16+
17+
@JsonProperty("preparationStatus")
18+
ExchangeStatus exchangeStatus,
19+
1620
String profileImageUrl,
1721

1822
@NotBlank(message = "닉네임을 입력해주세요.")
@@ -23,7 +27,7 @@ public SiteUser toOAuthSiteUser(String email, AuthType authType) {
2327
email,
2428
this.nickname,
2529
this.profileImageUrl,
26-
this.preparationStatus,
30+
this.exchangeStatus,
2731
Role.MENTEE,
2832
authType
2933
);
@@ -34,7 +38,7 @@ public SiteUser toEmailSiteUser(String email, String encodedPassword) {
3438
email,
3539
this.nickname,
3640
this.profileImageUrl,
37-
this.preparationStatus,
41+
this.exchangeStatus,
3842
Role.MENTEE,
3943
AuthType.EMAIL,
4044
encodedPassword

src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java renamed to src/main/java/com/example/solidconnection/siteuser/domain/ExchangeStatus.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.example.solidconnection.siteuser.domain;
22

3-
public enum PreparationStatus {
3+
public enum ExchangeStatus {
4+
45
CONSIDERING, // 교환학생 지원 고민 상태
56
PREPARING_FOR_DEPARTURE, // 교환학생 합격 후 파견 준비 상태
67
STUDYING_ABROAD, // 해외 학교에서 공부중인 상태
7-
AFTER_EXCHANGE
8+
AFTER_EXCHANGE,
9+
;
810
}

src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class SiteUser {
6464

6565
@Column(nullable = false)
6666
@Enumerated(EnumType.STRING)
67-
private PreparationStatus preparationStage;
67+
private ExchangeStatus exchangeStatus;
6868

6969
@Column(nullable = false)
7070
@Enumerated(EnumType.STRING)
@@ -98,12 +98,12 @@ public SiteUser(
9898
String email,
9999
String nickname,
100100
String profileImageUrl,
101-
PreparationStatus preparationStage,
101+
ExchangeStatus exchangeStatus,
102102
Role role) {
103103
this.email = email;
104104
this.nickname = nickname;
105105
this.profileImageUrl = profileImageUrl;
106-
this.preparationStage = preparationStage;
106+
this.exchangeStatus = exchangeStatus;
107107
this.role = role;
108108
this.authType = AuthType.KAKAO;
109109
}
@@ -112,13 +112,13 @@ public SiteUser(
112112
String email,
113113
String nickname,
114114
String profileImageUrl,
115-
PreparationStatus preparationStage,
115+
ExchangeStatus exchangeStatus,
116116
Role role,
117117
AuthType authType) {
118118
this.email = email;
119119
this.nickname = nickname;
120120
this.profileImageUrl = profileImageUrl;
121-
this.preparationStage = preparationStage;
121+
this.exchangeStatus = exchangeStatus;
122122
this.role = role;
123123
this.authType = authType;
124124
}
@@ -128,14 +128,14 @@ public SiteUser(
128128
String email,
129129
String nickname,
130130
String profileImageUrl,
131-
PreparationStatus preparationStage,
131+
ExchangeStatus exchangeStatus,
132132
Role role,
133133
AuthType authType,
134134
String password) {
135135
this.email = email;
136136
this.nickname = nickname;
137137
this.profileImageUrl = profileImageUrl;
138-
this.preparationStage = preparationStage;
138+
this.exchangeStatus = exchangeStatus;
139139
this.role = role;
140140
this.authType = authType;
141141
this.password = password;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE site_user RENAME COLUMN preparation_stage TO exchange_status;

src/main/resources/secret

src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.solidconnection.security.authentication;
22

33
import com.example.solidconnection.security.userdetails.SiteUserDetails;
4-
import com.example.solidconnection.siteuser.domain.PreparationStatus;
4+
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
55
import com.example.solidconnection.siteuser.domain.Role;
66
import com.example.solidconnection.siteuser.domain.SiteUser;
77
import org.junit.jupiter.api.Test;
@@ -63,7 +63,7 @@ private SiteUser createSiteUser() {
6363
6464
"nickname",
6565
"profileImageUrl",
66-
PreparationStatus.CONSIDERING,
66+
ExchangeStatus.CONSIDERING,
6767
Role.MENTEE
6868
);
6969
}

src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.solidconnection.siteuser.fixture;
22

33
import com.example.solidconnection.siteuser.domain.AuthType;
4-
import com.example.solidconnection.siteuser.domain.PreparationStatus;
4+
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
55
import com.example.solidconnection.siteuser.domain.Role;
66
import com.example.solidconnection.siteuser.domain.SiteUser;
77
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
@@ -62,7 +62,7 @@ public SiteUser create() {
6262
email,
6363
nickname,
6464
profileImageUrl,
65-
PreparationStatus.CONSIDERING,
65+
ExchangeStatus.CONSIDERING,
6666
role,
6767
authType,
6868
passwordEncoder.encode(password)

src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.solidconnection.siteuser.repository;
22

33
import com.example.solidconnection.siteuser.domain.AuthType;
4-
import com.example.solidconnection.siteuser.domain.PreparationStatus;
4+
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
55
import com.example.solidconnection.siteuser.domain.Role;
66
import com.example.solidconnection.siteuser.domain.SiteUser;
77
import com.example.solidconnection.support.TestContainerDataJpaTest;
@@ -83,7 +83,7 @@ private SiteUser createSiteUser(String email, String nickname, AuthType authType
8383
email,
8484
nickname,
8585
"profileImageUrl",
86-
PreparationStatus.CONSIDERING,
86+
ExchangeStatus.CONSIDERING,
8787
Role.MENTEE,
8888
authType
8989
);

0 commit comments

Comments
 (0)