refactor: Schedule 수정 기능 리팩토링

Author: capDoYeonLee

BE/error/src/main/java/com/example/demo/schedule/domain/ScheduleRepository.java

@@ -22,4 +22,6 @@ public interface ScheduleRepository {
     void deleteById(Long eventId);
 
     String findFilterColor(Long filterId);
+
+    String findFilterName(Long filterId);
 }

BE/error/src/main/java/com/example/demo/schedule/domain/model/ScheduleModel.java

@@ -29,26 +29,27 @@ public class ScheduleModel implements AbstractModel {
     private String eventInfo;
     private String eventPlace;
     private String scheduleType;
-    private FilterEntity filter;
-    private FilterModel filterModel;
-    private MemberModel memberModel;
     private Long filterId;
     private Long memberId;
-    private FilterRepository filterRepository;
     private ScheduleRepository scheduleRepository;
 
     public ScheduleModel update(ScheduleModel requestModel) {
-
         eventName = requestModel.getEventName();
         eventStartDate = requestModel.getEventStartDate();
         eventEndDate = requestModel.getEventEndDate();
         eventInfo = requestModel.getEventInfo();
         eventPlace = requestModel.getEventPlace();
-
+        filterId = this.getFilterId();
+        memberId = this.getMemberId();
         return this;
     }
 
     public String getFilterColor() {
         return scheduleRepository.findFilterColor(this.filterId);
     }
+
+    public String getFilterName() {
+        return scheduleRepository.findFilterName(this.filterId);
+    }
+
 }

BE/error/src/main/java/com/example/demo/schedule/domain/model/converter/ScheduleRequestConverter.java

@@ -28,12 +28,13 @@ public ScheduleModel from(CreateScheduleRequest source) {
 
     public ScheduleModel from(Long eventId, UpdateScheduleRequest source) {
         return ScheduleModel.builder()
-                .eventId(source.getEventId())
+                .eventId(eventId)
                 .eventName(source.getEventName())
                 .eventStartDate(source.getEventStartDate())
                 .eventEndDate(source.getEventEndDate())
                 .eventInfo(source.getEventInfo())
                 .eventPlace(source.getEventPlace())
+                //.filterId(source.getFilterId())
                 .build();
     }
 }

BE/error/src/main/java/com/example/demo/schedule/domain/model/converter/ScheduleResponseConverter.java

@@ -58,9 +58,9 @@ private AllPublicCalendarResponse toPublicCalendarResponse(ScheduleModel model)
                 .eventPlace(model.getEventPlace())
                 .eventInfo(model.getEventInfo())
                 .scheduleType(model.getScheduleType())
-                .filterId(model.getFilter() != null ? model.getFilter().getFilterId() : null)
-                .filterName(model.getFilter() != null ? model.getFilter().getFilterName() : null)
-                .filterColor(model.getFilter() != null ? model.getFilter().getFilterColor() : null)
+                .filterId(model.getFilterId())
+                .filterName(model.getFilterName())
+                .filterColor(model.getFilterColor())
                 .build();
     }
 
@@ -81,9 +81,9 @@ private AllPrivateCalendarResponse toPrivateCalendarResponse(ScheduleModel model
                 .eventPlace(model.getEventPlace())
                 .eventInfo(model.getEventInfo())
                 .scheduleType(model.getScheduleType())
-                .filterId(model.getFilter() != null ? model.getFilter().getFilterId() : null)
-                .filterName(model.getFilter() != null ? model.getFilter().getFilterName() : null)
-                .filterColor(model.getFilter() != null ? model.getFilter().getFilterColor() : null)
+                .filterId(model.getFilterId())
+                .filterName(model.getFilterName())
+                .filterColor(model.getFilterColor())
                 .build();
     }
 }

BE/error/src/main/java/com/example/demo/schedule/infrastructure/ScheduleEntityConverter.java

@@ -34,8 +34,6 @@ public ScheduleEntity toEntity(ScheduleModel source) {
                 .eventInfo(source.getEventInfo())
                 .eventPlace(source.getEventPlace())
                 .scheduleType(source.getScheduleType())
-                //.filter(source.getFilter())
-                //.filter(source.getFilterModel(source.getFilterId()))
                 .filterId(source.getFilterId())
                 .memberId(source.getMemberId())
                 .build();

BE/error/src/main/java/com/example/demo/schedule/infrastructure/persistence/ScheduleEntity.java

@@ -43,13 +43,7 @@ public class ScheduleEntity extends BaseEntity {
     @Column(nullable = false)
     private String scheduleType;
 
-//    @OneToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "filter_id")
-//    private FilterEntity filter;
 
-    //    @OneToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "member_id")
-//    private MemberEntity member;
     @Column(nullable = false)
     private Long memberId;
 

BE/error/src/main/java/com/example/demo/schedule/infrastructure/persistence/ScheduleJpaRepository.java

@@ -78,4 +78,13 @@ public String findFilterColor(Long filterId) {
                 .findFirst() // 첫 번째 결과 가져오기
                 .orElse(null);
     }
+
+    @Override
+    public String findFilterName(Long filterId) {
+        return em.createQuery("SELECT f.filterName FROM FilterEntity f WHERE f.filterId = :filterId", String.class)
+                .setParameter("filterId", filterId)
+                .getResultStream()
+                .findFirst() // 첫 번째 결과 가져오기
+                .orElse(null);
+    }
 }

BE/error/src/main/java/com/example/demo/schedule/presentation/ScheduleController.java

@@ -13,7 +13,6 @@
 import java.util.List;
 
 
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/calendar")