Merge pull request #33 from YAPP-Github/refactor/T3-117

[T3-117] Service 비즈니스 코드 책임 기반의 리팩터링

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/changedRoutine/service/ChangedRoutineFactory.java

@@ -0,0 +1,51 @@
+package bitnagil.bitnagil_backend.changedRoutine.service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import org.springframework.stereotype.Service;
+
+import bitnagil.bitnagil_backend.changedRoutine.domain.ChangedRoutine;
+import bitnagil.bitnagil_backend.changedRoutine.domain.ChangedSubRoutine;
+import bitnagil.bitnagil_backend.changedRoutine.domain.enums.ChangedDivCode;
+import bitnagil.bitnagil_backend.global.entity.HistoryPk;
+import bitnagil.bitnagil_backend.global.utils.TimeUtils;
+import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedRoutine;
+import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedSubRoutine;
+import bitnagil.bitnagil_backend.user.domain.User;
+
+@Service
+public class ChangedRoutineFactory {
+
+    // 유저 초기 온보딩 시 추천 루틴을 등록할 때 변경 루틴에 저장
+    public ChangedRoutine createChangedRoutineForOnboarding(
+        User user, RecommendedRoutine recommendedRoutine, LocalDate today, LocalDateTime now) {
+
+        return ChangedRoutine.builder()
+            .changedRoutinePk(new HistoryPk(UUID.randomUUID(), 1L))
+            .changedRoutineName(recommendedRoutine.getRecommendedRoutineName())
+            .changedExecutionTime(recommendedRoutine.getTime())
+            .originalRoutineDate(today) // 원본 루틴 날짜는 현재 날짜로 설정
+            .changedRoutineDate(today) // 변경된 루틴 날짜도 현재 날짜로 설정
+            .historyStartDateTime(now)
+            .historyEndDateTime(TimeUtils.END_DATE_TIME)
+            .userId(user.getUserPk().getId())
+            .changedDivCode(ChangedDivCode.ONBOARDING)
+            .build();
+    }
+
+    // 유저 초기 온보딩 시 추천 루틴을 등록할 때 변경 서브루틴에 저장
+    public ChangedSubRoutine createChangedSubRoutineForOnboarding(
+        int sortOrder, RecommendedSubRoutine recommendedSubRoutine, LocalDateTime now, ChangedRoutine changedRoutine) {
+
+        return ChangedSubRoutine.builder()
+            .changedSubRoutinePk(new HistoryPk(UUID.randomUUID(), 1L))
+            .changedSubRoutineName(recommendedSubRoutine.getSubRoutineName())
+            .historyStartDateTime(now)
+            .historyEndDateTime(TimeUtils.END_DATE_TIME)
+            .changedRoutineId(changedRoutine.getChangedRoutinePk().getId())
+            .sortOrder(sortOrder + 1) // 1부터 시작
+            .build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/emotionMarble/response/RecommendedSubRoutineDto.java

@@ -1,5 +1,6 @@
 package bitnagil.bitnagil_backend.emotionMarble.response;
 
+import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/bitnagil/bitnagil_backend/emotionMarble/response/RegisterEmotionMarbleResponse.java

@@ -0,0 +1,39 @@
+package bitnagil.bitnagil_backend.emotionMarble.service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import bitnagil.bitnagil_backend.emotionMarble.domain.EmotionMarble;
+import bitnagil.bitnagil_backend.emotionMarble.request.RegisterEmotionMarbleRequest;
+import bitnagil.bitnagil_backend.global.entity.HistoryPk;
+import bitnagil.bitnagil_backend.onboarding.domain.Case;
+import bitnagil.bitnagil_backend.user.domain.User;
+
+/**
+ * 감정 구슬 관련 엔티티 생성 책임을 담당하는 클래스입니다.
+ */
+@Component
+public class EmotionMarbleFactory {
+
+    // 당일의 감정 구슬을 생성
+    public EmotionMarble createTodayEmotionMarble(User user, RegisterEmotionMarbleRequest request, LocalDate nowDate,
+        LocalDateTime nowDateTime, LocalDateTime endDateTime) {
+
+        return EmotionMarble.builder()
+            .emotionMarblePk(new HistoryPk(UUID.randomUUID(), 1L))
+            .emotionMarbleType(request.getEmotionMarbleType())
+            .date(nowDate)
+            .userId(user.getUserPk().getId())
+            .historyStartDateTime(nowDateTime)
+            .historyEndDateTime(endDateTime) // historyEndDateTime은 당일 11시 59분 59초로 설정(하루씩 설정되기 때문. 이러면 매일 감정 갱신이 불필요함)
+            .resultCase( // 감정 구슬에 따른 추천 루틴을 찾기 위해 Case 객체를 생성
+                Case.builder()
+                    .caseId(request.getEmotionMarbleType().getCaseId())
+                    .build()
+            ).build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleFactory.java

@@ -5,37 +5,34 @@
 import bitnagil.bitnagil_backend.emotionMarble.repository.EmotionMarbleRepository;
 import bitnagil.bitnagil_backend.emotionMarble.request.RegisterEmotionMarbleRequest;
 import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponse;
-import bitnagil.bitnagil_backend.emotionMarble.response.RecommendedRoutineDto;
-import bitnagil.bitnagil_backend.emotionMarble.response.RecommendedSubRoutineDto;
+import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineDto;
 import bitnagil.bitnagil_backend.emotionMarble.response.RegisterEmotionMarbleResponse;
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.exception.CustomException;
 
-import bitnagil.bitnagil_backend.onboarding.domain.Case;
-import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedRoutine;
-import bitnagil.bitnagil_backend.recommendedRoutine.domain.RecommendedSubRoutine;
-import bitnagil.bitnagil_backend.recommendedRoutine.repository.RecommendedRoutineRepository;
-import bitnagil.bitnagil_backend.recommendedRoutine.repository.RecommendedSubRoutineRepository;
+import bitnagil.bitnagil_backend.recommendedRoutine.service.RecommendedRoutineManager;
 import bitnagil.bitnagil_backend.user.domain.User;
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
+/**
+ * 감정 구슬에 대한 로직을 관리하는 클래스입니다.
+ */
 @Service
 @RequiredArgsConstructor
 public class EmotionMarbleService {
 
     private final EmotionMarbleRepository emotionMarbleRepository;
-    private final RecommendedRoutineRepository recommendRoutineRepository;
-    private final RecommendedSubRoutineRepository recommendedSubRoutineRepository;
+
+    private final RecommendedRoutineManager recommendedRoutineManager;
+    private final EmotionMarbleFactory emotionMarbleFactory;
 
     // 감정 구술 조회(enum의 value를 가져온다.)
     public EmotionMarbleTypeResponse getEmotionMarbles() {
@@ -55,56 +52,19 @@ public RegisterEmotionMarbleResponse registryEmotionMarble(User user, RegisterEm
             throw new CustomException(ErrorCode.ALREADY_REGISTERED_EMOTION_MARBLE);
         }
 
-        EmotionMarble emotionMarble = EmotionMarble.builder()
-                .emotionMarblePk(new HistoryPk(UUID.randomUUID(), 1L))
-                .emotionMarbleType(request.getEmotionMarbleType())
-                .date(nowDate)
-                .userId(user.getUserPk().getId())
-                .historyStartDateTime(nowDateTime)
-                .historyEndDateTime(endDateTime) // historyEndDateTime은 당일 11시 59분 59초로 설정(하루씩 설정되기 때문. 이러면 매일 감정 갱신이 불필요함)
-                .resultCase( // 감정 구슬에 따른 추천 루틴을 찾기 위해 Case 객체를 생성
-                        Case.builder()
-                                .caseId(request.getEmotionMarbleType().getCaseId())
-                                .build()
-                ).build();
+        EmotionMarble emotionMarble = emotionMarbleFactory.createTodayEmotionMarble(
+            user, request, nowDate, nowDateTime, endDateTime);
 
         emotionMarbleRepository.save(emotionMarble);
 
         // 감정 구슬에 따른 추천 루틴 응답
-        List<RecommendedRoutine> recommendedRoutines = recommendRoutineRepository.findByResultCase(emotionMarble.getResultCase());
-        if (recommendedRoutines.isEmpty()) {
-            throw new CustomException(ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE);
-        }
+        List<RecommendedRoutineDto> recommendedRoutineDtoList =
+            recommendedRoutineManager.recommendRoutinesByEmotionMarble(emotionMarble.getResultCase());
 
-        // 응답 생성
-        List<RecommendedRoutineDto> recommendedRoutineDtoList = new ArrayList<>();
-        for (RecommendedRoutine recommendedRoutine : recommendedRoutines) {
-            List<RecommendedSubRoutineDto> recommendedRoutineDetailDtoList = new ArrayList<>();
-
-            List<RecommendedSubRoutine> recommendedSubRoutines = recommendedSubRoutineRepository.findByRecommendedRoutine(recommendedRoutine);
-
-            // 추천 루틴의 세부 루틴을 dto로 변환한다.
-            for (RecommendedSubRoutine recommendedSubRoutine : recommendedSubRoutines) {
-                RecommendedSubRoutineDto recommendedRoutineDetailDto = RecommendedSubRoutineDto.builder()
-                        .recommendedSubRoutineId(recommendedSubRoutine.getRecommendedSubRoutineId())
-                        .recommendedSubRoutineName(recommendedSubRoutine.getSubRoutineName())
-                        .build();
-                recommendedRoutineDetailDtoList.add(recommendedRoutineDetailDto);
-            }
-
-            // 추천 루틴을 dto로 변환한다.
-            RecommendedRoutineDto recommendedRoutineDto = RecommendedRoutineDto.builder()
-                    .recommendedRoutineId(recommendedRoutine.getRecommendedRoutineId())
-                    .recommendedRoutineName(recommendedRoutine.getRecommendedRoutineName())
-                    .routineDescription(recommendedRoutine.getRecommendedRoutineDescription())
-                    .recommendedSubRoutines(recommendedRoutineDetailDtoList)
-                    .build();
-            recommendedRoutineDtoList.add(recommendedRoutineDto);
-        }
-
-        RegisterEmotionMarbleResponse response = RegisterEmotionMarbleResponse.builder()
+        return RegisterEmotionMarbleResponse.builder()
                 .recommendedRoutines(recommendedRoutineDtoList)
                 .build();
-        return response;
     }
+
+
 }

src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleService.java

@@ -1,5 +1,6 @@
 package bitnagil.bitnagil_backend.onboarding.response;
 
+import bitnagil.bitnagil_backend.recommendedRoutine.response.RecommendedRoutineDto;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;