CLAP-69 Feat: 내 작업 조회 API 구현

nano-mm · nano-mm · commit b492c46b700c · 2025-01-29T04:45:59.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java
@@ -0,0 +1,19 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
+import java.time.LocalDateTime;
+
+public record FilterAssignedTaskListResponse(
+        Long taskId,
+        String taskCode,
+        LocalDateTime requestedAt,
+        String mainCategoryName,
+        String categoryName,
+        String title,
+        String requesterName,
+        TaskStatus taskStatus,
+        LocalDateTime finishedAt
+) {}
+
+
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -1,9 +1,6 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
+import clap.server.adapter.inbound.web.dto.task.*;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
@@ -50,6 +47,13 @@ public Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long requeste
         return taskList.map(TaskMapper::toFilterRequestedTasksResponse);
     }
 
+    @Override
+    public Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
+        Page<Task> taskList = taskRepository.findTasksAssignedByManager(processorId, pageable, filterTaskListRequest)
+                .map(taskPersistenceMapper::toDomain);
+        return taskList.map(TaskMapper::toFilterAssignedTaskListResponse);
+    }
+
     @Override
     public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         Page<Task> taskList = taskRepository.findPendingApprovalTasks(pageable, filterTaskListRequest)
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java
@@ -10,4 +10,5 @@ public interface TaskCustomRepository {
     Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
     Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
     Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
+    Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 }
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
@@ -36,6 +36,17 @@ public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable page
         return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
     }
 
+    @Override
+    public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
+        BooleanBuilder whereClause = createFilter(filterTaskListRequest);
+        if (!filterTaskListRequest.nickName().isEmpty()) {
+            whereClause.and(taskEntity.requester.nickname.eq(filterTaskListRequest.nickName()));
+        }
+        whereClause.and(taskEntity.processor.memberId.eq(processorId));
+
+        return getTasksPage(pageable, whereClause, filterTaskListRequest.orderRequest().sortBy(), filterTaskListRequest.orderRequest().sortDirection());
+    }
+
     @Override
     public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder whereClause = createFilter(filterTaskListRequest);
diff --git a/src/main/java/clap/server/application/Task/FindTaskListService.java b/src/main/java/clap/server/application/Task/FindTaskListService.java
@@ -1,10 +1,7 @@
 package clap.server.application.Task;
 
-import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
+import clap.server.adapter.inbound.web.dto.task.*;
 
-import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
 import clap.server.application.port.inbound.domain.MemberService;
 
 import clap.server.application.port.inbound.task.FindTaskListUsecase;
@@ -35,6 +32,12 @@ public Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long requeste
         return loadTaskPort.findTasksRequestedByUser(requester.getMemberId(), pageable, findTaskListRequest);
     }
 
+    @Override
+    public Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest) {
+        Member processor = memberService.findActiveMember(processorId);
+        return loadTaskPort.findTasksAssignedByManager(processor.getMemberId(), pageable, findTaskListRequest);
+    }
+
     @Override
     public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         memberService.findActiveMember(managerId);
diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java
@@ -42,7 +42,19 @@ public static FilterRequestedTasksResponse toFilterRequestedTasksResponse(Task t
                 task.getFinishedAt() != null ? task.getFinishedAt() : null
         );
     }
-
+    public static FilterAssignedTaskListResponse toFilterAssignedTaskListResponse(Task task) {
+        return new FilterAssignedTaskListResponse(
+                task.getTaskId(),
+                task.getTaskCode(),
+                task.getUpdatedAt(),
+                task.getCategory().getMainCategory().getName(),
+                task.getCategory().getName(),
+                task.getTitle(),
+                task.getRequester() != null ? task.getRequester().getMemberInfo().getNickname() : "",
+                task.getTaskStatus(),
+                task.getFinishedAt() != null ? task.getFinishedAt() : null
+        );
+    }
     public static FilterPendingApprovalResponse toFilterPendingApprovalTasksResponse(Task task) {
         return new FilterPendingApprovalResponse(
                 task.getTaskId(),
diff --git a/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java
@@ -1,15 +1,14 @@
 package clap.server.application.port.inbound.task;
 
-import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
+import clap.server.adapter.inbound.web.dto.task.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface FindTaskListUsecase {
     Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
+    Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long memberId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
+
     Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
 
     Page<FilterAllTasksResponse> findAllTasks(Long userId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
@@ -1,9 +1,6 @@
 package clap.server.application.port.outbound.task;
 
-import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
+import clap.server.adapter.inbound.web.dto.task.*;
 import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
@@ -24,6 +21,8 @@ public interface LoadTaskPort {
 
     Page<FilterRequestedTasksResponse> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
+    Page<FilterAssignedTaskListResponse> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest);
+
     Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest);
 
     Page<FilterAllTasksResponse> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -14,18 +14,6 @@ spring:
     hibernate:
       ddl-auto: create
 
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: leegd120@gmail.com
-    password: znlictzarqurxlla
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-
   testcontainers:
     beans:
       startup: parallel
@@ -36,7 +24,7 @@ server:
 
 web:
   domain:
-    local: 127.0.0.1:3O00
+    local: 127.0.0.1:3000
     service: 127.0.0.1:3000
 
 swagger:
@@ -58,11 +46,4 @@ password:
     length: 12
     characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
 
-kakaowork:
-  url: https://api.kakaowork.com/v1/messages.send_by_email
-  auth: Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
-
-agit:
-  url: https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
-
 

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ public interface TaskCustomRepository {`
`10`	`10`	`Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest);`
`11`	`11`	`Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);`
`12`	`12`	`Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);`
	`13`	`+ Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest);`
`13`	`14`	`}`