Merge pull request #82 from OnAndOff-UMC/feat/#81

[feat]: ON 관련 API 수정
OnAndOff-UMC · Feb 13, 2024 · 5dd9118 · 5dd9118
2 parents 184855d + 9a5f3e2
commit 5dd9118
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
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
@@ -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
@@ -16,6 +16,7 @@ public class ResolutionResponse {
     @AllArgsConstructor
     public static class AddResultDTO{
         Long resolutionId;
+        LocalDate date;
         Integer order;
         String content;
         LocalDateTime createdAt;

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
@@ -37,6 +37,7 @@ public static OnResponse.OnViewDTO getOnDTO(Long userId, LocalDate date,
         List<WorklogResponse.WorklogDTO> 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
@@ -23,6 +23,7 @@ public static List<WorklogResponse.WorklogDTO> toWorklogViewDTO(List<Worklog> wo
         return worklogList.stream()
                 .map(worklog -> WorklogResponse.WorklogDTO.builder()
                         .worklogId(worklog.getId())
+                        .date(worklog.getDate())
                         .content(worklog.getContent())
                         .isChecked(worklog.getIsChecked())
                         .build())
@@ -32,6 +33,7 @@ public static List<WorklogResponse.WorklogDTO> toWorklogViewDTO(List<Worklog> 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
@@ -15,6 +15,7 @@ public class WorklogResponse {
     @AllArgsConstructor
     public static class AddResultDTO{
         Long worklogId;
+        LocalDate date;
         String content;
         Boolean isChecked;
         LocalDateTime createdAt;
@@ -38,6 +39,7 @@ public static class ModifyResultDTO{
     @AllArgsConstructor
     public static class WorklogDTO{
         Long worklogId;
+        LocalDate date;
         String content;
         Boolean isChecked;
     }