From 88b1771a1638563a8bba7c55378bebad16c77036 Mon Sep 17 00:00:00 2001 From: Donghoon Jeong <112836685+jjeongdong@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:06:22 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=8A=B8=EB=9E=9C=EC=9E=AD=EC=85=98?= =?UTF-8?q?=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catchmate/domain/user/service/UserServiceImpl.java | 1 + .../catchmate/global/auth/service/AuthServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/back/catchmate/domain/user/service/UserServiceImpl.java b/src/main/java/com/back/catchmate/domain/user/service/UserServiceImpl.java index 1ed3974..aa3f0f2 100644 --- a/src/main/java/com/back/catchmate/domain/user/service/UserServiceImpl.java +++ b/src/main/java/com/back/catchmate/domain/user/service/UserServiceImpl.java @@ -40,6 +40,7 @@ public class UserServiceImpl implements UserService{ private final ClubConverter clubConverter; @Override + @Transactional public UserResponse.LoginInfo joinUser(UserJoinRequest request) { String providerIdWithProvider = request.getProviderId() + PROVIDER_ID_SEPARATOR + request.getProvider(); Club favoreiteClub = clubRepository.findById(request.getFavoriteClubId()) diff --git a/src/main/java/com/back/catchmate/global/auth/service/AuthServiceImpl.java b/src/main/java/com/back/catchmate/global/auth/service/AuthServiceImpl.java index 0ddbb19..9f4c8c0 100644 --- a/src/main/java/com/back/catchmate/global/auth/service/AuthServiceImpl.java +++ b/src/main/java/com/back/catchmate/global/auth/service/AuthServiceImpl.java @@ -41,12 +41,12 @@ public LoginInfo login(AuthRequest.LoginRequest loginRequest) { // 결합한 문자열로 사용자 조회 Optional findUserOptional = userRepository.findByProviderId(providerIdWithProvider); boolean isFirstLogin = false; - LoginInfo loginResponse; + LoginInfo loginInfo; if (findUserOptional.isEmpty()) { // 사용자가 없으면 최초 회원가입 여부를 true 반환 isFirstLogin = true; - loginResponse = authConverter.toLoginInfo(null, null, isFirstLogin); + loginInfo = authConverter.toLoginInfo(null, null, isFirstLogin); } else { // 회원가입된 사용자가 있으면 AccessToken과 RefreshToken 반환 User user = findUserOptional.get(); @@ -61,10 +61,10 @@ public LoginInfo login(AuthRequest.LoginRequest loginRequest) { // RefreshToken을 Redis에 저장 refreshTokenRedisRepository.save(RefreshToken.of(refreshToken, userId)); - loginResponse = authConverter.toLoginInfo(accessToken, refreshToken, isFirstLogin); + loginInfo = authConverter.toLoginInfo(accessToken, refreshToken, isFirstLogin); } - return loginResponse; + return loginInfo; } private void checkFcmToken(AuthRequest.LoginRequest loginRequest, User user) {