From d7e29120a92f99d3b7496547fa0b9fd2c9478664 Mon Sep 17 00:00:00 2001 From: kimjm9841 Date: Tue, 13 Feb 2024 21:12:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=97=85=EB=AC=B4=EC=9D=BC?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20API=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onnoff/onnoff/domain/on/worklog/converter/OnConverter.java | 1 + .../onnoff/domain/on/worklog/converter/WorklogConverter.java | 1 + .../com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java index d37a58a..80eb533 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java @@ -37,6 +37,7 @@ public static OnResponse.OnViewDTO getOnDTO(Long userId, LocalDate date, List worklogDTOList = worklogList.stream() .map(worklog -> WorklogResponse.WorklogDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .build()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java index 9635c51..a2595d4 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java @@ -23,6 +23,7 @@ public static List toWorklogViewDTO(List wo return worklogList.stream() .map(worklog -> WorklogResponse.WorklogDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .build()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java index 522bfd9..af4076b 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java @@ -38,6 +38,7 @@ public static class ModifyResultDTO{ @AllArgsConstructor public static class WorklogDTO{ Long worklogId; + LocalDate date; String content; Boolean isChecked; } From 89bfc88e4f6b8da752d9c28208cb83828ddfc710 Mon Sep 17 00:00:00 2001 From: kimjm9841 Date: Tue, 13 Feb 2024 21:13:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EC=97=85=EB=AC=B4=EC=9D=BC?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80=20API=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onnoff/domain/on/worklog/converter/WorklogConverter.java | 1 + .../com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java index a2595d4..59de109 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java @@ -33,6 +33,7 @@ public static List toWorklogViewDTO(List wo public static WorklogResponse.AddResultDTO toAddWorklogResultDTO(Worklog worklog) { return WorklogResponse.AddResultDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .createdAt(worklog.getCreatedAt()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java index af4076b..68d4fae 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java @@ -15,6 +15,7 @@ public class WorklogResponse { @AllArgsConstructor public static class AddResultDTO{ Long worklogId; + LocalDate date; String content; Boolean isChecked; LocalDateTime createdAt; From 9a5f3e200c3b699ffa2106e2b80bcf42460c3fcc Mon Sep 17 00:00:00 2001 From: kimjm9841 Date: Tue, 13 Feb 2024 21:20:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EC=98=A4=EB=8A=98=EC=9D=98=20?= =?UTF-8?q?=EB=8B=A4=EC=A7=90=20=EC=B6=94=EA=B0=80=20API=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/on/resolution/converter/ResolutionConverter.java | 1 + .../onnoff/domain/on/resolution/dto/ResolutionResponse.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java index 1f01e44..6e3ccba 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java @@ -23,6 +23,7 @@ public static Resolution toAddResolution(Long order, ResolutionRequest.AddResolu public static ResolutionResponse.AddResultDTO toAddResolutionResultDTO(Resolution resolution){ return ResolutionResponse.AddResultDTO.builder() .resolutionId(resolution.getId()) + .date(resolution.getDate()) .order(resolution.getOrder()) .content(resolution.getContent()) .createdAt(resolution.getCreatedAt()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java b/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java index c7f27f2..8d2cfe4 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java @@ -16,6 +16,7 @@ public class ResolutionResponse { @AllArgsConstructor public static class AddResultDTO{ Long resolutionId; + LocalDate date; Integer order; String content; LocalDateTime createdAt;