refactor: 업데이트를 위해 User를 영속 상태로 만드는 로직을 UserManager 클래스로 위임

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/onboarding/service/OnboardingService.java

@@ -21,6 +21,7 @@
 import bitnagil.bitnagil_backend.recommendedRoutine.service.RecommendedRoutineManager;
 import bitnagil.bitnagil_backend.user.domain.User;
 import bitnagil.bitnagil_backend.user.repository.UserRepository;
+import bitnagil.bitnagil_backend.user.service.UserManager;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.stereotype.Service;
@@ -46,6 +47,7 @@ public class OnboardingService {
 
     private final RecommendedRoutineManager recommendedRoutineManager;
     private final ChangedRoutineFactory changedRoutineFactory;
+    private final UserManager userManager;
 
     /**
      * 유저와 매칭되는 온보딩 결과를 설정하고, 리턴하는 메서드
@@ -62,9 +64,8 @@ public CustomResponseDto<OnboardingResponse> startOnboarding(OnboardingRequest r
         );
 
         // 회원은 온보딩과의 연관관계를 설정한다.
-        user = userRepository.findByUserPk(user.getUserPk()).orElseThrow(
-            () -> new CustomException(ErrorCode.NOT_FOUND_USER));
-        user.updateOnboarding(onboarding);
+        User persistedUser = userManager.getPersistedUser(user);
+        persistedUser.updateOnboarding(onboarding);
 
         // 온보딩의 CASE를 통해 추천루틴을 조회한다.
         List<RecommendedRoutineDto> recommendedRoutineDtoList =

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/service/RecommendedRoutineManager.java

@@ -4,6 +4,7 @@
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.exception.CustomException;
@@ -15,7 +16,10 @@
 import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedSubRoutineSearchResult;
 import lombok.RequiredArgsConstructor;
 
-@Component
+/**
+ * 외부에서 사용되는 추천 루틴에 대한 공통 로직을 관리하는 클래스입니다.
+ */
+@Service
 @RequiredArgsConstructor
 public class RecommendedRoutineManager {
 

src/main/java/bitnagil/bitnagil_backend/recommendedRoutine/service/RecommendedRoutineService.java

@@ -15,7 +15,7 @@
 import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineSearchResult;
 import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedSubRoutineSearchResult;
 import bitnagil.bitnagil_backend.user.domain.User;
-import bitnagil.bitnagil_backend.user.repository.UserRepository;
+import bitnagil.bitnagil_backend.user.service.UserManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,9 +38,9 @@ public class RecommendedRoutineService {
     private final RecommendedRoutineRepository recommendedRoutineRepository;
     private final RecommendedSubRoutineRepository recommendedSubRoutineRepository;
     private final EmotionMarbleRepository emotionMarbleRepository;
-    private final UserRepository userRepository;
 
     private final RecommendedRoutineMapper recommendedRoutineMapper;
+    private final UserManager userManager;
 
     /**
      * 추천 카테고리별 루틴, 서브루틴을 조회
@@ -56,11 +56,10 @@ public RecommendedRoutineSearchResponse searchRecommendedRoutines(User user) {
         response.put(RecommendedRoutineType.PERSONALIZED, new ArrayList<>()); // 맞춤 루틴은 미리 초기화 한다.(감정구슬, 온보딩 결과를 넣기 위해)
 
         // 영속성 객체에 user를 저장하기 위해 user를 조회
-        user = userRepository.findByUserPk(user.getUserPk())
-            .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
+        User persistedUser = userManager.getPersistedUser(user);
 
         // 맞춤 추천(감정구슬 + 온보딩)을 조회하고 response에 추가
-        EmotionMarble emotionMarble = addPersonalizedRecommendedRoutine(user, nowDate, response);
+        EmotionMarble emotionMarble = addPersonalizedRecommendedRoutine(persistedUser, nowDate, response);
 
         // 맞춤추천 이외의 카테고리에 대한 추천 루틴을 response 추가
         addCategoryRecommendedRoutines(response);

src/main/java/bitnagil/bitnagil_backend/user/service/UserAuthService.java

@@ -41,6 +41,8 @@ public class UserAuthService {
     private final AppleUserInfoService appleUserInfoService;
     private final KakaoUserInfoService kakaoUserInfoService;
 
+    private final UserManager userManager;
+
     // 소셜 로그인을 통해 로그인 혹은 회원가입을 진행
     @Transactional
     public UserLoginResponse socialLogin(SocialType socialType, String nickname, String socialAccessToken) {
@@ -92,32 +94,30 @@ public void withdrawal(User user) {
         LocalDateTime now = LocalDateTime.now();
 
         // 변경 감지를 위해 영속 상태로 설정
-        User persistentUser = userRepository.findByUserPk(user.getUserPk()).orElseThrow(
-            () -> new CustomException(ErrorCode.NOT_FOUND_USER));
+        User persistedUser = userManager.getPersistedUser(user);
 
-        invalidateToken(persistentUser);
+        invalidateToken(persistedUser);
 
         // 기존 유저의 이력 종료일시를 갱신 및 role 변경
-        persistentUser.updateHistoryEndDateTime(now);
-        persistentUser.changeRoleToWithdrawn();
+        persistedUser.updateHistoryEndDateTime(now);
+        persistedUser.changeRoleToWithdrawn();
 
-        unlinkFromSocial(persistentUser);
+        unlinkFromSocial(persistedUser);
     }
 
     // 약관 동의 - 회원의 ROLE을 USER로 업데이트
     @Transactional
     public void agreements(UserAgreementsRequest userAgreeMentsRequest, User user) {
         // 약관 동의 시 ROLE을 USER로 변경 및 동의 여부 업데이트
-        User findUser = userRepository.findByUserPk(user.getUserPk()).orElseThrow(() ->
-            new CustomException(ErrorCode.NOT_FOUND_USER));
+        User persistedUser = userManager.getPersistedUser(user);
 
         if(userAgreeMentsRequest.getAgreedToTermsOfService() == false ||
             userAgreeMentsRequest.getAgreedToPrivacyPolicy() == false ||
             userAgreeMentsRequest.getIsOverFourteen() == false) {
             throw new CustomException(ErrorCode.AGREEMENT_NOT_ACCEPTED);
         }
 
-        findUser.updateAgreements(userAgreeMentsRequest.getAgreedToTermsOfService(),
+        persistedUser.updateAgreements(userAgreeMentsRequest.getAgreedToTermsOfService(),
                                   userAgreeMentsRequest.getAgreedToPrivacyPolicy(),
                                   userAgreeMentsRequest.getIsOverFourteen());
     }

src/main/java/bitnagil/bitnagil_backend/user/service/UserManager.java

@@ -0,0 +1,25 @@
+package bitnagil.bitnagil_backend.user.service;
+
+import org.springframework.stereotype.Service;
+
+import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
+import bitnagil.bitnagil_backend.global.exception.CustomException;
+import bitnagil.bitnagil_backend.user.domain.User;
+import bitnagil.bitnagil_backend.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 외부에서 사용되는 유저에 대한 공통 로직을 관리하는 클래스입니다.
+ */
+@Service
+@RequiredArgsConstructor
+public class UserManager {
+
+    private final UserRepository userRepository;
+
+    // User 엔티티를 영속 상태로 변경하여 user 정보를 업데이트를 하기 위한 메서드
+    public User getPersistedUser(User user) {
+        return userRepository.findByUserPk(user.getUserPk()).orElseThrow(
+            () -> new CustomException(ErrorCode.NOT_FOUND_USER));
+    }
+}

src/main/java/bitnagil/bitnagil_backend/user/service/UserService.java

@@ -16,7 +16,6 @@ public class UserService {
 
     private final UserMapper userMapper;
 
-    @Transactional(readOnly = true)
     public UserInfoResponse getUserInfo(User user) {
         return userMapper.toUserInfoResponse(user);
     }