CLAP-59 Fix: FilterTaskRequest로 추상화

parkjaehak · parkjaehak · commit 9b73ae513f82 · 2025-01-25T10:29:54.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalRequest.java
@@ -0,0 +1,32 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public record FilterPendingApprovalRequest(
+        @Schema(description = "검색 기간 (단위: 시간)", example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
+        Integer term,
+
+        @Schema(description = "카테고리 ID 목록", example = "[1, 2, 3]")
+        @NotNull
+        List<Long> categoryIds,
+
+        @Schema(description = "메인 카테고리 ID 목록", example = "[10, 20, 30]")
+        @NotNull
+        List<Long> mainCategoryIds,
+
+        @Schema(description = "작업 제목", example = "작업 제목")
+        @NotNull
+        String title,
+
+        @Schema(description = "사용자 닉네임", example = "atom.park")
+        @NotNull
+        String nickName,
+
+        @Schema(description = "정렬 기준", implementation = OrderRequest.class)
+        @NotNull
+        OrderRequest orderRequest
+) implements FilterTaskRequest {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java
@@ -35,5 +35,6 @@ public record FilterTaskListRequest(
         @Schema(description = "정렬 기준", implementation = OrderRequest.class)
         @NotNull
         OrderRequest orderRequest
-) {
+
+) implements FilterTaskRequest{
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskRequest.java
@@ -0,0 +1,12 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import java.util.List;
+
+public interface FilterTaskRequest {
+    Integer term();
+    List<Long> categoryIds();
+    List<Long> mainCategoryIds();
+    String title();
+    String nickName();
+    OrderRequest orderRequest();
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java
@@ -51,9 +51,9 @@ public ResponseEntity<FindTaskDetailsResponse> findRequestedTaskDetails(
     public ResponseEntity<Page<FilterPendingApprovalResponse>> findPendingApprovalTasks(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
-            @ModelAttribute FilterTaskListRequest filterTaskListRequest,
+            @ModelAttribute FilterPendingApprovalRequest pendingApprovalRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo){
         Pageable pageable = PageRequest.of(page, pageSize);
-        return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, filterTaskListRequest));
+        return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, pendingApprovalRequest));
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.outbound.persistense;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
@@ -46,8 +47,8 @@ public Page<FilterTaskListResponse> findTasksRequestedByUser(Long requesterId, P
     }
 
     @Override
-    public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
-        Page<Task> taskList = taskRepository.findPendingApprovalTasks(pageable, filterTaskListRequest)
+    public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterPendingApprovalRequest pendingApprovalRequest) {
+        Page<Task> taskList = taskRepository.findPendingApprovalTasks(pageable, pendingApprovalRequest)
                 .map(taskPersistenceMapper::toDomain);
         return taskList.map(TaskMapper::toFilterPendingApprovalTasksResponse);
     }
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
@@ -1,12 +1,14 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
+import clap.server.adapter.inbound.web.dto.task.FilterTaskRequest;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface TaskCustomRepository {
 
-    Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
-    Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
+    Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskRequest filterTaskListRequest);
+    Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskRequest filterPendingApprovalRequest);
 }
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
@@ -1,6 +1,8 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
+import clap.server.adapter.inbound.web.dto.task.FilterTaskRequest;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
@@ -26,20 +28,20 @@ public class TaskCustomRepositoryImpl implements TaskCustomRepository {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
-        BooleanBuilder whereClause = createFilter(findTaskListRequest);
+    public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskRequest filterTaskListRequest) {
+        BooleanBuilder whereClause = createFilter(filterTaskListRequest);
         whereClause.and(taskEntity.requester.memberId.eq(requesterId));
-        return getTasksPage(pageable, whereClause, findTaskListRequest.orderRequest().sortBy(), findTaskListRequest.orderRequest().sortDirection());
+        return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
     }
 
     @Override
-    public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
-        BooleanBuilder whereClause = createFilter(filterTaskListRequest);
+    public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskRequest pendingApprovalRequest) {
+        BooleanBuilder whereClause = createFilter(pendingApprovalRequest);
         whereClause.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED));
-        return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
+        return getTasksPage(pageable, whereClause, pendingApprovalRequest.orderRequest().sortBy(), pendingApprovalRequest.orderRequest().sortDirection());
     }
 
