Skip to content

refactor: 교환학생 준비 상태의 컬럼명 변경 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nayonsoso merged 4 commits into from
Jul 1, 2025
Merged

refactor: 교환학생 준비 상태의 컬럼명 변경 #351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3d8f66
refactor: preparationStatus 필드 이름 변경
nayonsoso Jun 27, 2025
c587fef
refactor: 엔티티 필드명 변경
nayonsoso Jun 27, 2025
b1305bf
chore: flyway 스크립트 버전 수정
nayonsoso Jul 1, 2025
e25bf08
Merge remote-tracking branch 'origin/develop' into refactor/350-renam…
nayonsoso Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,7 +13,10 @@ public record SignUpRequest(
String signUpToken,
List<String> interestedRegions,
List<String> interestedCountries,
PreparationStatus preparationStatus,

@JsonProperty("preparationStatus")
ExchangeStatus exchangeStatus,

String profileImageUrl,

@NotBlank(message = "닉네임을 입력해주세요.")
Expand All @@ -23,7 +27,7 @@ public SiteUser toOAuthSiteUser(String email, AuthType authType) {
email,
this.nickname,
this.profileImageUrl,
this.preparationStatus,
this.exchangeStatus,
Role.MENTEE,
authType
);
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ...on/siteuser/domain/PreparationStatus.java → ...ction/siteuser/domain/ExchangeStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
;
}
14 changes: 7 additions & 7 deletions src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/db/migration/V17__rename_preparation_status.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE site_user RENAME COLUMN preparation_stage TO exchange_status;
Copy link
Copy Markdown
Contributor

@Gyuhyeok99 Gyuhyeok99 Jun 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이전 Pr에 V17과 V18이 있는 거 같은데 19로 고쳐야할 거 같아요!

Copy link
Copy Markdown
Collaborator Author

@nayonsoso nayonsoso Jun 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

어떤게 빨리 approve 될지 몰라서 가장 최신 버전으로 등록해두었습니다.
머지할 때 맞추려고요!

제 생각을 미리 공유드렸어야 했는데 속으로만 생각했네요.. 😅

Copy link
Copy Markdown
Contributor

@Gyuhyeok99 Gyuhyeok99 Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아하 그렇군요!! 다시 approve했습니다!

2 changes: 1 addition & 1 deletion src/main/resources/secret
Open in desktop
Submodule secret updated from 84002e to 5ddc9c
4 changes: 2 additions & 2 deletions src/test/java/com/example/solidconnection/e2e/DynamicFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -11,7 +11,7 @@ public static SiteUser createSiteUserByEmailAndNickname(String email, String nic
email,
nickname,
"profileImage",
PreparationStatus.CONSIDERING,
ExchangeStatus.CONSIDERING,
Role.MENTEE
);
}
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -63,7 +63,7 @@ private SiteUser createSiteUser() {
"test@example.com",
"nickname",
"profileImageUrl",
PreparationStatus.CONSIDERING,
ExchangeStatus.CONSIDERING,
Role.MENTEE
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -62,7 +62,7 @@ public SiteUser create() {
email,
nickname,
profileImageUrl,
PreparationStatus.CONSIDERING,
ExchangeStatus.CONSIDERING,
role,
authType,
passwordEncoder.encode(password)
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -83,7 +83,7 @@ private SiteUser createSiteUser(String email, String nickname, AuthType authType
email,
nickname,
"profileImageUrl",
PreparationStatus.CONSIDERING,
ExchangeStatus.CONSIDERING,
Role.MENTEE,
authType
);
Expand Down
Loading