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

[Refactor] 회원가입시 일부 필드 null 허용하도록 리팩토링
Me1tingPot · Sep 25, 2024 · 17740da · 17740da
2 parents e7b96fe + 04efcdb
commit 17740da
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/meltingpot/server/auth/service/AuthService.java b/src/main/java/meltingpot/server/auth/service/AuthService.java
@@ -119,12 +119,13 @@ public AccountResponseDto signup(SignupRequestDto signupRequest) {
                         .build()).toList()
         );
 
-        account.setLanguages(signupRequest.languages().stream().map(
-                (language) -> AccountLanguage.builder()
-                        .account(account)
-                        .language(language)
-                        .build()).toList()
-        );
+        if(signupRequest.languages()!=null){
+            account.setLanguages(signupRequest.languages().stream().map(
+                    (language) -> AccountLanguage.builder()
+                            .account(account)
+                            .language(language)
+                            .build()).toList());
+        }
 
         accountRepository.save(account);
 

diff --git a/src/main/java/meltingpot/server/auth/service/OAuthService.java b/src/main/java/meltingpot/server/auth/service/OAuthService.java
@@ -99,13 +99,15 @@ public OAuthSignInResponseDto oauthSignup(OAuthSignupRequestDto signupRequest) {
                         .build()).toList()
         );
 
+        if(signupRequest.languages()!=null) {
+            account.setLanguages(signupRequest.languages().stream().map(
+                    (language) -> AccountLanguage.builder()
+                            .account(account)
+                            .language(language)
+                            .build()).toList()
+            );
+        }
 
-        account.setLanguages(signupRequest.languages().stream().map(
-                (language) -> AccountLanguage.builder()
-                        .account(account)
-                        .language(language)
-                        .build()).toList()
-        );
 
         accountRepository.save(account);
 

diff --git a/src/main/java/meltingpot/server/domain/entity/Account.java b/src/main/java/meltingpot/server/domain/entity/Account.java
@@ -45,14 +45,11 @@ public class Account extends BaseEntity {
 
     private String password;
 
-    @NotNull
     @Enumerated(EnumType.STRING)
     private Gender gender;
 
-    @NotNull
     private LocalDate birth;
 
-    @NotNull
     private String nationality;
 
     private String bio; // 사용자 자기소개