fix: entity 변경 중 에러 발생 수정

Author: KSH0326

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

@@ -1,6 +1,7 @@
 package com.back.domain.study.plan.dto;
 
 import com.back.domain.study.plan.entity.Color;
+import com.back.domain.study.plan.entity.DayOfWeek;
 import com.back.domain.study.plan.entity.Frequency;
 import com.back.domain.study.plan.entity.StudyPlan;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,6 +11,7 @@
 import lombok.Setter;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,6 +57,17 @@ public RepeatRuleResponse(com.back.domain.study.plan.entity.RepeatRule repeatRul
                 this.until = repeatRule.getUntilDate();
             }
         }
+
+        // 요일을 리스트로 접근 ("MON,TUE" -> [MON, TUE])
+        public List<DayOfWeek> getByDaysList() {
+            if (byDay == null || byDay.isEmpty()) {
+                return List.of();
+            }
+            return Arrays.stream(byDay.split(","))
+                    .map(String::trim)
+                    .map(com.back.domain.study.plan.entity.DayOfWeek::valueOf)
+                    .collect(Collectors.toList());
+        }
     }
     //엔티티를 DTO로 변환하는 생성자
     public StudyPlanResponse(StudyPlan studyPlan) {
@@ -65,17 +78,6 @@ public StudyPlanResponse(StudyPlan studyPlan) {
             this.endDate = studyPlan.getEndDate();
             this.color = studyPlan.getColor();
 
-            // 부모 계획 ID 설정
-            if (studyPlan.getParentPlan() != null) {
-                this.parentPlanId = studyPlan.getParentPlan().getId();
-            }
-
-            // 자식 계획들 변환
-            if (studyPlan.getChildPlans() != null && !studyPlan.getChildPlans().isEmpty()) {
-                this.childPlans = studyPlan.getChildPlans().stream()
-                        .map(StudyPlanResponse::new)
-                        .collect(Collectors.toList());
-            }
 
             // RepeatRule 변환
             if (studyPlan.getRepeatRule() != null) {

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

@@ -16,7 +16,7 @@
 @AllArgsConstructor
 public class RepeatRule extends BaseEntity {
     @OneToOne
-    @JoinColumn(name = "study_plan_id", nullable = false)
+    @JoinColumn(name = "plan_id", nullable = false)
     private StudyPlan studyPlan;
 
     @Enumerated(EnumType.STRING)
@@ -25,8 +25,9 @@ public class RepeatRule extends BaseEntity {
     @Column(name = "interval_value", nullable = false)
     private int RepeatInterval;
 
-    //필요 시 요일 지정
-    @Enumerated(EnumType.STRING)
+    //필요 시 요일 지정. 여러 요일 지정 시 ,로 구분
+    //현재는 요일 하나만 지정하는 형태로 구현
+    @Column(name = "by_day")
     private String byDay;
 
     private LocalDateTime untilDate;

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

@@ -34,22 +34,14 @@ public class StudyPlan extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private Color color;
 
-    // 부모 계획과의 연관관계
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent_plan_id",
-            foreignKey = @ForeignKey(name = "fk_study_plan_parent"))
-    private StudyPlan parentPlan;
-
-    // 자식 계획들과 연관관계
-    @OneToMany(mappedBy = "parentPlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private List<StudyPlan> childPlans = new ArrayList<>();
 
     @OneToOne(mappedBy = "studyPlan",cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private RepeatRule repeatRule;
 
-    @OneToMany(mappedBy = "todo", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "studyPlan", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<StudyRecord> studyRecords;
 
+    //반복 주기 설정 시 예외 리스트
     @OneToMany(mappedBy = "studyPlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<StudyPlanException> exceptions = new ArrayList<>();
 }

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

@@ -26,7 +26,6 @@ public StudyPlanResponse createStudyPlan(Long userId, StudyPlanCreateRequest req
         studyPlan.setStartDate(request.getStartDate());
         studyPlan.setEndDate(request.getEndDate());
         studyPlan.setColor(request.getColor());
-        studyPlan.setParentPlan(null);
 
         // 반복 규칙 설정
         if (request.getRepeatRule() != null) {
@@ -54,6 +53,7 @@ public StudyPlanResponse createStudyPlan(Long userId, StudyPlanCreateRequest req
             studyPlan.setRepeatRule(repeatRule);
         }
 
+        //추후 변수명이나 리턴 형식은 수정 예정
         StudyPlanResponse rs =new StudyPlanResponse(studyPlanRepository.save(studyPlan));
         return rs;
     }

src/main/java/com/back/domain/study/record/entity/StudyRecord.java

@@ -1,7 +1,6 @@
 package com.back.domain.study.record.entity;
 
 import com.back.domain.study.plan.entity.StudyPlan;
-import com.back.domain.study.todo.entity.Todo;
 import com.back.domain.studyroom.entity.Room;
 import com.back.global.entity.BaseEntity;
 import jakarta.persistence.Entity;
@@ -19,7 +18,7 @@
 public class StudyRecord extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "plan_id")
-    private StudyPlan plan;
+    private StudyPlan studyPlan;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "room_id")