Merge pull request #143 from Team-Smeme/unan#142

[REFACTOR] social login api hasPlan 추가
Team-Smeme · Aug 15, 2023 · f510511 · f510511
2 parents 7ab12b4 + af27ad4
commit f510511
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/smeme/server/dto/auth/SignInResponseDTO.java b/src/main/java/com/smeme/server/dto/auth/SignInResponseDTO.java
@@ -11,9 +11,10 @@ public record SignInResponseDTO(
         String accessToken,
         @Schema(description = "smeme refresh token", example = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0IiwiaWF0IjoxNjIyMjU0NjY4LCJleHAiO")
         String refreshToken,
-
         @Schema(description = "회원 정보 등록 여부", example = "true")
-        boolean isRegistered
+        boolean isRegistered,
+        @Schema(description = "회원의 목표 언어", example = "EN")
+        boolean hasPlan
 ) {
 
 }
diff --git a/src/main/java/com/smeme/server/service/auth/AuthService.java b/src/main/java/com/smeme/server/service/auth/AuthService.java
@@ -66,11 +66,9 @@ public SignInResponseDTO signIn(String socialAccessToken, SignInRequestDTO signI
             memberRepository.save(member);
         }
 
-        boolean isRegistered = false;
         Member signedMember = getMemberBySocialAndSocialId(socialType, socialId);
-        if (nonNull(signedMember.getUsername())) {
-            isRegistered = true;
-        }
+        boolean isRegistered = nonNull(signedMember.getUsername());
+        boolean hasPlan = nonNull(signedMember.getGoal());
 
         TokenVO tokenVO = generateToken(new UserAuthentication(signedMember.getId(), null, null));
         signedMember.updateRefreshToken(tokenVO.refreshToken());
@@ -79,6 +77,7 @@ public SignInResponseDTO signIn(String socialAccessToken, SignInRequestDTO signI
                 .accessToken(tokenVO.accessToken())
                 .refreshToken(tokenVO.refreshToken())
                 .isRegistered(isRegistered)
+                .hasPlan(hasPlan)
                 .build();
     }