Merge pull request #34 from GoogleEyes-ewha/feature/#16

GoogleEyes-ewha · Feb 14, 2024 · bf7c24a · bf7c24a
2 parents 27ba166 + ec700ee
commit bf7c24a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/gdsc/hearo/domain/oauth/service/OauthService.java b/src/main/java/com/gdsc/hearo/domain/oauth/service/OauthService.java
@@ -43,17 +43,17 @@ public Member googleLogin(GoogleProfile googleProfile) throws BaseException {
 
         Member member = memberRepository.findByLoginId(email);
 
-        if (member != null) {
-            throw new BaseException(BaseResponseStatus.DUPICATE_USER_ID);
-        }
         Member newMember = Member.builder()
                 .username(username)
                 .loginId(email)
                 .GoogleId(googleId)
                 .loginType(Member.LoginType.GOOGLE)
                 .build();
 
-        memberRepository.save(newMember);
+        // 저장 안 된 사용자일 경우
+        if (member == null) {
+            memberRepository.save(newMember);
+        }
 
         return newMember;
     }