From fee7553ac583646925e53a8c4b9e973936e95e30 Mon Sep 17 00:00:00 2001
From: seungryeol <opop0421@naver.com>
Date: Sun, 29 Oct 2023 20:14:26 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C?=
 =?UTF-8?q?=20=EC=B4=88=EA=B8=B0=20=EC=9C=A0=EC=A0=80,=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=EC=9C=A0=EC=A0=80=20=EA=B5=AC=EB=B6=84=20boolean?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .jpb/jpb-settings.xml                                  | 10 ++++++++++
 .../farmususer/user/dto/response/TokenResponseDto.java |  2 ++
 .../server/farmususer/user/service/AuthService.java    |  6 ++++++
 3 files changed, 18 insertions(+)
 create mode 100644 .jpb/jpb-settings.xml

diff --git a/.jpb/jpb-settings.xml b/.jpb/jpb-settings.xml
new file mode 100644
index 0000000..484f362
--- /dev/null
+++ b/.jpb/jpb-settings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaPluginProjectSettings">
+    <option name="entityNameTemplate" />
+    <option name="isLombokBuilder" value="true" />
+    <option name="isLombokAllArgsConstructor" value="true" />
+    <option name="isLombokNoArgsConstructor" value="true" />
+    <option name="scaffoldingLanguage" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java b/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java
index e746e38..d992472 100644
--- a/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java
+++ b/src/main/java/modernfarmer/server/farmususer/user/dto/response/TokenResponseDto.java
@@ -17,4 +17,6 @@ public class TokenResponseDto {
     private String accessToken;
 
     private String refreshToken;
+
+    private boolean early;
 }
\ No newline at end of file
diff --git a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
index 5f7075a..1b73a5c 100644
--- a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
+++ b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@@ -28,6 +28,7 @@ public class AuthService{
     public UserRepository userRepository;
 
     private final WebClient webClient;
+    private boolean early = false;
 
     @Autowired
     public AuthService(WebClient webClient, UserRepository userRepository, JwtTokenProvider jwtTokenProvider, RedisTemplate<String, String> redisTemplate) {
@@ -57,6 +58,7 @@ public TokenResponseDto googleLogin(String accessToken) {
                     .role("USER")
                     .profileImage(userInfo.getPicture())
                     .build();
+            early = true;
 
             userRepository.save(user);
         }
@@ -69,6 +71,7 @@ public TokenResponseDto googleLogin(String accessToken) {
         TokenResponseDto tokenResponseDto = TokenResponseDto.builder()
                 .message("OK")
                 .code(200)
+                .early(early)
                 .accessToken(jwtTokenProvider.createAccessToken(
                         userLoginData.get().getId(),
                         String.valueOf(userLoginData.get().getRole())))
@@ -103,6 +106,8 @@ public TokenResponseDto kakaoLogin(String accessToken) {
                     .profileImage(userInfo.getKakao_account().getProfile().getProfile_image_url())
                     .build();
 
+            early = true;
+
             userRepository.save(user);
         }
 
@@ -114,6 +119,7 @@ public TokenResponseDto kakaoLogin(String accessToken) {
         TokenResponseDto tokenResponseDto = TokenResponseDto.builder()
                 .message("OK")
                 .code(200)
+                .early(early)
                 .accessToken(jwtTokenProvider.createAccessToken(
                         userLoginData.get().getId(),
                         String.valueOf(userLoginData.get().getRole())))