[fix] 공백처리

Mojacknong · Sep 14, 2024 · 70ad5bb · 70ad5bb
1 parent 6d5e2ce
commit 70ad5bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/GoogleLogin.java b/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/GoogleLogin.java
@@ -3,6 +3,7 @@
 import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
 import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
 import com.modernfarmer.farmusspring.domain.auth.util.social.dto.GoogleUserResponseDto;
+import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
 import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
 import com.modernfarmer.farmusspring.global.common.security.JwtTokenProvider;
 import com.modernfarmer.farmusspring.global.response.BaseResponseDto;
@@ -12,8 +13,8 @@
 @Component
 public class GoogleLogin extends SocialLogin{
 
-    public GoogleLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository) {
-        super(webClient, jwtTokenProvider, redisManager, userRepository);
+    public GoogleLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository, HistoryHelper historyHelper) {
+        super(webClient, jwtTokenProvider, redisManager, userRepository, historyHelper);
     }
 
     @Override

diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/KakaoLogin.java b/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/KakaoLogin.java
@@ -4,6 +4,7 @@
 import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
 import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
 import com.modernfarmer.farmusspring.domain.auth.util.social.dto.KakaoUserResponseDto;
+import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
 import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
 import com.modernfarmer.farmusspring.global.common.security.JwtTokenProvider;
 import com.modernfarmer.farmusspring.global.response.BaseResponseDto;
@@ -13,8 +14,8 @@
 @Component
 public class KakaoLogin extends SocialLogin {
 
-    public KakaoLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository) {
-        super(webClient, jwtTokenProvider, redisManager, userRepository);
+    public KakaoLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository, HistoryHelper historyHelper) {
+        super(webClient, jwtTokenProvider, redisManager, userRepository, historyHelper);
     }
 
     @Override

diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java b/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java
@@ -3,6 +3,7 @@
 import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
 import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
 import com.modernfarmer.farmusspring.domain.auth.util.social.dto.SocialUserResponseDto;
+import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
 import com.modernfarmer.farmusspring.domain.user.entity.User;
 import com.modernfarmer.farmusspring.domain.user.exception.custom.UserNotFoundException;
 import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
@@ -28,6 +29,7 @@ abstract public class SocialLogin {
     private final JwtTokenProvider jwtTokenProvider;
     private final RedisManager redisManager;
     private final UserRepository userRepository;
+    private final HistoryHelper historyHelper;
 
 
     public abstract LoginResponseDto loginMethod(String socialToken);
@@ -42,10 +44,9 @@ public  LoginResponseDto login(SocialUserResponseDto socialUserData){
                 });
         Optional<User> userLoginData = Optional.ofNullable(userRepository.findByUserNumber(String.valueOf(socialUserData.getId())).orElseThrow(() ->  new UserNotFoundException("해당 유저의 정보가 존재하지 않습니다.", UserErrorCode.NOT_FOUND_USER)));
         String refreshToken = jwtTokenProvider.createRefreshToken(userLoginData.get().getId());
-        String accessToken = jwtTokenProvider.createAccessToken(
-                userLoginData.get().getId(),
-                String.valueOf(userLoginData.get().getRole()));
+        String accessToken = jwtTokenProvider.createAccessToken(userLoginData.get().getId(), String.valueOf(userLoginData.get().getRole()));
         redisManager.setValueByKey(String.valueOf(userLoginData.get().getId()), refreshToken);
+        historyHelper.createUserHistory(userLoginData.get().getId());
         return LoginResponseDto.of(
                         accessToken,
                         refreshToken,