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 43f8e6caf..9bf92a295 100644 --- a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java +++ b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java @@ -2,10 +2,8 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; -import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.validation.constraints.NotBlank; import java.util.List; @@ -16,23 +14,17 @@ public record SignUpRequest( List interestedCountries, PreparationStatus preparationStatus, String profileImageUrl, - Gender gender, @NotBlank(message = "닉네임을 입력해주세요.") - String nickname, - - @JsonFormat(pattern = "yyyy-MM-dd") - String birth) { + String nickname) { public SiteUser toOAuthSiteUser(String email, AuthType authType) { return new SiteUser( email, this.nickname, this.profileImageUrl, - this.birth, this.preparationStatus, Role.MENTEE, - this.gender, authType ); } @@ -42,10 +34,8 @@ public SiteUser toEmailSiteUser(String email, String encodedPassword) { email, this.nickname, this.profileImageUrl, - this.birth, this.preparationStatus, Role.MENTEE, - this.gender, AuthType.EMAIL, encodedPassword ); 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 b1cf6c1cc..21dfbcc13 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -5,7 +5,6 @@ import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import jakarta.persistence.CascadeType; @@ -61,9 +60,6 @@ public class SiteUser { @Column(length = 500) private String profileImageUrl; - @Column(nullable = false, length = 20) - private String birth; - @Column(nullable = false) @Enumerated(EnumType.STRING) private PreparationStatus preparationStage; @@ -72,10 +68,6 @@ public class SiteUser { @Enumerated(EnumType.STRING) private Role role; - @Column(nullable = false) - @Enumerated(EnumType.STRING) - private Gender gender; - @Setter private LocalDateTime nicknameModifiedAt; @@ -104,17 +96,13 @@ public SiteUser( String email, String nickname, String profileImageUrl, - String birth, PreparationStatus preparationStage, - Role role, - Gender gender) { + Role role) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.birth = birth; this.preparationStage = preparationStage; this.role = role; - this.gender = gender; this.authType = AuthType.KAKAO; } @@ -122,18 +110,14 @@ public SiteUser( String email, String nickname, String profileImageUrl, - String birth, PreparationStatus preparationStage, Role role, - Gender gender, AuthType authType) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.birth = birth; this.preparationStage = preparationStage; this.role = role; - this.gender = gender; this.authType = authType; } @@ -142,19 +126,15 @@ public SiteUser( String email, String nickname, String profileImageUrl, - String birth, PreparationStatus preparationStage, Role role, - Gender gender, AuthType authType, String password) { this.email = email; this.nickname = nickname; this.profileImageUrl = profileImageUrl; - this.birth = birth; this.preparationStage = preparationStage; this.role = role; - this.gender = gender; this.authType = authType; this.password = password; } diff --git a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java index 9af5e6b2d..981866632 100644 --- a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java +++ b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java @@ -9,7 +9,6 @@ public record MyPageResponse( String profileImageUrl, Role role, AuthType authType, - String birth, String email, int likedPostCount, int likedMentorCount, @@ -21,7 +20,6 @@ public static MyPageResponse of(SiteUser siteUser, int likedUniversityCount) { siteUser.getProfileImageUrl(), siteUser.getRole(), siteUser.getAuthType(), - siteUser.getBirth(), siteUser.getEmail(), 0, // TODO: 커뮤니티 기능 생기면 업데이트 필요 0, // TODO: 멘토 기능 생기면 업데이트 필요 diff --git a/src/main/java/com/example/solidconnection/type/Gender.java b/src/main/java/com/example/solidconnection/type/Gender.java deleted file mode 100644 index 92a78814b..000000000 --- a/src/main/java/com/example/solidconnection/type/Gender.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.solidconnection.type; - -public enum Gender { - MALE, FEMALE, PREFER_NOT_TO_SAY -} diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 5ae08770d..b1beb524b 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -41,9 +41,9 @@ VALUES ('BN', '브루나이', 'ASIA'), ('MY', '말레이시아', 'ASIA'), ('RU', '러시아', 'EUROPE'); -INSERT INTO site_user (birth, email, nickname, profile_image_url, gender, preparation_stage, role, password, auth_type) -VALUES ('1999-01-01', 'test@test.email', 'yonso','https://github.com/nayonsoso.png', - 'FEMALE', 'CONSIDERING', 'MENTEE', +INSERT INTO site_user (email, nickname, profile_image_url, preparation_stage, role, password, auth_type) +VALUES ('test@test.email', 'yonso', 'https://github.com/nayonsoso.png', + 'CONSIDERING', 'MENTEE', '$2a$10$psmwlxPfqWnIlq9JrlQJkuXr1XtjRNsyVOgcTWYZub5jFfn0TML76', 'EMAIL'); -- 12341234 INSERT INTO university(id, country_code, region_code, english_name, format_name, korean_name, diff --git a/src/main/resources/db/migration/V11_remove_siteuser_birth_and_gender.sql b/src/main/resources/db/migration/V11_remove_siteuser_birth_and_gender.sql new file mode 100644 index 000000000..20fdf7496 --- /dev/null +++ b/src/main/resources/db/migration/V11_remove_siteuser_birth_and_gender.sql @@ -0,0 +1,3 @@ +ALTER TABLE site_user + DROP COLUMN gender, + DROP COLUMN birth; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index a7d4e91e9..add4115ef 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -11,7 +11,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.type.VerifyStatus; @@ -215,10 +214,8 @@ private SiteUser createSiteUser(int index, String nickname) { "test" + index + " @example.com", nickname, "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 8882108b9..a3d00457e 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -11,7 +11,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.type.VerifyStatus; @@ -225,10 +224,8 @@ private SiteUser createSiteUser(int index, String nickname) { "test" + index + " @example.com", nickname, "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/auth/service/AuthTokenProviderTest.java b/src/test/java/com/example/solidconnection/auth/service/AuthTokenProviderTest.java index f5616973f..57a9ea789 100644 --- a/src/test/java/com/example/solidconnection/auth/service/AuthTokenProviderTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/AuthTokenProviderTest.java @@ -5,7 +5,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.util.JwtUtils; @@ -28,7 +27,7 @@ class AuthTokenProviderTest { @Autowired private AuthTokenProvider authTokenProvider; - + @Autowired private SiteUserRepository siteUserRepository; @@ -37,10 +36,10 @@ class AuthTokenProviderTest { @Autowired private JwtProperties jwtProperties; - + private SiteUser siteUser; private String subject; - + @BeforeEach void setUp() { siteUser = createSiteUser(); @@ -50,7 +49,7 @@ void setUp() { @Nested class 액세스_토큰을_제공한다 { - + @Test void SiteUser_로_액세스_토큰을_생성한다() { // when @@ -74,10 +73,10 @@ class 액세스_토큰을_제공한다 { assertThat(actualSubject).isEqualTo(subject); } } - + @Nested class 리프레시_토큰을_제공한다 { - + @Test void SiteUser_로_리프레시_토큰을_생성하고_저장한다() { // when @@ -177,10 +176,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java index e9663f5df..5a32ef362 100644 --- a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java @@ -8,7 +8,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.assertj.core.api.Assertions; @@ -88,10 +87,8 @@ private SiteUser createSiteUser(String email, String rawPassword) { email, "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, Role.MENTEE, - Gender.MALE, AuthType.EMAIL, encodedPassword ); diff --git a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java index b80c4ca5d..6136bbee2 100644 --- a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java @@ -5,7 +5,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.util.JwtUtils; @@ -79,10 +78,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } } diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 52b9f24f0..fdcf0ec8d 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -8,7 +8,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PostCategory; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; @@ -64,10 +63,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 2cb6eaa27..beeb8b046 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -8,7 +8,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PostCategory; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; @@ -67,10 +66,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } @@ -118,7 +115,7 @@ private Post createPost(Board board, SiteUser siteUser) { System.err.println("ExecutorService did not terminate in the expected time."); } - Thread.sleep(SCHEDULING_DELAY_MS+1000); + Thread.sleep(SCHEDULING_DELAY_MS + 1000); assertEquals(THREAD_NUMS, postRepository.getById(post.getId()).getViewCount()); } @@ -164,7 +161,7 @@ private Post createPost(Board board, SiteUser siteUser) { System.err.println("ExecutorService did not terminate in the expected time."); } - Thread.sleep(SCHEDULING_DELAY_MS+1000); + Thread.sleep(SCHEDULING_DELAY_MS + 1000); assertEquals(2L, postRepository.getById(post.getId()).getViewCount()); } diff --git a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java index 35ab993f5..4800a0153 100644 --- a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java @@ -4,7 +4,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.BeforeEach; @@ -46,10 +45,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java index 779474c27..b517681aa 100644 --- a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java +++ b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java @@ -7,7 +7,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.BeforeEach; @@ -96,10 +95,8 @@ private SiteUser createAndSaveSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java b/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java index 2996eb5b6..0104c9ccd 100644 --- a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java @@ -4,7 +4,6 @@ import com.example.solidconnection.custom.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.DisplayName; @@ -68,10 +67,8 @@ private SiteUser createSiteUser(Role role) { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - role, - Gender.MALE + role ); } diff --git a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java b/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java index 6932fcd28..6285727cb 100644 --- a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java @@ -2,7 +2,6 @@ import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.Test; @@ -64,10 +63,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } } diff --git a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java index 46d7498a2..423bec415 100644 --- a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java @@ -7,7 +7,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import io.jsonwebtoken.Jwts; @@ -150,10 +149,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } } diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java index 99e463955..0b2a0db73 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java @@ -4,7 +4,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.DisplayName; @@ -91,10 +90,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java index 912072d2b..b49b9cf27 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java @@ -3,7 +3,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.DisplayName; @@ -42,10 +41,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); } } diff --git a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java index 09c97d46e..f17987690 100644 --- a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java +++ b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java @@ -4,7 +4,6 @@ import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.auth.dto.oauth.KakaoUserInfoDto; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; @@ -24,10 +23,8 @@ public static SiteUser createSiteUserByEmail(String email) { email, "nickname", "profileImage", - "2000-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE + Role.MENTEE ); } @@ -36,10 +33,8 @@ public static SiteUser createSiteUserByNickName(String nickname) { "email@email.com", nickname, "profileImage", - "2000-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE + Role.MENTEE ); } diff --git a/src/test/java/com/example/solidconnection/e2e/MyPageTest.java b/src/test/java/com/example/solidconnection/e2e/MyPageTest.java index dd2ce1e3a..309cab1f4 100644 --- a/src/test/java/com/example/solidconnection/e2e/MyPageTest.java +++ b/src/test/java/com/example/solidconnection/e2e/MyPageTest.java @@ -51,7 +51,6 @@ public void setUpUserAndToken() { assertAll("불러온 마이 페이지 정보가 DB의 정보와 일치한다.", () -> assertThat(myPageResponse.nickname()).isEqualTo(siteUser.getNickname()), - () -> assertThat(myPageResponse.birth()).isEqualTo(siteUser.getBirth()), () -> assertThat(myPageResponse.profileImageUrl()).isEqualTo(siteUser.getProfileImageUrl()), () -> assertThat(myPageResponse.email()).isEqualTo(siteUser.getEmail())); } diff --git a/src/test/java/com/example/solidconnection/e2e/SignUpTest.java b/src/test/java/com/example/solidconnection/e2e/SignUpTest.java index f6b356178..ab3f75515 100644 --- a/src/test/java/com/example/solidconnection/e2e/SignUpTest.java +++ b/src/test/java/com/example/solidconnection/e2e/SignUpTest.java @@ -16,7 +16,6 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -80,7 +79,7 @@ class SignUpTest extends BaseEndToEndTest { List interestedRegionNames = List.of("유럽"); List interestedCountryNames = List.of("프랑스", "독일"); SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, interestedRegionNames, interestedCountryNames, - PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname", "2000-01-01"); + PreparationStatus.CONSIDERING, "profile", "nickname"); SignInResponse response = RestAssured.given().log().all() .contentType(ContentType.JSON) .body(signUpRequest) @@ -94,10 +93,8 @@ class SignUpTest extends BaseEndToEndTest { "회원 정보를 저장한다.", () -> assertThat(savedSiteUser.getId()).isNotNull(), () -> assertThat(savedSiteUser.getEmail()).isEqualTo(email), - () -> assertThat(savedSiteUser.getBirth()).isEqualTo(signUpRequest.birth()), () -> assertThat(savedSiteUser.getNickname()).isEqualTo(signUpRequest.nickname()), () -> assertThat(savedSiteUser.getProfileImageUrl()).isEqualTo(signUpRequest.profileImageUrl()), - () -> assertThat(savedSiteUser.getGender()).isEqualTo(signUpRequest.gender()), () -> assertThat(savedSiteUser.getPreparationStage()).isEqualTo(signUpRequest.preparationStatus())); List interestedRegions = interestedRegionRepository.findAllBySiteUser(savedSiteUser).stream() @@ -130,7 +127,7 @@ class SignUpTest extends BaseEndToEndTest { // request - body 생성 및 요청 SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, null, null, - PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, alreadyExistNickname, "2000-01-01"); + PreparationStatus.CONSIDERING, "profile", alreadyExistNickname); ErrorResponse errorResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) .body(signUpRequest) @@ -155,7 +152,7 @@ class SignUpTest extends BaseEndToEndTest { // request - body 생성 및 요청 SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, null, null, - PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname0", "2000-01-01"); + PreparationStatus.CONSIDERING, "profile", "nickname0"); ErrorResponse errorResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) .body(signUpRequest) @@ -171,7 +168,7 @@ class SignUpTest extends BaseEndToEndTest { @Test void 유효하지_않은_카카오_토큰으로_회원가입을_하면_예외를_응답한다() { SignUpRequest signUpRequest = new SignUpRequest("invalid", null, null, - PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname", "2000-01-01"); + PreparationStatus.CONSIDERING, "profile", "nickname"); ErrorResponse errorResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) .body(signUpRequest) diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 8d2054579..a8b1ac3d8 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -17,7 +17,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.ImgType; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.type.PreparationStatus; @@ -173,10 +172,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } 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 d3433937a..c3d9d240e 100644 --- a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java @@ -3,7 +3,6 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.TestContainerDataJpaTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.Nested; @@ -52,10 +51,8 @@ private SiteUser createSiteUser(String email, AuthType authType) { email, "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, Role.MENTEE, - Gender.MALE, authType ); } diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index 334b6f740..95a887736 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -9,7 +9,6 @@ import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.ImgType; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; @@ -68,7 +67,6 @@ class MyPageServiceTest extends BaseIntegrationTest { () -> assertThat(response.nickname()).isEqualTo(testUser.getNickname()), () -> assertThat(response.profileImageUrl()).isEqualTo(testUser.getProfileImageUrl()), () -> assertThat(response.role()).isEqualTo(testUser.getRole()), - () -> assertThat(response.birth()).isEqualTo(testUser.getBirth()), () -> assertThat(response.email()).isEqualTo(testUser.getEmail()), () -> assertThat(response.likedPostCount()).isEqualTo(testUser.getPostLikeList().size()), () -> assertThat(response.likedUniversityCount()).isEqualTo(likedUniversityCount) @@ -206,10 +204,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } @@ -219,10 +215,8 @@ private SiteUser createSiteUserWithCustomProfile() { "test@example.com", "nickname", "profile/profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } @@ -232,10 +226,8 @@ private void createDuplicatedSiteUser() { "duplicated@example.com", "duplicatedNickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java index 7272b3498..6c9736198 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java @@ -4,7 +4,6 @@ import com.example.solidconnection.siteuser.dto.NicknameExistsResponse; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import org.junit.jupiter.api.BeforeEach; @@ -58,10 +57,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 989e0bc31..05b101985 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -22,7 +22,6 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.DatabaseClearExtension; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.type.PostCategory; import com.example.solidconnection.type.PreparationStatus; @@ -171,73 +170,57 @@ private void setUpSiteUsers() { "test1@example.com", "nickname1", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE)); + Role.MENTEE)); 테스트유저_2 = siteUserRepository.save(new SiteUser( "test2@example.com", "nickname2", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE)); + Role.MENTEE)); 테스트유저_3 = siteUserRepository.save(new SiteUser( "test3@example.com", "nickname3", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE)); + Role.MENTEE)); 테스트유저_4 = siteUserRepository.save(new SiteUser( "test4@example.com", "nickname4", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE)); + Role.MENTEE)); 테스트유저_5 = siteUserRepository.save(new SiteUser( "test5@example.com", "nickname5", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE)); + Role.MENTEE)); 테스트유저_6 = siteUserRepository.save(new SiteUser( "test6@example.com", "nickname6", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE)); + Role.MENTEE)); 테스트유저_7 = siteUserRepository.save(new SiteUser( "test7@example.com", "nickname7", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.FEMALE)); + Role.MENTEE)); 이전학기_지원자 = siteUserRepository.save(new SiteUser( "old@example.com", "oldNickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE)); + Role.MENTEE)); } private void setUpRegions() { @@ -525,7 +508,7 @@ private LanguageTestScore createApprovedLanguageTestScore(SiteUser siteUser) { return languageTestScoreRepository.save(languageTestScore); } - private Post createPost (Board board, SiteUser siteUser, String title, String content, PostCategory category){ + private Post createPost(Board board, SiteUser siteUser, String title, String content, PostCategory category) { Post post = new Post( title, content, diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java index ec9b704a6..6bc3c13e3 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java @@ -5,7 +5,6 @@ import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.university.domain.LikedUniversity; @@ -158,10 +157,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); } diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index 102eb6dd6..11591d11f 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -7,7 +7,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.Gender; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; @@ -144,10 +143,8 @@ private SiteUser createSiteUser() { "test@example.com", "nickname", "profileImageUrl", - "1999-01-01", PreparationStatus.CONSIDERING, - Role.MENTEE, - Gender.MALE + Role.MENTEE ); return siteUserRepository.save(siteUser); }