feat: 삭제 기능 구현 및 타입 불일치 수정

KSH0326 · KSH0326 · commit 4bb3c4d4ac0b · 2025-09-25T17:06:17.000+09:00
diff --git a/src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java b/src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java
@@ -1,5 +1,6 @@
 package com.back.domain.study.plan.controller;
 
+import com.back.domain.study.plan.dto.StudyPlanDeleteRequest;
 import com.back.domain.study.plan.dto.StudyPlanRequest;
 import com.back.domain.study.plan.dto.StudyPlanListResponse;
 import com.back.domain.study.plan.dto.StudyPlanResponse;
@@ -85,9 +86,15 @@ public ResponseEntity<RsData<StudyPlanResponse>> updateStudyPlan(
 
     // ==================== 삭제 ===================
     @DeleteMapping("/{planId}")
-    public ResponseEntity<RsData<Void>> deleteStudyPlan(@PathVariable Long planId) {
-        //studyPlanService.deleteStudyPlan(planId);
-        return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 삭제되었습니다.", null));
+    public ResponseEntity<RsData<Void>> deleteStudyPlan(
+            // @AuthenticationPrincipal CustomUserDetails user,
+            @PathVariable Long planId,
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate selectedDate,
+            @RequestBody(required = false) StudyPlanDeleteRequest request) {
+        Long userId = 1L; // 임시
+
+        studyPlanService.deleteStudyPlan(userId, planId, selectedDate, request);
+        return ResponseEntity.ok(RsData.success("학습 계획이 성공적으로 삭제되었습니다."));
     }
 
 
diff --git a/src/main/java/com/back/domain/study/plan/dto/StudyPlanDeleteRequest.java b/src/main/java/com/back/domain/study/plan/dto/StudyPlanDeleteRequest.java
@@ -0,0 +1,19 @@
+package com.back.domain.study.plan.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class StudyPlanDeleteRequest {
+    private DeleteScope deleteScope;
+
+    public enum DeleteScope {
+        THIS_ONLY,      // 이 날짜만
+        FROM_THIS_DATE  // 이 날짜부터 이후 모든 날짜
+    }
+}
diff --git a/src/main/java/com/back/domain/study/plan/dto/StudyPlanResponse.java b/src/main/java/com/back/domain/study/plan/dto/StudyPlanResponse.java
@@ -44,7 +44,7 @@ public static class RepeatRuleResponse {
         private Integer repeatInterval;
         private String byDay; // "MON" 형태의 문자열
 
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
         private LocalDate untilDate;
 
         public RepeatRuleResponse(com.back.domain.study.plan.entity.RepeatRule repeatRule) {
diff --git a/src/main/java/com/back/domain/study/plan/entity/RepeatRule.java b/src/main/java/com/back/domain/study/plan/entity/RepeatRule.java
@@ -23,7 +23,7 @@ public class RepeatRule extends BaseEntity {
     private Frequency frequency;
 
     @Column(name = "interval_value", nullable = false)
-    private int RepeatInterval;
+    private int repeatInterval;
 
     //요일은 계획 날짜에 따라 자동 설정
     @Column(name = "by_day")
diff --git a/src/main/java/com/back/domain/study/plan/entity/StudyPlanException.java b/src/main/java/com/back/domain/study/plan/entity/StudyPlanException.java
@@ -26,7 +26,7 @@ public class StudyPlanException extends BaseEntity {
 
     // 예외가 발생한 날짜
     @Column(name = "exception_date", nullable = false)
-    private LocalDateTime exceptionDate;
+    private LocalDate exceptionDate;
 
     //예외 유형 (수정 / 삭제)
     @Enumerated(EnumType.STRING)
diff --git a/src/main/java/com/back/domain/study/plan/repository/StudyPlanExceptionRepository.java b/src/main/java/com/back/domain/study/plan/repository/StudyPlanExceptionRepository.java
@@ -6,6 +6,7 @@
 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;
@@ -32,5 +33,5 @@ List<StudyPlanException> findByStudyPlanIdAndExceptionDateBetween(@Param("planId
     @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") LocalDateTime targetDate);
+                                                     @Param("targetDate") LocalDate targetDate);
 }
diff --git a/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java b/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java
@@ -1,5 +1,6 @@
 package com.back.domain.study.plan.service;
 
+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;
@@ -201,7 +202,7 @@ private boolean shouldRepeatOnDate(StudyPlan originalPlan, LocalDate targetDate)
     private StudyPlanException getEffectiveException(Long planId, LocalDate targetDate) {
         // 해당 날짜에 직접적인 예외가 있는지 확인
         Optional<StudyPlanException> directException = studyPlanExceptionRepository
-                .findByPlanIdAndDate(planId, targetDate.atStartOfDay());
+                .findByPlanIdAndDate(planId, targetDate);
         if (directException.isPresent()) {
             return directException.get();
         }
@@ -320,7 +321,7 @@ private UpdateType determineUpdateType(StudyPlan originalPlan, StudyPlanRequest
 
         // 1-2. 반복 계획에서 다른 날짜인 경우 -> 기존 예외 확인
         Optional<StudyPlanException> existingException = studyPlanExceptionRepository
-                .findByPlanIdAndDate(originalPlan.getId(), requestDate.atStartOfDay());
+                .findByPlanIdAndDate(originalPlan.getId(), requestDate);
 
         if (existingException.isPresent()) {
         return UpdateType.REPEAT_INSTANCE_UPDATE; // 기존 예외 수정
@@ -357,7 +358,7 @@ private StudyPlanResponse createRepeatException(StudyPlan originalPlan, StudyPla
 
         StudyPlanException exception = new StudyPlanException();
         exception.setStudyPlan(originalPlan);
-        exception.setExceptionDate(exceptionDate.atStartOfDay());
+        exception.setExceptionDate(exceptionDate);
         exception.setExceptionType(StudyPlanException.ExceptionType.MODIFIED);
         exception.setApplyScope(applyScope); // 파라미터로 받은 applyScope
 
@@ -396,7 +397,7 @@ private StudyPlanResponse updateExistingException(StudyPlan originalPlan, StudyP
         LocalDate exceptionDate = request.getStartDate().toLocalDate();
 
         StudyPlanException existingException = studyPlanExceptionRepository
-                .findByPlanIdAndDate(originalPlan.getId(), exceptionDate.atStartOfDay())
+                .findByPlanIdAndDate(originalPlan.getId(), exceptionDate)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
         // 기존 예외 정보 업데이트
@@ -449,7 +450,49 @@ private void updateRepeatRule(RepeatRule repeatRule, StudyPlanRequest.RepeatRule
     }
 
     // ==================== 삭제 ===================
+    @Transactional
+    public void deleteStudyPlan(Long userId, Long planId, LocalDate selectedDate, StudyPlanDeleteRequest request) {
+        StudyPlan studyPlan = studyPlanRepository.findById(planId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
+
+        validateUserAccess(studyPlan, userId);
 
+        // 단발성 계획 삭제 (request가 null이거나 deleteScope가 없는 경우)
+        if (studyPlan.getRepeatRule() == null || request == null || request.getDeleteScope() == null) {
+            studyPlanRepository.delete(studyPlan);
+            return;
+        }
+
+        // 반복성 계획 삭제 - deleteScope에 따른 처리
+        deleteRepeatPlan(studyPlan, selectedDate, request.getDeleteScope());
+    }
+
+    private void deleteRepeatPlan(StudyPlan studyPlan, LocalDate selectedDate, StudyPlanDeleteRequest.DeleteScope deleteScope) {
+        switch (deleteScope) {
+            case FROM_THIS_DATE:
+                // 원본 날짜부터 삭제하는 경우 = 전체 계획 삭제
+                if (selectedDate.equals(studyPlan.getStartDate().toLocalDate())) {
+                    studyPlanRepository.delete(studyPlan); // CASCADE로 RepeatRule, Exception 모두 삭제
+                } else {
+                    // 중간 날짜부터 삭제하는 경우 = untilDate 수정
+                    RepeatRule repeatRule = studyPlan.getRepeatRule();
+                    LocalDate newUntilDate = selectedDate.minusDays(1);
+                    repeatRule.setUntilDate(newUntilDate);
+                    studyPlanRepository.save(studyPlan);
+                }
+                break;
+
+            case THIS_ONLY:
+                // 선택한 날짜만 삭제 - 예외 생성
+                StudyPlanException exception = new StudyPlanException();
+                exception.setStudyPlan(studyPlan);
+                exception.setExceptionDate(selectedDate);
+                exception.setExceptionType(StudyPlanException.ExceptionType.DELETED);
+                exception.setApplyScope(StudyPlanException.ApplyScope.THIS_ONLY);
+                studyPlanExceptionRepository.save(exception);
+                break;
+        }
+    }
 
     // ==================== 유틸 ===================
     // 인가 (작성자 일치 확인)
