CLAP-59 Fix: 승인대기중 닉네임 필터링 시 requestor와 processor 분리

Author: parkjaehak

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

@@ -24,7 +24,7 @@ public record FilterTaskListRequest(
         @NotNull
         String title,
 
-        @Schema(description = "사용자 닉네임", example = "atom.park")
+        @Schema(description = "요청자/처리자 닉네임", example = "atom.park")
         @NotNull
         String nickName,
 

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

@@ -26,22 +26,28 @@ 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, FilterTaskListRequest filterTaskListRequest) {
+        BooleanBuilder whereClause = createFilter(filterTaskListRequest);
+        if (!filterTaskListRequest.nickName().isEmpty()) {
+            whereClause.and(taskEntity.processor.nickname.eq(filterTaskListRequest.nickName()));
+        }
         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);
+        if (!filterTaskListRequest.nickName().isEmpty()) {
+            whereClause.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName()));
+        }
         whereClause.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED));
         return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
     }
 
     private BooleanBuilder createFilter(FilterTaskListRequest request) {
         BooleanBuilder whereClause = new BooleanBuilder();
-
         if (request.term() != null) {
             LocalDateTime fromDate = LocalDateTime.now().minusHours(request.term());
             whereClause.and(taskEntity.createdAt.after(fromDate));
@@ -55,9 +61,6 @@ private BooleanBuilder createFilter(FilterTaskListRequest request) {
         if (!request.title().isEmpty()) {
             whereClause.and(taskEntity.title.containsIgnoreCase(request.title()));
         }
-        if (!request.nickName().isEmpty()) {
-            whereClause.and(taskEntity.processor.nickname.eq(request.nickName()));
-        }
         if (!request.taskStatus().isEmpty()) {
             whereClause.and(taskEntity.taskStatus.in(request.taskStatus()));
         }