refect: 수정,삭제 scope 통합

Author: KSH0326

src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java

@@ -4,7 +4,7 @@
 import com.back.domain.study.plan.dto.StudyPlanRequest;
 import com.back.domain.study.plan.dto.StudyPlanListResponse;
 import com.back.domain.study.plan.dto.StudyPlanResponse;
-import com.back.domain.study.plan.entity.StudyPlanException;
+import com.back.domain.study.plan.entity.ApplyScope;
 import com.back.domain.study.plan.service.StudyPlanService;
 import com.back.global.common.dto.RsData;
 import com.back.global.security.CustomUserDetails;
@@ -74,7 +74,7 @@ public ResponseEntity<RsData<StudyPlanResponse>> updateStudyPlan(
             // @AuthenticationPrincipal CustomUserDetails user,
             @PathVariable Long planId,
             @RequestBody StudyPlanRequest request,
-            @RequestParam(required = false, defaultValue = "THIS_ONLY") StudyPlanException.ApplyScope applyScope) {
+            @RequestParam(required = false, defaultValue = "THIS_ONLY") ApplyScope applyScope) {
         // Long userId = user.getId();
         Long userId = 1L; // 임시
 
@@ -85,18 +85,19 @@ public ResponseEntity<RsData<StudyPlanResponse>> updateStudyPlan(
 
 
     // ==================== 삭제 ===================
+    // 플랜 아이디는 원본의 아이디를 받음
+    // 가상인지 원본인지는 서비스에서 원본과 날짜를 대조해 판단
+    // 삭제 적용 범위를 쿼리 파라미터로 받음 (THIS_ONLY, FROM_THIS_DATE)
     @DeleteMapping("/{planId}")
     public ResponseEntity<RsData<Void>> deleteStudyPlan(
             // @AuthenticationPrincipal CustomUserDetails user,
             @PathVariable Long planId,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate selectedDate,
-            @RequestBody(required = false) StudyPlanDeleteRequest request) {
+            @RequestParam(required = false) ApplyScope applyScope) {
         Long userId = 1L; // 임시
 
-        studyPlanService.deleteStudyPlan(userId, planId, selectedDate, request);
+        studyPlanService.deleteStudyPlan(userId, planId, selectedDate, applyScope);
         return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 삭제되었습니다."));
     }
 
-
-
 }

src/main/java/com/back/domain/study/plan/entity/ApplyScope.java

@@ -0,0 +1,6 @@
+package com.back.domain.study.plan.entity;
+
+public enum ApplyScope {
+    THIS_ONLY,      // 이 날짜만
+    FROM_THIS_DATE  // 이 날짜부터 이후 모든 날짜
+}

src/main/java/com/back/domain/study/plan/entity/StudyPlanException.java

@@ -57,11 +57,6 @@ public enum ExceptionType {
         MODIFIED    // 해당 날짜 수정
     }
 
-    public enum ApplyScope {
-        THIS_ONLY,      // 이 날짜만
-        FROM_THIS_DATE  // 이 날짜부터 이후 모든 날짜
-    }
-
     @Embedded
     @AttributeOverrides({
             @AttributeOverride(name = "frequency", column = @Column(name = "modified_frequency")),

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

@@ -1,5 +1,6 @@
 package com.back.domain.study.plan.repository;
 
+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.Query;
@@ -20,7 +21,7 @@ public interface StudyPlanExceptionRepository extends JpaRepository<StudyPlanExc
             "ORDER BY spe.exceptionDate DESC")
     List<StudyPlanException> findByStudyPlanIdAndApplyScopeAndExceptionDateBefore(
             @Param("planId") Long planId,
-            @Param("applyScope") StudyPlanException.ApplyScope applyScope,
+            @Param("applyScope") ApplyScope applyScope,
             @Param("targetDate") LocalDateTime targetDate);
 // 특정 계획의 특정 기간 동안(start~end)의 예외를 조회
     @Query("SELECT spe FROM StudyPlanException spe WHERE spe.studyPlan.id = :planId " +

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

@@ -3,10 +3,7 @@
 import com.back.domain.study.plan.dto.StudyPlanDeleteRequest;
 import com.back.domain.study.plan.dto.StudyPlanRequest;
 import com.back.domain.study.plan.dto.StudyPlanResponse;
-import com.back.domain.study.plan.entity.RepeatRule;
-import com.back.domain.study.plan.entity.RepeatRuleEmbeddable;
-import com.back.domain.study.plan.entity.StudyPlan;
-import com.back.domain.study.plan.entity.StudyPlanException;
+import com.back.domain.study.plan.entity.*;
 import com.back.domain.study.plan.repository.StudyPlanExceptionRepository;
 import com.back.domain.study.plan.repository.StudyPlanRepository;
 import com.back.global.exception.CustomException;
@@ -211,7 +208,7 @@ private StudyPlanException getEffectiveException(Long planId, LocalDate targetDa
         List<StudyPlanException> scopeExceptions = studyPlanExceptionRepository
                 .findByStudyPlanIdAndApplyScopeAndExceptionDateBefore(
                         planId,
-                        StudyPlanException.ApplyScope.FROM_THIS_DATE,
+                        ApplyScope.FROM_THIS_DATE,
                         targetDate.atStartOfDay()
                 );
 
@@ -280,7 +277,7 @@ private enum UpdateType {
         REPEAT_INSTANCE_UPDATE   // 기존 예외 수정
     }
     @Transactional
-    public StudyPlanResponse updateStudyPlan(Long userId, Long planId, StudyPlanRequest request, StudyPlanException.ApplyScope applyScope) {
+    public StudyPlanResponse updateStudyPlan(Long userId, Long planId, StudyPlanRequest request, ApplyScope applyScope) {
         StudyPlan originalPlan = studyPlanRepository.findById(planId)
                 .orElseThrow(() -> new CustomException(ErrorCode.PLAN_NOT_FOUND));
 
@@ -348,7 +345,7 @@ private StudyPlanResponse updateOriginalPlan(StudyPlan originalPlan, StudyPlanRe
     }
 
     // 새로운 예외 추가
-    private StudyPlanResponse createRepeatException(StudyPlan originalPlan, StudyPlanRequest request, StudyPlanException.ApplyScope applyScope) {
+    private StudyPlanResponse createRepeatException(StudyPlan originalPlan, StudyPlanRequest request, ApplyScope applyScope) {
         LocalDate exceptionDate = request.getStartDate().toLocalDate();
 
         // 해당 날짜에 실제로 반복 계획이 있는지 확인
@@ -393,7 +390,7 @@ private StudyPlanResponse createRepeatException(StudyPlan originalPlan, StudyPla
     }
 
     // 기존 예외 수정
-    private StudyPlanResponse updateExistingException(StudyPlan originalPlan, StudyPlanRequest request, StudyPlanException.ApplyScope applyScope) {
+    private StudyPlanResponse updateExistingException(StudyPlan originalPlan, StudyPlanRequest request, ApplyScope applyScope) {
         LocalDate exceptionDate = request.getStartDate().toLocalDate();
 
         StudyPlanException existingException = studyPlanExceptionRepository
@@ -451,24 +448,24 @@ private void updateRepeatRule(RepeatRule repeatRule, StudyPlanRequest.RepeatRule
 
     // ==================== 삭제 ===================
     @Transactional
-    public void deleteStudyPlan(Long userId, Long planId, LocalDate selectedDate, StudyPlanDeleteRequest request) {
+    public void deleteStudyPlan(Long userId, Long planId, LocalDate selectedDate, ApplyScope applyScope) {
         StudyPlan studyPlan = studyPlanRepository.findById(planId)
                 .orElseThrow(() -> new CustomException(ErrorCode.PLAN_NOT_FOUND));
 
         validateUserAccess(studyPlan, userId);
 
-        // 단발성 계획 삭제 (request가 null이거나 deleteScope가 없는 경우)
-        if (studyPlan.getRepeatRule() == null || request == null || request.getDeleteScope() == null) {
+        // 단발성 계획 삭제 (반복 룰이 null이거나 applyScope가 null인 경우)
+        if (studyPlan.getRepeatRule() == null || applyScope == null ) {
             studyPlanRepository.delete(studyPlan);
             return;
         }
 
-        // 반복성 계획 삭제 - deleteScope에 따른 처리
-        deleteRepeatPlan(studyPlan, selectedDate, request.getDeleteScope());
+        // 반복성 계획 삭제 - applyScope에 따른 처리
+        deleteRepeatPlan(studyPlan, selectedDate, applyScope);
     }
 
-    private void deleteRepeatPlan(StudyPlan studyPlan, LocalDate selectedDate, StudyPlanDeleteRequest.DeleteScope deleteScope) {
-        switch (deleteScope) {
+    private void deleteRepeatPlan(StudyPlan studyPlan, LocalDate selectedDate, ApplyScope applyScope) {
+        switch (applyScope) {
             case FROM_THIS_DATE:
                 // 원본 날짜부터 삭제하는 경우 = 전체 계획 삭제
                 if (selectedDate.equals(studyPlan.getStartDate().toLocalDate())) {
@@ -488,7 +485,7 @@ private void deleteRepeatPlan(StudyPlan studyPlan, LocalDate selectedDate, Study
                 exception.setStudyPlan(studyPlan);
                 exception.setExceptionDate(selectedDate);
                 exception.setExceptionType(StudyPlanException.ExceptionType.DELETED);
-                exception.setApplyScope(StudyPlanException.ApplyScope.THIS_ONLY);
+                exception.setApplyScope(ApplyScope.THIS_ONLY);
                 studyPlanExceptionRepository.save(exception);
                 break;
         }