refact: plan - 사용되지 않는 import 및 매서드 정리

Author: KSH0326

src/main/java/com/back/domain/study/plan/dto/StudyPlanResponse.java

@@ -13,9 +13,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Getter
 @Setter

src/main/java/com/back/domain/study/plan/repository/StudyPlanExceptionRepository.java

@@ -3,13 +3,11 @@
 import com.back.domain.study.plan.entity.ApplyScope;
 import com.back.domain.study.plan.entity.StudyPlanException;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -21,21 +19,13 @@ List<StudyPlanException> findByStudyPlanIdAndApplyScopeAndExceptionDateLessThanE
             ApplyScope applyScope,
             LocalDate exceptionDate
     );
-// 특정 계획의 특정 기간 동안(start~end)의 예외를 조회
-    @Query("SELECT spe FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId " +
-            "AND spe.exceptionDate BETWEEN :startDate AND :endDate " +
-            "ORDER BY spe.exceptionDate")
-    List<StudyPlanException> findByStudyPlanIdAndExceptionDateBetween(@Param("planId") Long planId,
-                                                                      @Param("startDate") LocalDateTime startDate,
-                                                                      @Param("endDate") LocalDateTime endDate);
+
     // 특정 계획의 특정 날짜 예외 조회
     @Query("SELECT spe FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId " +
             "AND DATE(spe.exceptionDate) = DATE(:targetDate)")
     Optional<StudyPlanException> findByPlanIdAndDate(@Param("planId") Long planId,
                                                      @Param("targetDate") LocalDate targetDate);
 
     // 특정 계획의 특정 날짜 이후 예외 모두 삭제
-    @Modifying
-    @Query("DELETE FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId AND spe.exceptionDate > :date")
-    void deleteByStudyPlanIdAndExceptionDateAfter(@Param("planId") Long planId, @Param("date") LocalDate date);
+    void deleteByStudyPlanIdAndExceptionDateGreaterThanEqual(Long studyPlanId, LocalDate date);
 }

src/main/java/com/back/domain/study/plan/service/StudyPlanService.java

@@ -16,8 +16,6 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -439,15 +437,14 @@ private StudyPlanResponse updateExistingException(StudyPlan originalPlan, StudyP
 
     // 원본의 반복 룰 수정 (엔티티)
     private void updateRepeatRule(RepeatRule repeatRule, StudyPlanRequest.RepeatRuleRequest request, StudyPlan studyPlan) {
-        // byDay, untilDate 처리
+        // byDay 처리
         List<DayOfWeek> byDay = getByDayForWeekly(request, studyPlan.getStartDate());
-        LocalDate untilDate = request.getUntilDate();
 
         repeatRule.update(
                 request.getFrequency(),
                 request.getIntervalValue(),
                 byDay,
-                untilDate
+                request.getUntilDate()
         );
     }
 
@@ -497,30 +494,20 @@ private void deleteRepeatPlan(StudyPlan studyPlan, LocalDate selectedDate, Apply
                 if (selectedDate.equals(studyPlan.getStartDate().toLocalDate())) {
                     studyPlanRepository.delete(studyPlan); // CASCADE로 RepeatRule, Exception 모두 삭제
                 } else {
-                    // 기존 예외 확인
-                    Optional<StudyPlanException> existingException = studyPlanExceptionRepository
-                            .findByPlanIdAndDate(studyPlan.getId(), selectedDate);
-
-                    if (existingException.isPresent()) {
-                        // 기존 예외가 있다면 삭제 타입으로 변경
-                        existingException.get().changeToDeleted(ApplyScope.FROM_THIS_DATE);
-                        studyPlanExceptionRepository.save(existingException.get());
-                    } else {
-                        // 예외가 없다면 새로 생성
-                        StudyPlanException exception = StudyPlanException.createDeleted(
-                                studyPlan, selectedDate, ApplyScope.FROM_THIS_DATE
-                        );
-                        studyPlanExceptionRepository.save(exception);
-                    }
-
-                    // untilDate 수정
+                    /* 선택한 날짜가 원본 날짜 이후인 경우
+                     * untilDate 조정만으로도 조회가 안되게 설정이 가능하기 때문에
+                     * 예외를 안 만들고 untilDate 수정으로 처리
+                     */
                     RepeatRule repeatRule = studyPlan.getRepeatRule();
                     LocalDate newUntilDate = selectedDate.minusDays(1);
                     repeatRule.update(null, null, null, newUntilDate);
                     studyPlanRepository.save(studyPlan);
 
-                    studyPlanExceptionRepository.deleteByStudyPlanIdAndExceptionDateAfter(
-                            studyPlan.getId(), selectedDate);
+                    // 선택한 날짜 포함 이후의 예외들은 모두 삭제
+                    studyPlanExceptionRepository.deleteByStudyPlanIdAndExceptionDateGreaterThanEqual(
+                            studyPlan.getId(),
+                            selectedDate
+                    );
                 }
                 break;
 
@@ -651,7 +638,7 @@ private void validateRepeatRuleDate(StudyPlan studyPlan, LocalDate untilDate) {
             throw new CustomException(ErrorCode.REPEAT_INVALID_UNTIL_DATE);
         }
     }
-    // WEEKLY인 경우 빈 byDay 처리 메서드 (RepeatRule용)
+    // WEEKLY인 경우 빈 byDay 처리 메서드 (RepeatRule, RepeatRuleEmbeddable 둘 다 사용 가능)
     private List<DayOfWeek> getByDayForWeekly(StudyPlanRequest.RepeatRuleRequest request, LocalDateTime startDate) {
         if (request.getFrequency() == Frequency.WEEKLY) {
             if (request.getByDay() == null || request.getByDay().isEmpty()) {
@@ -662,17 +649,6 @@ private List<DayOfWeek> getByDayForWeekly(StudyPlanRequest.RepeatRuleRequest req
         }
         return new ArrayList<>();
     }
-    // WEEKLY인 경우 빈 byDay 처리 메서드 (RepeatRuleEmbeddable용 - 오버로딩)
-    private void getByDayInWeekly(StudyPlanRequest.RepeatRuleRequest request, LocalDateTime startDate, RepeatRuleEmbeddable embeddable) {
-        if (request.getFrequency() == Frequency.WEEKLY) {
-            if (request.getByDay() == null || request.getByDay().isEmpty()) {
-                DayOfWeek startDay = DayOfWeek.valueOf(startDate.getDayOfWeek().name().substring(0, 3));
-                embeddable.setByDay(List.of(startDay));
-            } else {
-                embeddable.setByDay(request.getByDay());
-            }
-        }
-    }
 
     // THIS_ONLY로 FROM_THIS_DATE 예외를 삭제할 때 다음 빈 날짜 찾기 (재귀탐색)
     private LocalDate findNextAvailableDateForException(StudyPlan studyPlan, LocalDate startDate) {