CLAP-55 Fix: PersistenceAdapter에서 domain을 통해 dto로 변환

Author: parkjaehak

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

@@ -1,12 +1,14 @@
 package clap.server.adapter.inbound.web.dto.task;
 
 
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
 public record FindTaskListRequest(
         Integer term,  //조회기간
         Long categoryId,
         Long mainCategoryId,
         String title,
         String nickName, //처리자 닉네임
-        Long statusId //1,2,3,4,5 중 하나
+        TaskStatus taskStatus
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/task/TaskCreateController.java

@@ -0,0 +1,30 @@
+package clap.server.adapter.inbound.web.task;
+
+import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
+import clap.server.adapter.inbound.web.dto.task.FindTaskListRequest;
+import clap.server.application.port.inbound.task.TaskCreateUsecase;
+import clap.server.application.port.inbound.task.TaskListUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+@WebAdapter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/tasks")
+public class TaskCreateController {
+
+    private final TaskCreateUsecase taskCreateUsecase;
+    private static final Long memberId = 4L;
+
+    @PostMapping
+    public ResponseEntity<?> createTask(
+            @RequestBody @Valid CreateTaskRequest createTaskRequest){
+            return ResponseEntity.ok(taskCreateUsecase.createTask(memberId, createTaskRequest));
+    }
+}

…ter/inbound/web/task/TaskController.java …inbound/web/task/TaskListController.javasrc/main/java/clap/server/adapter/inbound/web/task/TaskController.java renamed to src/main/java/clap/server/adapter/inbound/web/task/TaskListController.java src/main/java/clap/server/adapter/inbound/web/task/TaskController.java renamed to src/main/java/clap/server/adapter/inbound/web/task/TaskListController.java

@@ -1,38 +1,29 @@
 package clap.server.adapter.inbound.web.task;
 
-import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.FindTaskListRequest;
-import clap.server.application.port.inbound.task.TaskUsecase;
+import clap.server.application.port.inbound.task.TaskListUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-
 @WebAdapter
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks")
-public class TaskController {
-
-    private final TaskUsecase taskUsecase;
+public class TaskListController {
+    private final TaskListUsecase taskListUsecase;
     private static final Long memberId = 4L;
 
-    @PostMapping
-    public ResponseEntity<?> createTask(
-            @RequestBody @Valid CreateTaskRequest createTaskRequest){
-            return ResponseEntity.ok(taskUsecase.createTask(memberId, createTaskRequest));
-    }
 
     @GetMapping("/requests")
     public ResponseEntity<?> getRequestedTaskList(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int size,
             @RequestBody FindTaskListRequest findTaskListRequest){
         Pageable pageable = PageRequest.of(page, size);
-        return ResponseEntity.ok(taskUsecase.findRequestedTaskList(memberId, pageable, findTaskListRequest));
+        return ResponseEntity.ok(taskListUsecase.findRequestedTaskList(memberId, pageable, findTaskListRequest));
     }
 }

src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java

@@ -5,6 +5,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
+import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
@@ -37,21 +38,8 @@ public Optional<Task> findById(Long id) {
 
     @Override
     public Page<FindTaskListResponse> findAllByRequesterId(Long requesterId, Pageable pageable, FindTaskListRequest findTaskListRequest) {
-        Page<TaskEntity> taskList = taskRepository.findRequestedTaskList(requesterId, pageable, findTaskListRequest);
-        return taskList.map(this::convertToFindTaskListResponse);
-    }
-
-    private FindTaskListResponse convertToFindTaskListResponse(TaskEntity taskEntity) {
-        return new FindTaskListResponse(
-                taskEntity.getTaskId(),
-                taskEntity.getTaskCode(),
-                taskEntity.getCreatedAt(),
-                taskEntity.getCategory().getMainCategory().getName(),
-                taskEntity.getCategory().getName(),
-                taskEntity.getTitle(),
-                taskEntity.getProcessor() != null ? taskEntity.getProcessor().getName() : null,
-                taskEntity.getStatus().getStatusName(),
-                taskEntity.getCompletedAt()
-        );
+        Page<Task> taskList = taskRepository.findRequestedTaskList(requesterId, pageable, findTaskListRequest)
+                .map(taskPersistenceMapper::toDomain);
+        return taskList.map(TaskMapper::toFindTaskListResponse);
     }
 }

src/main/java/clap/server/adapter/outbound/persistense/entity/task/StatusEntity.java

@@ -2,6 +2,7 @@
 
 import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -37,10 +38,9 @@ public class TaskEntity extends BaseTimeEntity {
     @JoinColumn(name = "requester_id", nullable = false)
     private MemberEntity requester;
 
-    // 즉시 로딩
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "status_id", nullable = false)
-    private StatusEntity status;
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private TaskStatus taskStatus;
 
     @Column(nullable = false)
     private int processorOrder;

src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java

@@ -5,7 +5,7 @@
 import clap.server.domain.model.task.Task;
 import org.mapstruct.Mapper;
 
-@Mapper(componentModel = "spring", uses = {MemberPersistenceMapper.class, LabelPersistenceMapper.class, CategoryPersistenceMapper.class, StatusPersistenceMapper.class})
+@Mapper(componentModel = "spring", uses = {MemberPersistenceMapper.class, LabelPersistenceMapper.class, CategoryPersistenceMapper.class})
 public interface TaskPersistenceMapper  extends PersistenceMapper<TaskEntity, Task> {
 
 }

src/main/java/clap/server/adapter/outbound/persistense/mapper/StatusPersistenceMapper.java

@@ -3,6 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.FindTaskListRequest;
 import clap.server.adapter.outbound.persistense.entity.task.QTaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
@@ -30,7 +31,7 @@ public Page<TaskEntity> findRequestedTaskList(Long requesterId, Pageable pageabl
         Long mainCategoryId = findTaskListRequest.mainCategoryId();
         String title = findTaskListRequest.title();
         String nickName = findTaskListRequest.nickName();
-        Long statusId = findTaskListRequest.statusId();
+        TaskStatus taskStatus = findTaskListRequest.taskStatus();
         Integer term = findTaskListRequest.term();
 
         if (term != null) {
@@ -49,8 +50,8 @@ public Page<TaskEntity> findRequestedTaskList(Long requesterId, Pageable pageabl
         if (nickName != null) {
             whereClause.and(task.processor.nickname.eq(nickName));
         }
-        if (statusId != null) {
-            whereClause.and(task.status.statusId.eq(statusId));
+        if (taskStatus != null) {
+            whereClause.and(task.taskStatus.eq(taskStatus));
         }
 
         List<TaskEntity> result = queryFactory