Merge pull request #149 from Me1tingPot/feature/#147

[Refactor] 회원가입시 젠더 필드도 Null 허용하도록 리팩토링
Me1tingPot · Oct 1, 2024 · 528220c · 528220c
2 parents 17740da + 964ef2d
commit 528220c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/main/java/meltingpot/server/auth/service/AuthService.java b/src/main/java/meltingpot/server/auth/service/AuthService.java
@@ -90,19 +90,27 @@ public AccountResponseDto signup(SignupRequestDto signupRequest) {
             }
         }
 
-        // 성별 유효성 확인
-        boolean gender_check = false;
-        for( Gender gender : Gender.values()){
-            if(gender.toString().equals(signupRequest.gender())) gender_check = true;
+        Gender gender;
+        if(signupRequest.gender() == null || signupRequest.gender().isEmpty()){
+            gender = Gender.UNKNOWN;
+        }
+        else{
+            // 성별 유효성 확인
+            boolean gender_check = false;
+            for( Gender input : Gender.values()){
+                if(input.toString().equals(signupRequest.gender())) gender_check = true;
+            }
+
+            if(!gender_check) throw new IllegalArgumentException(ResponseCode.INVALID_GENDER_IS_PROVIDED);
+            else gender = Gender.valueOf(signupRequest.gender());
         }
-        if(!gender_check) throw new IllegalArgumentException(ResponseCode.INVALID_GENDER_IS_PROVIDED);
 
 
         Account account = Account.builder()
                 .username(signupRequest.email())
                 .name(signupRequest.name())
                 .password(passwordEncoder.encode(signupRequest.password()))
-                .gender(Gender.valueOf(signupRequest.gender()))
+                .gender(gender)
                 .birth(signupRequest.birth())
                 .nationality(signupRequest.nationality())
                 .isQuit(false)

diff --git a/src/main/java/meltingpot/server/auth/service/OAuthService.java b/src/main/java/meltingpot/server/auth/service/OAuthService.java
@@ -70,19 +70,27 @@ public OAuthSignInResponseDto oauthSignup(OAuthSignupRequestDto signupRequest) {
             }
         }
 
-        // 성별 유효성 확인
-        boolean gender_check = false;
-        for( Gender gender : Gender.values()){
-            if(gender.toString().equals(signupRequest.gender())) gender_check = true;
+        Gender gender;
+        if(signupRequest.gender() == null || signupRequest.gender().isEmpty()){
+            gender = Gender.UNKNOWN;
+        }
+        else{
+            // 성별 유효성 확인
+            boolean gender_check = false;
+            for( Gender input : Gender.values()){
+                if(input.toString().equals(signupRequest.gender())) gender_check = true;
+            }
+
+            if(!gender_check) throw new IllegalArgumentException(ResponseCode.INVALID_GENDER_IS_PROVIDED);
+            else gender = Gender.valueOf(signupRequest.gender());
         }
-        if(!gender_check) throw new IllegalArgumentException(ResponseCode.INVALID_GENDER_IS_PROVIDED);
 
 
         Account account = Account.builder()
                 .username(signupRequest.email())
                 .name(signupRequest.name())
                 .password("")
-                .gender(Gender.valueOf(signupRequest.gender()))
+                .gender(gender)
                 .birth(signupRequest.birth())
                 .nationality(signupRequest.nationality())
                 .isQuit(false)