Merge remote-tracking branch 'origin/fix/onboarding_realname' into de…

…v-check
Team-NumberOne · Nov 20, 2023 · c6ec626 · c6ec626
2 parents d465fca + e0e822e
commit c6ec626
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/com/numberone/backend/domain/token/dto/response/GetTokenResponse.java b/src/main/java/com/numberone/backend/domain/token/dto/response/GetTokenResponse.java
@@ -10,17 +10,20 @@
 public class GetTokenResponse {
     private String accessToken;
     private String refreshToken;
+    private Boolean isNewMember;
 
     @Builder
-    public GetTokenResponse(String accessToken, String refreshToken) {
+    public GetTokenResponse(String accessToken, String refreshToken, Boolean isNewMember) {
         this.accessToken = accessToken;
         this.refreshToken = refreshToken;
+        this.isNewMember = isNewMember;
     }
 
-    public static GetTokenResponse of(String accessToken, String refreshToken) {
+    public static GetTokenResponse of(String accessToken, String refreshToken, Boolean isNewMember) {
         return GetTokenResponse.builder()
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
+                .isNewMember(isNewMember)
                 .build();
     }
 }
diff --git a/src/main/java/com/numberone/backend/domain/token/service/TokenService.java b/src/main/java/com/numberone/backend/domain/token/service/TokenService.java
@@ -86,17 +86,20 @@ public RefreshTokenResponse refresh(RefreshTokenRequest tokenRequest) {
     }
 
     private GetTokenResponse getTokenResponse(String email) {
-        if (!memberRepository.existsByEmail(email))
+        Boolean isNewMember = false;
+        if (!memberRepository.existsByEmail(email)) {
             memberService.create(email);
+            isNewMember = true;
+        }
         if (tokenRepository.existsById(email)) {
             Token token = tokenRepository.findById(email)
                     .orElseThrow(WrongAccessTokenException::new);
-            return GetTokenResponse.of(token.getAccessToken(), token.getRefreshToken());
+            return GetTokenResponse.of(token.getAccessToken(), token.getRefreshToken(), isNewMember);
         } else {
             String refreshToken = jwtUtil.createToken(email, refreshPeroid);
             String accessToken = jwtUtil.createToken(email, accessPeroid);
             Token token = tokenRepository.save(Token.of(email, accessToken, refreshToken));
-            return GetTokenResponse.of(token.getAccessToken(), token.getRefreshToken());
+            return GetTokenResponse.of(token.getAccessToken(), token.getRefreshToken(), isNewMember);
         }
     }
 }