11package clap .server .application .mapper ;
22
33
4- import clap .server .adapter .inbound .web .dto .task .response .TaskBoardResponse ;
5- import clap .server .adapter .inbound .web .dto .task .response .TaskItemResponse ;
64import clap .server .adapter .inbound .web .dto .task .response .*;
75import clap .server .adapter .outbound .persistense .entity .task .constant .TaskStatus ;
86import clap .server .domain .model .member .Member ;
97import clap .server .domain .model .task .Attachment ;
8+ import clap .server .domain .model .task .Label ;
109import clap .server .domain .model .task .Task ;
11- import org .springframework .data .domain .Slice ;
1210
1311import java .util .Collections ;
1412import java .util .List ;
@@ -44,6 +42,7 @@ public static FilterRequestedTasksResponse toFilterRequestedTasksResponse(Task t
4442 task .getFinishedAt () != null ? task .getFinishedAt () : null
4543 );
4644 }
45+
4746 public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse (Task task ) {
4847 return new FilterAssignedTaskListResponse (
4948 task .getTaskId (),
@@ -58,6 +57,7 @@ public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse(Ta
5857 task .getFinishedAt () != null ? task .getFinishedAt () : null
5958 );
6059 }
60+
6161 public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse (Task task ) {
6262 return new FilterPendingApprovalResponse (
6363 task .getTaskId (),
@@ -71,7 +71,7 @@ public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse
7171 );
7272 }
7373
74- public static FindTaskDetailsResponse toFindTaskDetailResponse (Task task , List <Attachment > attachments ){
74+ public static FindTaskDetailsResponse toFindTaskDetailResponse (Task task , List <Attachment > attachments ) {
7575 List <AttachmentResponse > attachmentResponses = toAttachmentResponseList (attachments );
7676 return new FindTaskDetailsResponse (
7777 task .getTaskId (),
@@ -119,18 +119,15 @@ public static FilterAllTasksResponse toFilterAllTasksResponse(Task task) {
119119 );
120120 }
121121
122- public static TaskBoardResponse toSliceTaskItemResponse ( Slice <Task > tasks ) {
123- Map <TaskStatus , List <TaskItemResponse >> tasksByStatus =tasks . getContent () .stream ()
122+ public static TaskBoardResponse toTaskBoardResponse ( List <Task > tasks ) {
123+ Map <TaskStatus , List <TaskItemResponse >> tasksByStatus = tasks .stream ()
124124 .map (TaskResponseMapper ::toTaskItemResponse )
125125 .collect (Collectors .groupingBy (TaskItemResponse ::taskStatus ));
126126
127127 return new TaskBoardResponse (
128128 tasksByStatus .getOrDefault (TaskStatus .IN_PROGRESS , Collections .emptyList ()),
129129 tasksByStatus .getOrDefault (TaskStatus .PENDING_COMPLETED , Collections .emptyList ()),
130- tasksByStatus .getOrDefault (TaskStatus .COMPLETED , Collections .emptyList ()),
131- tasks .hasNext (),
132- tasks .isFirst (),
133- tasks .isLast ()
130+ tasksByStatus .getOrDefault (TaskStatus .COMPLETED , Collections .emptyList ())
134131 );
135132 }
136133
@@ -141,6 +138,7 @@ public static TaskItemResponse toTaskItemResponse(Task task) {
141138 task .getTitle (),
142139 task .getCategory ().getMainCategory ().getName (),
143140 task .getCategory ().getName (),
141+ task .getLabel () != null ? toLabelInfo (task .getLabel ()) : null ,
144142 task .getRequester ().getNickname (),
145143 task .getRequester ().getImageUrl (),
146144 task .getRequester ().getMemberInfo ().getDepartment ().getName (),
@@ -150,6 +148,13 @@ public static TaskItemResponse toTaskItemResponse(Task task) {
150148 );
151149 }
152150
151+ public static TaskItemResponse .LabelInfo toLabelInfo (Label label ) {
152+ return new TaskItemResponse .LabelInfo (
153+ label .getLabelName (),
154+ label .getLabelColor ()
155+ );
156+ }
157+
153158 public static FindTaskDetailsForManagerResponse toFindTaskDetailForManagerResponse (Task task , List <Attachment > attachments ) {
154159 List <AttachmentResponse > attachmentResponses = toAttachmentResponseList (attachments );
155160 return new FindTaskDetailsForManagerResponse (
0 commit comments