Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat]: ON 관련 API 수정 #82

Merged
merged 3 commits into from
Feb 13, 2024
Merged

[feat]: ON 관련 API 수정 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7e2912
feat: 업무일지 조회 API 응답 데이터 수정
kimjm9841 Feb 13, 2024
89bfc88
feat: 업무일지 추가 API 응답 데이터 수정
kimjm9841 Feb 13, 2024
9a5f3e2
feat: 오늘의 다짐 추가 API 응답 데이터 수정
kimjm9841 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class ResolutionResponse {
@AllArgsConstructor
public static class AddResultDTO{
Long resolutionId;
LocalDate date;
Integer order;
String content;
LocalDateTime createdAt;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class WorklogResponse {
@AllArgsConstructor
public static class AddResultDTO{
Long worklogId;
LocalDate date;
String content;
Boolean isChecked;
LocalDateTime createdAt;
Expand All @@ -38,6 +39,7 @@ public static class ModifyResultDTO{
@AllArgsConstructor
public static class WorklogDTO{
Long worklogId;
LocalDate date;
String content;
Boolean isChecked;
}
Expand Down
Loading