Skip to content

Commit 95f42b9

Browse files
parkjaehakparkjaehak
committed
CLAP-184 Refactor: 페이징 응답 형태 리팩토링
1 parent 9816404 commit 95f42b9

File tree

5 files changed

+28
-21
lines changed

5 files changed

+28
-21
lines changed

‎src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.springframework.web.bind.annotation.*;
1919

2020

21-
@Tag(name = "02. Task[검토자]")
21+
@Tag(name = "02. Task [검토자]")
2222
@WebAdapter
2323
@RestController
2424
@RequiredArgsConstructor

‎src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package clap.server.adapter.inbound.web.task;
22

33
import clap.server.adapter.inbound.security.SecurityUserDetails;
4+
import clap.server.adapter.inbound.web.dto.common.PageResponse;
45
import clap.server.adapter.inbound.web.dto.task.*;
56
import clap.server.application.port.inbound.task.FindTaskDetailsUsecase;
67
import clap.server.application.port.inbound.task.FindTaskListUsecase;
@@ -29,7 +30,7 @@ public class FindTaskController {
2930
@Operation(summary = "사용자 요청 작업 목록 조회")
3031
@Secured({"ROLE_USER", "ROLE_MANAGER"})
3132
@GetMapping("/requests")
32-
public ResponseEntity<Page<FilterRequestedTasksResponse>> findTasksRequestedByUser(
33+
public ResponseEntity<PageResponse<FilterRequestedTasksResponse>> findTasksRequestedByUser(
3334
@RequestParam(defaultValue = "0") int page,
3435
@RequestParam(defaultValue = "20") int pageSize,
3536
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
@@ -50,7 +51,7 @@ public ResponseEntity<FindTaskDetailsResponse> findRequestedTaskDetails(
5051
@Operation(summary = "할당된 내 작업 목록 조회")
5152
@Secured({"ROLE_MANAGER"})
5253
@GetMapping("/assigned")
53-
public ResponseEntity<Page<FilterAssignedTaskListResponse>> findTasksAssignedByManager(
54+
public ResponseEntity<PageResponse<FilterAssignedTaskListResponse>> findTasksAssignedByManager(
5455
@RequestParam(defaultValue = "0") int page,
5556
@RequestParam(defaultValue = "20") int pageSize,
5657
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
@@ -62,7 +63,7 @@ public ResponseEntity<Page<FilterAssignedTaskListResponse>> findTasksAssignedByM
6263
@Operation(summary = "승인 대기 중인 요청 목록 조회")
6364
@Secured({"ROLE_MANAGER"})
6465
@GetMapping("/requests/pending")
65-
public ResponseEntity<Page<FilterPendingApprovalResponse>> findPendingApprovalTasks(
66+
public ResponseEntity<PageResponse<FilterPendingApprovalResponse>> findPendingApprovalTasks(
6667
@RequestParam(defaultValue = "0") int page,
6768
@RequestParam(defaultValue = "20") int pageSize,
6869
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
@@ -74,7 +75,7 @@ public ResponseEntity<Page<FilterPendingApprovalResponse>> findPendingApprovalTa
7475
@Operation(summary = "전체 작업 목록 조회")
7576
@Secured("ROLE_MANAGER")
7677
@GetMapping
77-
public ResponseEntity<Page<FilterAllTasksResponse>> findAllTasks(
78+
public ResponseEntity<PageResponse<FilterAllTasksResponse>> findAllTasks(
7879
@RequestParam(defaultValue = "0") int page,
7980
@RequestParam(defaultValue = "20") int pageSize,
8081
@ModelAttribute FilterTaskListRequest filterTaskListRequest,

‎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
@@ -39,13 +39,13 @@ public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable page
3939

4040
@Override
4141
public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
42-
BooleanBuilder whereClause = createFilter(filterTaskListRequest);
42+
BooleanBuilder builder = createFilter(filterTaskListRequest);
4343
if (!filterTaskListRequest.nickName().isEmpty()) {
44-
whereClause.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName()));
44+
builder.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName()));
4545
}
46-
whereClause.and(taskEntity.processor.memberId.eq(processorId));
46+
builder.and(taskEntity.processor.memberId.eq(processorId));
4747

48-
return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
48+
return getTasksPage(pageable, builder, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
4949
}
5050

5151
@Override

‎src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package clap.server.application.port.inbound.task;
22

3+
import clap.server.adapter.inbound.web.dto.common.PageResponse;
34
import clap.server.adapter.inbound.web.dto.task.*;
45
import org.springframework.data.domain.Page;
56
import org.springframework.data.domain.Pageable;
67

78
public interface FindTaskListUsecase {
8-
Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
9+
PageResponse<FilterRequestedTasksResponse> findTasksRequestedByUser(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
910

10-
Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
11+
PageResponse<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
1112

12-
Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
13+
PageResponse<FilterPendingApprovalResponse> findPendingApprovalTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
1314

14-
Page<FilterAllTasksResponse> findAllTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
15+
PageResponse<FilterAllTasksResponse> findAllTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
1516
}

‎src/main/java/clap/server/application/service/task/FindTaskListService.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package clap.server.application.service.task;
22

3+
import clap.server.adapter.inbound.web.dto.common.PageResponse;
34
import clap.server.adapter.inbound.web.dto.task.*;
45

56
import clap.server.application.port.inbound.domain.MemberService;
@@ -27,26 +28,30 @@ public class FindTaskListService implements FindTaskListUsecase {
2728

2829

2930
@Override
30-
public Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
31+
public PageResponse<FilterRequestedTasksResponse> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
3132
Member requester = memberService.findActiveMember(requesterId);
32-
return loadTaskPort.findTasksRequestedByUser(requester.getMemberId(), pageable, findTaskListRequest);
33+
Page<FilterRequestedTasksResponse> filterRequestedTasksResponses = loadTaskPort.findTasksRequestedByUser(requester.getMemberId(), pageable, findTaskListRequest);
34+
return PageResponse.from(filterRequestedTasksResponses);
3335
}
3436

3537
@Override
36-
public Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
38+
public PageResponse<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
3739
Member processor = memberService.findActiveMember(processorId);
38-
return loadTaskPort.findTasksAssignedByManager(processor.getMemberId(), pageable, findTaskListRequest);
40+
Page<FilterAssignedTaskListResponse> filterAssignedTaskListResponses = loadTaskPort.findTasksAssignedByManager(processor.getMemberId(), pageable, findTaskListRequest);
41+
return PageResponse.from(filterAssignedTaskListResponses);
3942
}
4043

4144
@Override
42-
public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
45+
public PageResponse<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
4346
memberService.findActiveMember(managerId);
44-
return loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest);
47+
Page<FilterPendingApprovalResponse> filterPendingApprovalResponses = loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest);
48+
return PageResponse.from(filterPendingApprovalResponses);
4549
}
4650

4751
@Override
48-
public Page<FilterAllTasksResponse> findAllTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
52+
public PageResponse<FilterAllTasksResponse> findAllTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
4953
memberService.findActiveMember(managerId);
50-
return loadTaskPort.findAllTasks(pageable, filterTaskListRequest);
54+
Page<FilterAllTasksResponse> filterAllTasksResponses = loadTaskPort.findAllTasks(pageable, filterTaskListRequest);
55+
return PageResponse.from(filterAllTasksResponses);
5156
}
5257
}

0 commit comments

Comments
 (0)