Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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,
;
}
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE site_user RENAME COLUMN preparation_stage TO exchange_status;
2 changes: 1 addition & 1 deletion src/main/resources/secret
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() {
"[email protected]",
"nickname",
"profileImageUrl",
PreparationStatus.CONSIDERING,
ExchangeStatus.CONSIDERING,
Role.MENTEE
);
}
Expand Down
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
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