fix: 기존 회원 로그인 - isUpdatedMember 리턴값 세팅

Central-MakeUs · Aug 26, 2023 · 3b7c083 · 3b7c083
1 parent 96ef6dc
commit 3b7c083
Showing 1 changed file with 36 additions and 12 deletions.
diff --git a/cider-api/src/main/java/com/cmc/oauth/service/OauthLoginService.java b/cider-api/src/main/java/com/cmc/oauth/service/OauthLoginService.java
@@ -76,32 +76,56 @@ public ResponseJwtTokenDto createMemberAndJwt(KakaoAccount memberInfo, SocialTyp
         Member requestMember;
         final Optional<Member> foundMember = memberRepository.findByEmail(memberInfo.getEmail());
 
+        ResponseJwtTokenDto responseJwtTokenDto = null;
         if (foundMember.isEmpty()) { // 기존 회원 아닐 때
+            log.info("기존 회원 아닐 때 ");
             Member newMember = Member.create(memberInfo.getProfile().getNickname(),
                     memberInfo.getEmail(), memberInfo.getBirthday(), memberInfo.getGender(), socialType);
             requestMember = memberRepository.save(newMember);
+
+            // JWT 토큰 생성
+            TokenDto tokenDto = tokenProvider.createTokenDtoKakao(requestMember.getMemberId());
+            log.info("tokenDto: {}", tokenDto);
+
+            responseJwtTokenDto = modelMapper.map(tokenDto, ResponseJwtTokenDto.class);
+
+            final boolean isNewMember = StringUtils.isEmpty(requestMember.getMemberName());
+            responseJwtTokenDto.setIsNewMember(isNewMember);
+            if (!isNewMember) {
+                if(requestMember.getMemberName() != null) {
+                    responseJwtTokenDto.setMemberName(requestMember.getMemberName());
+                }else{
+                    responseJwtTokenDto.setMemberName("");
+                }
+            }
+            responseJwtTokenDto.setMemberId(requestMember.getMemberId());
+            responseJwtTokenDto.setBirthday("");
+            responseJwtTokenDto.setGender("");
+
         } else {
+            log.info("기존 회원일 때 :: " + foundMember.get().getMemberId() + foundMember.get().getMemberName());
             requestMember = foundMember.get(); // 기존 회원일 때
 
             if(requestMember.getIsDeleted() != null){
                 throw new CiderException("탈퇴한 회원은 7일간 재가입이 불가합니다.");
             }
-        }
 
-        // JWT 토큰 생성
-        TokenDto tokenDto = tokenProvider.createTokenDtoKakao(requestMember.getMemberId());
-        log.info("tokenDto: {}", tokenDto);
+            // JWT 토큰 생성
+            TokenDto tokenDto = tokenProvider.createTokenDtoKakao(requestMember.getMemberId());
+            log.info("tokenDto: {}", tokenDto);
 
-        ResponseJwtTokenDto responseJwtTokenDto = modelMapper.map(tokenDto, ResponseJwtTokenDto.class);
+            responseJwtTokenDto = modelMapper.map(tokenDto, ResponseJwtTokenDto.class);
 
-        final boolean isNewMember = StringUtils.isEmpty(requestMember.getMemberName());
-        responseJwtTokenDto.setIsNewMember(isNewMember);
-        if (!isNewMember) {
-            responseJwtTokenDto.setMemberName(requestMember.getMemberName());
+            final boolean isNewMember = StringUtils.isEmpty(requestMember.getMemberName());
+            responseJwtTokenDto.setIsNewMember(isNewMember);
+            if (!isNewMember) {
+                responseJwtTokenDto.setMemberName(requestMember.getMemberName());
+            }
+            responseJwtTokenDto.setMemberId(requestMember.getMemberId());
+            responseJwtTokenDto.setBirthday(requestMember.getMemberBirth());
+            responseJwtTokenDto.setGender(requestMember.getMemberGender());
+            responseJwtTokenDto.setIsUpdatedMember(requestMember.getIsUpdatedMember());
         }
-        responseJwtTokenDto.setMemberId(requestMember.getMemberId());
-        responseJwtTokenDto.setBirthday(requestMember.getMemberBirth());
-        responseJwtTokenDto.setGender(requestMember.getMemberGender());
 
         return responseJwtTokenDto;
     }