diff --git a/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPrivateCalendarResponse.java b/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPrivateCalendarResponse.java index 512a394..e5f72bd 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPrivateCalendarResponse.java +++ b/BE/error/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/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPublicCalendarResponse.java b/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPublicCalendarResponse.java index 036b505..a4ad1a1 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/dto/AllPublicCalendarResponse.java +++ b/BE/error/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/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleResponseConverter.java b/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleResponseConverter.java index e9b8a74..3bab6d7 100644 --- a/BE/error/src/main/java/com/example/demo/schedule/application/model/converter/ScheduleResponseConverter.java +++ b/BE/error/src/main/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 toMonthModel(List models) { List response = new ArrayList<>();