fix: performedDate를 포함한 쿼리메서드로 수정 (#51)

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/routine/repository/RoutineCompletionRepository.java

@@ -11,8 +11,8 @@
 
 public interface RoutineCompletionRepository extends JpaRepository<RoutineCompletion, Long> {
 
-    RoutineCompletion findByRoutineIdAndRoutineHistorySeqAndRoutineType(
-        UUID routineId, Long routineHistorySeq, RoutineType routineType);
+    RoutineCompletion findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
+        UUID routineId, LocalDate performedDate, Long routineHistorySeq, RoutineType routineType);
 
     Optional<RoutineCompletion> findByPerformedDateAndRoutineIdAndRoutineHistorySeqAndRoutineType(
         LocalDate performedDate, UUID routineId, Long routineHistorySeq, RoutineType routineType);

src/main/java/bitnagil/bitnagil_backend/routine/service/RoutineService.java

@@ -8,16 +8,13 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 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.changedRoutine.repository.ChangedRoutineRepository;
 import bitnagil.bitnagil_backend.changedRoutine.repository.ChangedSubRoutineRepository;
-import bitnagil.bitnagil_backend.emotionMarble.domain.EmotionMarble;
 import bitnagil.bitnagil_backend.emotionMarble.repository.EmotionMarbleRepository;
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
 import bitnagil.bitnagil_backend.routine.domain.RoutineCompletion;
 import bitnagil.bitnagil_backend.routine.domain.enums.RoutineType;
 import bitnagil.bitnagil_backend.routine.repository.RoutineCompletionRepository;
@@ -235,8 +232,9 @@ public void updateRoutineCompletionStatus(User user, UpdateRoutineCompletionRequ
 
             // 기존 완료 여부 엔티티가 존재하는지 조회
             RoutineCompletion existingRoutineCompletion = routineCompletionRepository
-                .findByRoutineIdAndRoutineHistorySeqAndRoutineType(
+                .findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
                     routineCompletionInfo.getRoutineId(),
+                    request.getPerformedDate(),
                     routineCompletionInfo.getHistorySeq(),
                     routineCompletionInfo.getRoutineType());
 
@@ -338,9 +336,11 @@ private void applyChangedRoutines(List<ChangedRoutine> changedRoutines,
 
                     // 변경 서브 루틴완료 여부를 파악
                     RoutineCompletion changedSubRoutineCompletion =
-                        routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
+                        routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
                             changedSubRoutine.getChangedSubRoutinePk().getId(),
-                            changedSubRoutine.getChangedSubRoutinePk().getHistorySeq(), RoutineType.CHANGED_SUB_ROUTINE);
+                            changedRoutineDate,
+                            changedSubRoutine.getChangedSubRoutinePk().getHistorySeq(),
+                            RoutineType.CHANGED_SUB_ROUTINE);
 
                     SubRoutineSearchResultDto changedSubRoutineSearchResultDto =
                         routineMapper.toChangedSubRoutineSearchResultDto(changedSubRoutine, changedSubRoutineCompletion);
@@ -352,9 +352,11 @@ private void applyChangedRoutines(List<ChangedRoutine> changedRoutines,
 
                 // 변경루틴 완료여부 조회
                 RoutineCompletion changedRoutineCompletion =
-                    routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
+                    routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
                         changedRoutine.getChangedRoutinePk().getId(),
-                        changedRoutine.getChangedRoutinePk().getHistorySeq(), RoutineType.CHANGED_ROUTINE);
+                        changedRoutineDate,
+                        changedRoutine.getChangedRoutinePk().getHistorySeq(),
+                        RoutineType.CHANGED_ROUTINE);
 
                 RoutineSearchResultDto changedRoutineSearchResultDto = routineMapper.toChangedRoutineSearchResultDto(
                     changedRoutine, changedSubRoutineSearchResultList, changedRoutineCompletion);
@@ -390,8 +392,9 @@ private Map<LocalDate, List<RoutineSearchResultDto>> buildRoutinesGroupedByDate(
 
                         // 서브 루틴 완료 여부 조회
                         RoutineCompletion subRoutineCompletion =
-                            routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
+                            routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
                                 subRoutine.getSubRoutinePk().getId(),
+                                date,
                                 subRoutine.getSubRoutinePk().getHistorySeq(),
                                 RoutineType.SUB_ROUTINE);
 
@@ -405,8 +408,12 @@ private Map<LocalDate, List<RoutineSearchResultDto>> buildRoutinesGroupedByDate(
                     subRoutineSearchResultList.sort((a, b) -> a.getSortOrder().compareTo(b.getSortOrder()));
 
                     // 루틴 완료 여부 조회
-                    RoutineCompletion routineCompletion = routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
-                            routine.getRoutinePk().getId(), routine.getRoutinePk().getHistorySeq(), RoutineType.ROUTINE);
+                    RoutineCompletion routineCompletion =
+                        routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
+                            routine.getRoutinePk().getId(),
+                            date,
+                            routine.getRoutinePk().getHistorySeq(),
+                            RoutineType.ROUTINE);
 
                     RoutineSearchResultDto routineSearchResultDto =
                         routineMapper.toRoutineSearchResultDto(routine, subRoutineSearchResultList, routineCompletion);