From d71d99a6925e3f6955a92190ec937822d88b36df Mon Sep 17 00:00:00 2001 From: JeonHaeseung <414catherine@gmail.com> Date: Sun, 14 Apr 2024 18:06:20 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=EC=8A=A4=EC=BC=80=EC=A5=B4=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=20API=20=EC=8A=A4=ED=8E=99=20=EB=B3=80=EA=B2=BD(id?= =?UTF-8?q?=EB=A5=BC=20=EC=B5=9C=EC=83=81=EB=8B=A8=EC=97=90=20=EB=B0=98?= =?UTF-8?q?=ED=99=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ness/Backend/domain/schedule/ScheduleService.java | 2 +- .../schedule/dto/response/GetScheduleDetailDto.java | 6 +----- .../domain/schedule/dto/response/GetScheduleDto.java | 8 +++++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/Ness/Backend/domain/schedule/ScheduleService.java b/src/main/java/Ness/Backend/domain/schedule/ScheduleService.java index c8d73f8..a8e0fe3 100644 --- a/src/main/java/Ness/Backend/domain/schedule/ScheduleService.java +++ b/src/main/java/Ness/Backend/domain/schedule/ScheduleService.java @@ -44,13 +44,13 @@ public GetOneMonthSchedulesDto getOneMonthUserSchedule(Long id, String date){ // ScheduleListResponseDto에 매핑 List getScheduleDtos = scheduleList.stream() .map(schedule -> GetScheduleDto.builder() + .id(schedule.getId()) .category(schedule.getCategory().getName()) .categoryNum(schedule.getCategory().getId()) .info(schedule.getInfo()) .startTime(schedule.getStartTime()) .endTime(schedule.getEndTime()) .details(GetScheduleDetailDto.builder() - .id(schedule.getId()) .person(schedule.getPerson()) .location(schedule.getLocation()) .build()) diff --git a/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDetailDto.java b/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDetailDto.java index 6614192..ddc4e17 100644 --- a/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDetailDto.java +++ b/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDetailDto.java @@ -9,9 +9,6 @@ @Data @NoArgsConstructor public class GetScheduleDetailDto { - @Schema(description = "스케쥴 고유 인식 넘버", example = "0") - private Long id; - @Schema(description = "스케쥴 위치", example = "이화여대 ECC") private String location; @@ -19,8 +16,7 @@ public class GetScheduleDetailDto { private String person; @Builder - public GetScheduleDetailDto(Long id, String location, String person){ - this.id = id; + public GetScheduleDetailDto(String location, String person){ this.location = location; this.person = person; } diff --git a/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDto.java b/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDto.java index 52719f6..8a47e29 100644 --- a/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDto.java +++ b/src/main/java/Ness/Backend/domain/schedule/dto/response/GetScheduleDto.java @@ -11,6 +11,9 @@ @Data @NoArgsConstructor public class GetScheduleDto { + @Schema(description = "스케쥴 고유 인식 넘버", example = "0") + private Long id; + @Schema(description = "스케쥴 텍스트 내용", example = "AI 공부") @JsonProperty("title") private String info; @@ -36,7 +39,10 @@ public class GetScheduleDto { private GetScheduleDetailDto details; @Builder - public GetScheduleDto(String category, Long categoryNum, String info, ZonedDateTime startTime, ZonedDateTime endTime, GetScheduleDetailDto details){ + public GetScheduleDto(Long id, String category, Long categoryNum, + String info, ZonedDateTime startTime, ZonedDateTime endTime, + GetScheduleDetailDto details){ + this.id = id; this.category = category; this.categoryNum = categoryNum; this.info = info;