Skip to content

CLAP-197 orderRequest 제거 #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parkjaehak merged 1 commit into from
Feb 1, 2025
Merged

CLAP-197 orderRequest 제거 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ public record FilterTaskListRequest(
@NotNull
List<TaskStatus> 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
) {
}
11 changes: 0 additions & 11 deletions src/main/java/clap/server/adapter/inbound/web/dto/task/OrderTaskRequest.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...va/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public Page<TaskEntity> 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
Expand All @@ -46,7 +46,7 @@ public Page<TaskEntity> 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
Expand All @@ -56,7 +56,7 @@ public Page<TaskEntity> 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
Expand All @@ -68,7 +68,7 @@ public Page<TaskEntity> 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
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down