Skip to content

Commit 3749e32

Browse files
committed
CLAP-197 Fix: orderRequest 제거
1 parent c280ad6 commit 3749e32

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ public record FilterTaskListRequest(
3232
@NotNull
3333
List<TaskStatus> taskStatus,
3434

35-
@Schema(description = "정렬 기준", implementation = OrderTaskRequest.class)
35+
@Schema(description = "정렬 기준", example = "REQUESTED_AT")
3636
@NotNull
37-
OrderTaskRequest orderRequest
37+
String sortBy,
38+
39+
@Schema(description = "정렬 방향 (ASC/DESC)", example = "ASC")
40+
@NotNull
41+
String sortDirection
3842
) {
3943
}

src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable page
3535
}
3636
builder.and(taskEntity.requester.memberId.eq(requesterId));
3737

38-
return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
38+
return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
3939
}
4040

4141
@Override
@@ -46,7 +46,7 @@ public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pa
4646
}
4747
builder.and(taskEntity.processor.memberId.eq(processorId));
4848

49-
return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
49+
return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
5050
}
5151

5252
@Override
@@ -56,7 +56,7 @@ public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskLi
5656
builder.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName()));
5757
}
5858
builder.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED));
59-
return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
59+
return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
6060
}
6161

6262
@Override
@@ -68,7 +68,7 @@ public Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest fi
6868
.or(taskEntity.processor.nickname.eq(filterTaskListRequest.nickName()))
6969
);
7070
}
71-
return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
71+
return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
7272
}
7373

7474
@Override

src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import clap.server.adapter.inbound.web.dto.common.PageResponse;
44
import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
5-
import clap.server.adapter.inbound.web.dto.task.OrderTaskRequest;
65
import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
76
import clap.server.application.port.inbound.domain.MemberService;
87
import clap.server.application.port.outbound.task.LoadTaskPort;
@@ -43,7 +42,7 @@ class FindTaskListServiceTest {
4342
void setUp() {
4443
pageable = PageRequest.of(0, 20);
4544
filterTaskListRequest = new FilterTaskListRequest(
46-
null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), new OrderTaskRequest("REQUESTED_AT", "DESC")
45+
null, List.of(2L), List.of(1L), "작업 제목", "", List.of(), "REQUESTED_AT", "DESC"
4746
);
4847

4948
FilterPendingApprovalResponse response = new FilterPendingApprovalResponse(

0 commit comments

Comments
 (0)