Merge pull request #155 from JNU-econovation/BE

feat: 일정 조회 dto 필드 추가
JNU-econovation · Jul 24, 2024 · 7bf16d1 · 7bf16d1
2 parents 5b9c459 + e1cc271
commit 7bf16d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...r/src/main/java/com/example/demo/schedule/application/dto/AllPrivateCalendarResponse.java b/...r/src/main/java/com/example/demo/schedule/application/dto/AllPrivateCalendarResponse.java
@@ -18,6 +18,7 @@ public class AllPrivateCalendarResponse {
     private String eventInfo;
     private String eventScope;
     private String scheduleType;
+    private Long filterId;
     private String filterName;
     private String filterColor;
 }
diff --git a/...or/src/main/java/com/example/demo/schedule/application/dto/AllPublicCalendarResponse.java b/...or/src/main/java/com/example/demo/schedule/application/dto/AllPublicCalendarResponse.java
@@ -18,6 +18,7 @@ public class AllPublicCalendarResponse {
     private String eventPlace;
     private String eventInfo;
     private String scheduleType;
+    private Long filterId;
     private String filterName;
     private String filterColor;
 }
diff --git a/...java/com/example/demo/schedule/application/model/converter/ScheduleResponseConverter.java b/...java/com/example/demo/schedule/application/model/converter/ScheduleResponseConverter.java
@@ -91,6 +91,7 @@ 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)
                 .build();
@@ -114,14 +115,13 @@ 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)
                 .build();
     }
 
 
-
-
     public List<MonthCalendarResponse> toMonthModel(List<ScheduleModel> models) {
 
         List<MonthCalendarResponse> response = new ArrayList<>();