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 index afedd25b..d7dcc404 100644 --- 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 @@ -32,8 +32,12 @@ public record FilterTaskListRequest( @NotNull List taskStatus, - @Schema(description = "정렬 기준", implementation = OrderTaskRequest.class) + @Schema(description = "정렬 기준", example = "REQUESTED_AT") @NotNull - OrderTaskRequest orderRequest + String sortBy, + + @Schema(description = "정렬 방향 (ASC/DESC)", example = "ASC") + @NotNull + String sortDirection ) { } diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java deleted file mode 100644 index fd849bab..00000000 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package clap.server.adapter.inbound.web.dto.task; - -import io.swagger.v3.oas.annotations.media.Schema; - -public record OrderTaskRequest( - @Schema(description = "정렬 기준", example = "REQUESTED_AT") - String sortBy, - - @Schema(description = "정렬 방향 (ASC/DESC)", example = "ASC") - String sortDirection -) {} 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 72ca8827..a9efda36 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 @@ -35,7 +35,7 @@ public Page findTasksRequestedByUser(Long requesterId, Pageable page } builder.and(taskEntity.requester.memberId.eq(requesterId)); - return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection()); + return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection()); } @Override @@ -46,7 +46,7 @@ public Page findTasksAssignedByManager(Long processorId, Pageable pa } builder.and(taskEntity.processor.memberId.eq(processorId)); - return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection()); + return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection()); } @Override @@ -56,7 +56,7 @@ public Page findPendingApprovalTasks(Pageable pageable, FilterTaskLi builder.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName())); } builder.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED)); - return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection()); + return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection()); } @Override @@ -68,7 +68,7 @@ public Page findAllTasks(Pageable pageable, FilterTaskListRequest fi .or(taskEntity.processor.nickname.eq(filterTaskListRequest.nickName())) ); } - return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection()); + return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection()); } @Override diff --git a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java index 9be6ae01..5029e626 100644 --- a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java +++ b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java @@ -2,7 +2,6 @@ import clap.server.adapter.inbound.web.dto.common.PageResponse; import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; -import clap.server.adapter.inbound.web.dto.task.OrderTaskRequest; import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.task.LoadTaskPort; @@ -43,7 +42,7 @@ class FindTaskListServiceTest { void setUp() { pageable = PageRequest.of(0, 20); filterTaskListRequest = new FilterTaskListRequest( - null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), new OrderTaskRequest("REQUESTED_AT", "DESC") + null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), "REQUESTED_AT", "DESC" ); FilterPendingApprovalResponse response = new FilterPendingApprovalResponse(