From 2825bf52b32d7f7d435c738e8c652dbe128f16d5 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:29:01 +0900
Subject: [PATCH 1/9] =?UTF-8?q?CLAP-239=20Fix:=20=EB=A8=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/application/service/task/UpdateTaskService.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index 667114df..82029f1d 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -21,13 +21,12 @@
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.application.service.webhook.SendNotificationService;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.policy.attachment.FilePathPolicy;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
-import clap.server.domain.policy.task.TaskPolicyConstants;
+import clap.server.domain.policy.attachment.FilePathPolicy;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -71,7 +70,7 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
 
     @Override
     @Transactional
-    public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTaskStatusRequest updateTaskStatusRequest) {
+    public UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus) {
         memberService.findActiveMember(memberId);
         memberService.findReviewer(memberId);
         Task task = taskService.findById(taskId);

From 095642f299ecd565f97eef842f98ba6a468c92a2 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:37:08 +0900
Subject: [PATCH 2/9] =?UTF-8?q?CLAP-239=20Feat:=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=ED=95=84=ED=84=B0=EB=A5=BC=20=EB=B0=B0?=
 =?UTF-8?q?=EC=97=B4=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../task/request/FilterTaskBoardRequest.java   | 13 +++++++++----
 .../inbound/web/task/TaskBoardController.java  | 18 ++++++------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskBoardRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskBoardRequest.java
index bde8cfe4..758e8720 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskBoardRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskBoardRequest.java
@@ -1,16 +1,21 @@
 package clap.server.adapter.inbound.web.dto.task.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
 
 public record FilterTaskBoardRequest(
         @Schema(description = "라벨 ID")
         Long labelId,
 
-        @Schema(description = "1차 카테고리 ID, ** 2차 카테고리로 검색할 시에는 1차 카테고리 값은 넣지 않습니다.")
-        Long mainCategoryId,
+        @Schema(description = "1차 카테고리 ID 목록", example = "[1, 3, 5]")
+        @NotNull
+        List<Long> mainCategoryIds,
 
-        @Schema(description = "2차 카테고리 ID")
-        Long subCategoryId,
+        @Schema(description = "2차 카테고리 ID 목록", example = "[2, 4]")
+        @NotNull
+        List<Long> categoryIds,
 
         @Schema(description = "작업 제목", example = "작업 제목")
         String title,
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index 7153ba95..bf6cceaf 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -33,7 +33,6 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/task-board")
 public class TaskBoardController {
-    private final GetTaskBoardUsecase getTaskBoardUsecase;
     private final FilterTaskBoardUsecase filterTaskBoardUsecase;
     private final UpdateTaskBoardUsecase updateTaskBoardUsecase;
     private final UpdateTaskOrderAndStatusUsecase updateTaskOrderAndStatus;
@@ -41,17 +40,12 @@ public class TaskBoardController {
     @Operation(summary = "작업 보드 조회 API")
     @Secured({"ROLE_MANAGER"})
     @GetMapping
-    public ResponseEntity<TaskBoardResponse> getTaskBoard(@RequestParam(defaultValue = "0") int page,
-                                                          @RequestParam(defaultValue = "20") int pageSize,
-                                                          @Parameter(description = "작업 완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
-                                                          @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
-                                                          @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "필터링 조회 request") @ModelAttribute FilterTaskBoardRequest request,
-                                                          @AuthenticationPrincipal SecurityUserDetails userInfo) {
-        Pageable pageable = PageRequest.of(page, pageSize);
-        if (request != null) {
-            return ResponseEntity.ok(filterTaskBoardUsecase.getTaskBoardByFilter(userInfo.getUserId(), untilDate, request, pageable));
-        } else
-            return ResponseEntity.ok(getTaskBoardUsecase.getTaskBoards(userInfo.getUserId(), untilDate, pageable));
+    public ResponseEntity<TaskBoardResponse> getTaskBoard(
+            @Parameter(description = "작업 완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
+            @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate fromDate,
+            @ModelAttribute FilterTaskBoardRequest request,
+            @AuthenticationPrincipal SecurityUserDetails userInfo) {
+        return ResponseEntity.ok(filterTaskBoardUsecase.getTaskBoardByFilter(userInfo.getUserId(), fromDate, request));
     }
 
     @Operation(summary = "작업 보드 순서 및 상태 변경 API")

From 31f6d061816151492ee7166fe402f9b5240675be Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:39:03 +0900
Subject: [PATCH 3/9] =?UTF-8?q?CLAP-239=20Fix:=20=ED=8C=80=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=A1=B0=ED=9A=8C=20api=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9E=AC=EC=82=AC=EC=9A=A9=EB=90=98=EB=8A=94=20dto=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/task/response/TeamStatusResponse.java |  4 ++--
 .../task/response/TeamTaskItemResponse.java   | 20 +++++++++++++++++++
 ...askResponse.java => TeamTaskResponse.java} |  6 +++---
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskItemResponse.java
 rename src/main/java/clap/server/adapter/inbound/web/dto/task/response/{TeamMemberTaskResponse.java => TeamTaskResponse.java} (79%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
index 61cd5dfc..1cad188c 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
@@ -3,9 +3,9 @@
 import java.util.List;
 
 public record TeamStatusResponse(
-        List<TeamMemberTaskResponse> members
+        List<TeamTaskResponse> members
 ) {
-    public TeamStatusResponse(List<TeamMemberTaskResponse> members) {
+    public TeamStatusResponse(List<TeamTaskResponse> members) {
         this.members = (members == null) ? List.of() : members;
     }
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskItemResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskItemResponse.java
new file mode 100644
index 00000000..43ae6c43
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskItemResponse.java
@@ -0,0 +1,20 @@
+package clap.server.adapter.inbound.web.dto.task.response;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
+import java.time.LocalDateTime;
+
+public record TeamTaskItemResponse(
+        Long taskId,
+        String taskCode,
+        String title,
+        String mainCategoryName,
+        String categoryName,
+        String requesterNickname,
+        String requesterImageUrl,
+        String requesterDepartment,
+        long processorOrder,
+        TaskStatus taskStatus,
+        LocalDateTime createdAt
+) {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamMemberTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java
similarity index 79%
rename from src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamMemberTaskResponse.java
rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java
index 157993a4..557b77f4 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamMemberTaskResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java
@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-public record TeamMemberTaskResponse(
+public record TeamTaskResponse(
         Long processorId,
         String nickname,
         String imageUrl,
@@ -12,10 +12,10 @@ public record TeamMemberTaskResponse(
         int inProgressTaskCount,
         int pendingTaskCount,
         int totalTaskCount,
-        List<TaskItemResponse> tasks
+        List<TeamTaskItemResponse> tasks
 ) {
     @QueryProjection
-    public TeamMemberTaskResponse {
+    public TeamTaskResponse {
         tasks = (tasks == null) ? List.of() : tasks;
     }
 }

From 1827ebd3508084536721bcc18cf83fabe913fb81 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:39:38 +0900
Subject: [PATCH 4/9] =?UTF-8?q?CLAP-239=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=A1=B0=ED=9A=8C=EC=97=90=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../web/dto/task/response/TaskBoardResponse.java      |  5 +----
 .../web/dto/task/response/TaskItemResponse.java       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java
index 1c973647..f1953e11 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java
@@ -5,9 +5,6 @@
 public record TaskBoardResponse(
         List<TaskItemResponse> tasksInProgress,
         List<TaskItemResponse> tasksPendingComplete,
-        List<TaskItemResponse> tasksCompleted,
-        boolean hasNext,
-        boolean isFirst,
-        boolean isLast
+        List<TaskItemResponse> tasksCompleted
 ){
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskItemResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskItemResponse.java
index a67406d6..196d2407 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskItemResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskItemResponse.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.web.dto.task.response;
 
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 import java.time.LocalDateTime;
@@ -10,11 +11,19 @@ public record TaskItemResponse(
         String title,
         String mainCategoryName,
         String categoryName,
+        LabelInfo labelInfo,
         String requesterNickname,
         String requesterImageUrl,
         String requesterDepartment,
         long processorOrder,
         TaskStatus taskStatus,
         LocalDateTime createdAt
-){
+) {
+    public static record LabelInfo(
+            String labelName,
+            LabelColor labelColor
+    ) {
+    }
+
 }
+

From 9ba1338b3b8d21ec521193a9f0eaba5d6584acdb Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:39:50 +0900
Subject: [PATCH 5/9] =?UTF-8?q?CLAP-239=20Fix:=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/inbound/web/history/CommandCommentController.java   | 2 +-
 .../adapter/inbound/web/history/PostCommentController.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java
index 81a74390..e7a44d8d 100644
--- a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.inbound.web.history;
 
-import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.security.service.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest;
 import clap.server.application.port.inbound.history.DeleteCommentUsecase;
 import clap.server.application.port.inbound.history.EditCommentUsecase;
diff --git a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java
index c473f6fc..cc2b6207 100644
--- a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.inbound.web.history;
 
-import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.security.service.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.history.request.CreateCommentRequest;
 import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase;
 import clap.server.application.port.inbound.history.SaveCommentUsecase;

From 3d00271415a8715843d55d75a2ee93673aea0053 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:40:42 +0900
Subject: [PATCH 6/9] =?UTF-8?q?CLAP-239=20Feat:=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=95=20=EA=B8=B0=EB=8A=A5=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F?=
 =?UTF-8?q?=20=ED=95=84=ED=84=B0=EB=A7=81=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../inbound/web/task/TaskBoardController.java |  8 ++---
 .../persistense/TaskPersistenceAdapter.java   | 27 +++++---------
 .../repository/task/TaskCustomRepository.java |  6 ++--
 .../task/TaskCustomRepositoryImpl.java        | 35 +++++++++++--------
 .../repository/task/TaskRepository.java       | 14 ++++----
 .../port/outbound/task/LoadTaskPort.java      | 11 +++---
 6 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index bf6cceaf..44570e00 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -7,7 +7,6 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.task.FilterTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
-import clap.server.application.port.inbound.task.GetTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -15,9 +14,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
@@ -26,7 +22,6 @@
 
 import java.time.LocalDate;
 
-@Slf4j
 @Tag(name = "02. Task [담당자]")
 @WebAdapter
 @RestController
@@ -51,7 +46,8 @@ public ResponseEntity<TaskBoardResponse> getTaskBoard(
     @Operation(summary = "작업 보드 순서 및 상태 변경 API")
     @Secured({"ROLE_MANAGER"})
     @PatchMapping
-    public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태, 상태 전환이 아니라면 입력 X", schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
+    public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태, 상태 전환이 아니라면 입력 X",
+            schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
                                 @RequestParam(required = false) TaskStatus status,
                                 @RequestBody UpdateTaskOrderRequest request,
                                 @AuthenticationPrincipal SecurityUserDetails userInfo) {
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index 7171871b..ec4f4ccc 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -1,9 +1,9 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
+import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
@@ -16,8 +16,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.SliceImpl;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -62,9 +60,9 @@ public Page<Task> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequ
     }
 
     @Override
-    public Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable) {
-        Slice<TaskEntity> tasks = taskRepository.findTasksWithTaskStatusAndCompletedAt(processorId, statuses, untilDate, pageable);
-        return tasks.map(taskPersistenceMapper::toDomain);
+    public List<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime fromDateTime) {
+        List<TaskEntity> tasks = taskRepository.findTasksWithTaskStatusAndCompletedAt(processorId, statuses, fromDateTime);
+        return tasks.stream().map(taskPersistenceMapper::toDomain).toList();
     }
 
     @Override
@@ -98,21 +96,14 @@ public Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId,
     }
 
     @Override
-    public Slice<Task> findTaskBoardByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, FilterTaskBoardRequest request, Pageable pageable) {
-        List<Task> taskList = new java.util.ArrayList<>(taskRepository.findTasksByFilter(processorId, statuses, untilDate, request, pageable)
+    public List<Task> findTaskBoardByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime fromDate, FilterTaskBoardRequest request) {
+        return  taskRepository.findTasksByFilter(processorId, statuses, fromDate, request)
                 .stream()
-                .map(taskPersistenceMapper::toDomain)
-                .toList());
-
-        boolean hasNext = taskList.size() > pageable.getPageSize();
-        if (hasNext) {
-            taskList.remove(taskList.size() - 1);
-        }
-        return new SliceImpl<>(taskList, pageable, hasNext);
+                .map(taskPersistenceMapper::toDomain).toList();
     }
 
     @Override
-    public List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
+    public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
         return taskRepository.findTeamStatus(memberId, filter);
     }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java
index b016c5cb..dfcd6fe3 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import org.springframework.data.domain.Page;
@@ -15,9 +15,9 @@
 public interface TaskCustomRepository {
 
     Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
-    List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter);
+    List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter);
     Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
     Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
-    List<TaskEntity> findTasksByFilter(Long processorId, List<TaskStatus> statuses,  LocalDateTime localDateTime, FilterTaskBoardRequest request, Pageable pageable);
+    List<TaskEntity> findTasksByFilter(Long processorId, List<TaskStatus> statuses,  LocalDateTime localDateTime, FilterTaskBoardRequest request);
     Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index b6fa1e00..5f0609c8 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -3,8 +3,8 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TaskItemResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
@@ -57,7 +57,7 @@ public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pa
     }
 
     @Override
-    public List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
+    public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
         BooleanBuilder builder = new BooleanBuilder();
 
         // 담당자 ID 필터링
@@ -101,8 +101,8 @@ public List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStat
                 .collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId()))
                 .entrySet().stream()
                 .map(entry -> {
-                    List<TaskItemResponse> taskResponses = entry.getValue().stream()
-                            .map(taskEntity -> new TaskItemResponse(
+                    List<TeamTaskItemResponse> taskResponses = entry.getValue().stream()
+                            .map(taskEntity -> new TeamTaskItemResponse(
                                     taskEntity.getTaskId(),
                                     taskEntity.getTaskCode(),
                                     taskEntity.getTitle(),
@@ -116,7 +116,7 @@ public List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStat
                                     taskEntity.getCreatedAt()
                             )).collect(Collectors.toList());
 
-                    return new TeamMemberTaskResponse(
+                    return new TeamTaskResponse(
                             entry.getKey(),
                             entry.getValue().get(0).getProcessor().getNickname(),
                             entry.getValue().get(0).getProcessor().getImageUrl(),
@@ -156,32 +156,37 @@ public Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest fi
     }
 
     @Override
-    public List<TaskEntity> findTasksByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request, Pageable pageable) {
+    public List<TaskEntity> findTasksByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request) {
         BooleanBuilder builder = createTaskBoardFilter(processorId, statuses, untilDateTime, request);
         return queryFactory
                 .selectFrom(taskEntity)
                 .where(builder)
                 .orderBy(taskEntity.processorOrder.asc())
-                .limit(pageable.getPageSize() + 1)
-                .offset(pageable.getOffset())
                 .fetch();
     }
 
-    private BooleanBuilder createTaskBoardFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request) {
+    private BooleanBuilder createTaskBoardFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime fromDateTime, FilterTaskBoardRequest request) {
         BooleanBuilder builder = new BooleanBuilder();
 
         builder.and(taskEntity.processor.memberId.eq(processorId));
         builder.and(taskEntity.taskStatus.in(statuses));
-        builder.and(taskEntity.finishedAt.isNull().or(taskEntity.finishedAt.loe(untilDateTime)));
+
+        if (fromDateTime != null) {
+            builder.and(taskEntity.taskStatus.ne(TaskStatus.COMPLETED)
+                    .or(taskEntity.taskStatus.eq(TaskStatus.COMPLETED)
+                            .and(taskEntity.finishedAt.goe(fromDateTime))));
+        }
 
         if (request.labelId() != null) {
             builder.and(taskEntity.label.labelId.eq(request.labelId()));
         }
-        if (request.mainCategoryId() != null) {
-            builder.and(taskEntity.category.mainCategory.categoryId.eq(request.mainCategoryId()));
+        if (!request.mainCategoryIds().isEmpty()) {
+            builder.and(taskEntity.category.mainCategory.categoryId.in(request.mainCategoryIds())
+                    .and(taskEntity.category.mainCategory.isDeleted.eq(false)));
         }
-        if (request.subCategoryId() != null) {
-            builder.and(taskEntity.category.categoryId.eq(request.subCategoryId()));
+        if (!request.categoryIds().isEmpty()) {
+            builder.and(taskEntity.category.categoryId.in(request.categoryIds())
+                    .and(taskEntity.category.isDeleted.eq(false)));
         }
         if (request.title() != null && !request.title().isEmpty()) {
             String titleFilter = "%" + request.title() + "%";
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index adf87e22..5c8fd21e 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -2,13 +2,12 @@
 
 
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -38,15 +37,16 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
     @Query("SELECT t FROM TaskEntity t " +
             "WHERE t.processor.memberId = :processorId " +
             "AND t.taskStatus IN :taskStatus " +
-            "AND (t.taskStatus != 'COMPLETED' OR t.finishedAt <= :untilDate) " +
+            "AND (:fromDateTime IS NULL OR t.taskStatus != 'COMPLETED' OR " +
+            "    (t.taskStatus = 'COMPLETED' AND t.finishedAt >= :fromDateTime)) " +
             "ORDER BY t.processorOrder ASC ")
-    Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
+    List<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             @Param("processorId") Long processorId,
             @Param("taskStatus") List<TaskStatus> taskStatus,
-            @Param("untilDate") LocalDateTime untilDate,
-            Pageable pageable
+            @Param("fromDateTime") LocalDateTime fromDateTime
     );
 
+
     Optional<TaskEntity> findByTaskIdAndTaskStatus(Long id, TaskStatus status);
 
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
@@ -55,7 +55,7 @@ Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAf
             Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
-    Page<TeamMemberTaskResponse> findTeamStatus(@Param("memberId") Long memberId, FilterTeamStatusRequest filter, Pageable pageable);
+    Page<TeamTaskResponse> findTeamStatus(@Param("memberId") Long memberId, FilterTeamStatusRequest filter, Pageable pageable);
 
 
 
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
index 054d0343..a069ab78 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
@@ -1,14 +1,13 @@
 package clap.server.application.port.outbound.task;
 
-import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
+import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.task.Task;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,15 +26,13 @@ public interface LoadTaskPort {
 
     Page<Task> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
-    Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable);
-
     Optional<Task> findByIdAndStatus(Long id, TaskStatus status);
 
     Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
-    Slice<Task> findTaskBoardByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request, Pageable pageable);
+    List<Task> findTaskBoardByFilter(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDateTime, FilterTaskBoardRequest request);
 
-    List<TeamMemberTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter);
+    List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter);
 }

From f4f4670fa9d1b4057dcf20c8141f225666ee155f Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:41:18 +0900
Subject: [PATCH 7/9] =?UTF-8?q?CLAP-239=20Feat:=20=EA=B8=B0=EB=B3=B8=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=99=80=20=ED=95=84=ED=84=B0=EB=A7=81=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20usecase=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../inbound/task/FilterTaskBoardUsecase.java  |  2 +-
 .../inbound/task/GetTaskBoardUsecase.java     | 10 ---------
 .../service/task/GetTaskBoardService.java     | 21 +++++--------------
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/port/inbound/task/GetTaskBoardUsecase.java

diff --git a/src/main/java/clap/server/application/port/inbound/task/FilterTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FilterTaskBoardUsecase.java
index a245ca28..7c096a26 100644
--- a/src/main/java/clap/server/application/port/inbound/task/FilterTaskBoardUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/FilterTaskBoardUsecase.java
@@ -7,5 +7,5 @@
 import java.time.LocalDate;
 
 public interface FilterTaskBoardUsecase {
-    TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable);
+    TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate fromDate, FilterTaskBoardRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/GetTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/GetTaskBoardUsecase.java
deleted file mode 100644
index ccf7dce9..00000000
--- a/src/main/java/clap/server/application/port/inbound/task/GetTaskBoardUsecase.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package clap.server.application.port.inbound.task;
-
-import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
-import org.springframework.data.domain.Pageable;
-
-import java.time.LocalDate;
-
-public interface GetTaskBoardUsecase {
-    TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate,Pageable pageable);
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
index 3f126e17..1427d140 100644
--- a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java
@@ -5,15 +5,12 @@
 import clap.server.application.mapper.TaskResponseMapper;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.task.FilterTaskBoardUsecase;
-import clap.server.application.port.inbound.task.GetTaskBoardUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
 import clap.server.domain.policy.task.TaskPolicyConstants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
@@ -24,23 +21,15 @@
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
-class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase {
+class GetTaskBoardService implements FilterTaskBoardUsecase {
     private final MemberService memberService;
     private final LoadTaskPort loadTaskPort;
 
     @Override
-    public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
+    public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate fromDate, FilterTaskBoardRequest request) {
         memberService.findActiveMember(processorId);
-        LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable);
-        return TaskResponseMapper.toSliceTaskItemResponse(tasks);
-    }
-
-    @Override
-    public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable) {
-        memberService.findActiveMember(processorId);
-        LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
-        Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable);
-        return TaskResponseMapper.toSliceTaskItemResponse(tasks);
+        LocalDateTime fromDateTime = fromDate != null ? fromDate.atStartOfDay() : null;
+        List<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, fromDateTime, request);
+        return TaskResponseMapper.toTaskBoardResponse(tasks);
     }
 }

From 5ab20db3958a6ba3c360eeb19f3d58d98fbef219 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:41:37 +0900
Subject: [PATCH 8/9] =?UTF-8?q?CLAP-239=20Refactor:=20dto=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../mapper/TaskResponseMapper.java            | 25 +++++++++++--------
 .../service/task/TeamStatusService.java       |  6 ++---
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
index 7381a5ed..f68a80ef 100644
--- a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
@@ -1,14 +1,12 @@
 package clap.server.application.mapper;
 
 
-import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TaskItemResponse;
 import clap.server.adapter.inbound.web.dto.task.response.*;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
+import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
-import org.springframework.data.domain.Slice;
 
 import java.util.Collections;
 import java.util.List;
@@ -44,6 +42,7 @@ public static FilterRequestedTasksResponse toFilterRequestedTasksResponse(Task t
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
     }
+
     public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse(Task task) {
         return new FilterAssignedTaskListResponse(
                 task.getTaskId(),
@@ -58,6 +57,7 @@ public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse(Ta
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
     }
+
     public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse(Task task) {
         return new FilterPendingApprovalResponse(
                 task.getTaskId(),
@@ -71,7 +71,7 @@ public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse
         );
     }
 
-    public static FindTaskDetailsResponse toFindTaskDetailResponse(Task task, List<Attachment> attachments){
+    public static FindTaskDetailsResponse toFindTaskDetailResponse(Task task, List<Attachment> attachments) {
         List<AttachmentResponse> attachmentResponses = toAttachmentResponseList(attachments);
         return new FindTaskDetailsResponse(
                 task.getTaskId(),
@@ -119,18 +119,15 @@ public static FilterAllTasksResponse toFilterAllTasksResponse(Task task) {
         );
     }
 
-    public static TaskBoardResponse toSliceTaskItemResponse(Slice<Task> tasks) {
-        Map<TaskStatus, List<TaskItemResponse>> tasksByStatus =tasks.getContent().stream()
+    public static TaskBoardResponse toTaskBoardResponse(List<Task> tasks) {
+        Map<TaskStatus, List<TaskItemResponse>> tasksByStatus = tasks.stream()
                 .map(TaskResponseMapper::toTaskItemResponse)
                 .collect(Collectors.groupingBy(TaskItemResponse::taskStatus));
 
         return new TaskBoardResponse(
                 tasksByStatus.getOrDefault(TaskStatus.IN_PROGRESS, Collections.emptyList()),
                 tasksByStatus.getOrDefault(TaskStatus.PENDING_COMPLETED, Collections.emptyList()),
-                tasksByStatus.getOrDefault(TaskStatus.COMPLETED, Collections.emptyList()),
-                tasks.hasNext(),
-                tasks.isFirst(),
-                tasks.isLast()
+                tasksByStatus.getOrDefault(TaskStatus.COMPLETED, Collections.emptyList())
         );
     }
 
@@ -141,6 +138,7 @@ public static TaskItemResponse toTaskItemResponse(Task task) {
                 task.getTitle(),
                 task.getCategory().getMainCategory().getName(),
                 task.getCategory().getName(),
+                task.getLabel() != null ? toLabelInfo(task.getLabel()) : null,
                 task.getRequester().getNickname(),
                 task.getRequester().getImageUrl(),
                 task.getRequester().getMemberInfo().getDepartment().getName(),
@@ -150,6 +148,13 @@ public static TaskItemResponse toTaskItemResponse(Task task) {
         );
     }
 
+    public static TaskItemResponse.LabelInfo toLabelInfo(Label label) {
+        return new TaskItemResponse.LabelInfo(
+                label.getLabelName(),
+                label.getLabelColor()
+        );
+    }
+
     public static FindTaskDetailsForManagerResponse toFindTaskDetailForManagerResponse(Task task, List<Attachment> attachments) {
         List<AttachmentResponse> attachmentResponses = toAttachmentResponseList(attachments);
         return new FindTaskDetailsForManagerResponse(
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index e24d09a6..24ad09a6 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -1,7 +1,7 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamMemberTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
 import clap.server.application.port.inbound.task.FilterTeamStatusUsecase;
 import clap.server.application.port.inbound.task.LoadTeamStatusUsecase;
@@ -22,13 +22,13 @@ public TeamStatusService(LoadTaskPort loadTaskPort) {
 
     @Override
     public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest filter, Pageable pageable) {
-        List<TeamMemberTaskResponse> members = loadTaskPort.findTeamStatus(memberId, filter); // 페이징 처리
+        List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(memberId, filter); // 페이징 처리
         return new TeamStatusResponse(members);
     }
 
     @Override
     public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
-        List<TeamMemberTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
+        List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
         return new TeamStatusResponse(members);
     }
 

From f9b19e4ba4b2d0f4f7fd258ab1e5a7a5dd388ed4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 10:46:19 +0900
Subject: [PATCH 9/9] =?UTF-8?q?CLAP-239=20Remove:=20=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #254
---
 .../outbound/persistense/TaskPersistenceAdapter.java      | 6 ------
 .../repository/task/TaskCustomRepositoryImpl.java         | 8 +++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index ec4f4ccc..9c300113 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -59,12 +59,6 @@ public Page<Task> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequ
                 .map(taskPersistenceMapper::toDomain);
     }
 
-    @Override
-    public List<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime fromDateTime) {
-        List<TaskEntity> tasks = taskRepository.findTasksWithTaskStatusAndCompletedAt(processorId, statuses, fromDateTime);
-        return tasks.stream().map(taskPersistenceMapper::toDomain).toList();
-    }
-
     @Override
     public Optional<Task> findByIdAndStatus(Long id, TaskStatus status) {
         Optional<TaskEntity> taskEntity = taskRepository.findByTaskIdAndTaskStatus(id, status);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index 5f0609c8..5a9e9a29 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -1,18 +1,17 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 
-import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
+import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.DateTimePath;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import jakarta.persistence.EntityManager;
-import com.querydsl.core.types.dsl.CaseBuilder;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -32,7 +31,6 @@
 public class TaskCustomRepositoryImpl implements TaskCustomRepository {
 
     private final JPAQueryFactory queryFactory;
-    private final EntityManager entityManager;
 
     @Override
     public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {