From 04efcdbafc38788300125c5fa2e3af46bc3a0bcc Mon Sep 17 00:00:00 2001 From: You Jung <80906691+JangYouJung@users.noreply.github.com> Date: Thu, 26 Sep 2024 00:59:34 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EC=9D=BC=EB=B6=80=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?null=20=ED=97=88=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/auth/service/AuthService.java | 13 +++++++------ .../server/auth/service/OAuthService.java | 14 ++++++++------ .../meltingpot/server/domain/entity/Account.java | 3 --- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/meltingpot/server/auth/service/AuthService.java b/src/main/java/meltingpot/server/auth/service/AuthService.java index 1ceb488..a03ff8b 100644 --- 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 index bad420f..49bb799 100644 --- 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 index d33de76..ab4df48 100644 --- 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; // 사용자 자기소개