-    private BooleanBuilder createFilter(FilterTaskListRequest request) {
+    private BooleanBuilder createFilter(FilterTaskRequest request) {
         BooleanBuilder whereClause = new BooleanBuilder();
 
         if (request.term() != null) {
@@ -58,8 +60,8 @@ private BooleanBuilder createFilter(FilterTaskListRequest request) {
         if (!request.nickName().isEmpty()) {
             whereClause.and(taskEntity.processor.nickname.eq(request.nickName()));
         }
-        if (!request.taskStatus().isEmpty()) {
-            whereClause.and(taskEntity.taskStatus.in(request.taskStatus()));
+        if (request instanceof FilterTaskListRequest taskRequest && !taskRequest.taskStatus().isEmpty()) {
+            whereClause.and(taskEntity.taskStatus.in(taskRequest.taskStatus()));
         }
         return whereClause;
     }
diff --git a/src/main/java/clap/server/application/Task/FindTaskListService.java b/src/main/java/clap/server/application/Task/FindTaskListService.java
@@ -1,5 +1,6 @@
 package clap.server.application.Task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;
 
@@ -35,8 +36,8 @@ public Page<FilterTaskListResponse> findTasksRequestedByUser(Long requesterId, P
     }
 
     @Override
-    public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
+    public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterPendingApprovalRequest pendingApprovalRequest) {
         memberService.findActiveMember(managerId);
-        return loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest);
+        return loadTaskPort.findPendingApprovalTasks(pageable, pendingApprovalRequest);
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java
@@ -1,5 +1,6 @@
 package clap.server.application.port.inbound.task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
@@ -9,5 +10,5 @@
 public interface FindTaskListUsecase {
     Page<FilterTaskListResponse> findTasksRequestedByUser(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
-    Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
+    Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long userId, Pageable pageable, FilterPendingApprovalRequest pendingApprovalRequest);
 }
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
@@ -1,5 +1,6 @@
 package clap.server.application.port.outbound.task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
@@ -18,6 +19,6 @@ public interface LoadTaskPort {
 
     Page<FilterTaskListResponse> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
-    Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest);
+    Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterPendingApprovalRequest pendingApprovalRequest);
 
 }
diff --git a/src/test/java/clap/server/task/FindTaskListServiceTest.java b/src/test/java/clap/server/task/FindTaskListServiceTest.java
@@ -1,5 +1,6 @@
 package clap.server.task;
 
+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.OrderRequest;
@@ -34,15 +35,15 @@ class FindTaskListServiceTest {
     @InjectMocks
     private FindTaskListService findTaskListService;
 
-    private FilterTaskListRequest filterTaskListRequest;
+    private FilterPendingApprovalRequest pendingApprovalRequest;
     private Pageable pageable;
     private Page<FilterPendingApprovalResponse> expectedResponse;
 
     @BeforeEach
     void setUp() {
         pageable = PageRequest.of(0, 20);
-        filterTaskListRequest = new FilterTaskListRequest(
-                null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), new OrderRequest("REQUESTED_AT", "DESC")
+        pendingApprovalRequest = new FilterPendingApprovalRequest(
+                null, List.of(2L), List.of(1L), "작업 제목", "", new OrderRequest("REQUESTED_AT", "DESC")
         );
 
         FilterPendingApprovalResponse response = new FilterPendingApprovalResponse(
@@ -62,11 +63,11 @@ void setUp() {
     void findPendingApprovalTasks_ReturnFilteredTasks() {
         // given
         Long managerId = 1L;
-        when(loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest))
+        when(loadTaskPort.findPendingApprovalTasks(pageable, pendingApprovalRequest))
                 .thenReturn(expectedResponse);
 
         // when
-        Page<FilterPendingApprovalResponse> result = findTaskListService.findPendingApprovalTasks(managerId, pageable, filterTaskListRequest);
+        Page<FilterPendingApprovalResponse> result = findTaskListService.findPendingApprovalTasks(managerId, pageable, pendingApprovalRequest);
 
         // then
         assertThat(result).isNotNull();
@@ -92,6 +93,6 @@ void findPendingApprovalTasks_ReturnFilteredTasks() {
                 .containsExactly(2L, "TC002", LocalDateTime.of(2025, 1, 15, 14, 30),
                         "메인 카테고리2", "서브 카테고리2", "다른 작업 제목", "john.doe");
 
-        verify(loadTaskPort).findPendingApprovalTasks(pageable, filterTaskListRequest);
+        verify(loadTaskPort).findPendingApprovalTasks(pageable, pendingApprovalRequest);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,6 @@ public record FilterTaskListRequest(`
`35`	`35`	`@Schema(description = "정렬 기준", implementation = OrderRequest.class)`
`36`	`36`	`@NotNull`
`37`	`37`	`OrderRequest orderRequest`
`38`		`-) {`
	`38`	`+`
	`39`	`+) implements FilterTaskRequest{`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ public ResponseEntity<FindTaskDetailsResponse> findRequestedTaskDetails(`
`51`	`51`	`public ResponseEntity<Page<FilterPendingApprovalResponse>> findPendingApprovalTasks(`
`52`	`52`	`@RequestParam(defaultValue = "0") int page,`
`53`	`53`	`@RequestParam(defaultValue = "20") int pageSize,`
`54`		`- @ModelAttribute FilterTaskListRequest filterTaskListRequest,`
	`54`	`+ @ModelAttribute FilterPendingApprovalRequest pendingApprovalRequest,`
`55`	`55`	`@AuthenticationPrincipal SecurityUserDetails userInfo){`
`56`	`56`	`Pageable pageable = PageRequest.of(page, pageSize);`
`57`		`- return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, filterTaskListRequest));`
	`57`	`+ return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, pendingApprovalRequest));`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package clap.server.application.Task;`
`2`	`2`
	`3`	`+import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalRequest;`
`3`	`4`	`import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;`
`4`	`5`	`import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;`
`5`	`6`
`@@ -35,8 +36,8 @@ public Page<FilterTaskListResponse> findTasksRequestedByUser(Long requesterId, P`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@Override`
`38`		`- public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {`
	`39`	`+ public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterPendingApprovalRequest pendingApprovalRequest) {`
`39`	`40`	`memberService.findActiveMember(managerId);`
`40`		`- return loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest);`
	`41`	`+ return loadTaskPort.findPendingApprovalTasks(pageable, pendingApprovalRequest);`
`41`	`42`	`}`
`42`	`43`	`}`