Merge branch 'develop' into CLAP-172

joowojr · web-flow · commit 559cee06b2d4 · 2025-01-30T21:02:09.000+07:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -18,7 +18,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class AddCategoryController {
     private final AddCategoryUsecase addCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
@@ -15,7 +15,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class DeleteCategoryController {
     private final DeleteCategoryUsecase deleteCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -27,7 +27,7 @@ public class FindCategoryController {
 
     @Operation(summary = "모든 카테고리 조회")
     @GetMapping("/category")
-    public ResponseEntity<FindAllCategoryResponse> findAllCategory() {
+    public ResponseEntity<List<FindAllCategoryResponse>> findAllCategory() {
         return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());
     }
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -17,7 +17,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class UpdateCategoryController {
     private final UpdateCategoryUsecase updateCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
@@ -3,7 +3,9 @@
 import java.util.List;
 
 public record FindAllCategoryResponse(
-        List<FindMainCategoryResponse> mainCategory,
+        Long id,
+        String name,
+        String code,
         List<FindSubCategoryResponse> subCategory
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java
@@ -1,6 +1,5 @@
 package clap.server.adapter.inbound.web.dto.task;
 
-import clap.server.domain.model.member.Member;
 
 public record UpdateTaskProcessorRequest(
         Long processorId
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java
@@ -7,7 +7,7 @@
 @Schema(description = "작업 상태 변경 요청")
 public record UpdateTaskStatusRequest(
 
-        @Schema(description = "변경하고 싶은 작업 상태", example = "완료")
+        @Schema(description = "변경하고 싶은 작업 상태", example = "COMPLETED")
         @NotNull
         TaskStatus taskStatus
 ) {
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java
@@ -31,7 +31,7 @@ public class ChangeTaskController {
     private final ApprovalTaskUsecase approvalTaskUsecase;
 
     @Operation(summary = "작업 상태 변경")
-    @Secured({"ROLE_MANGER"})
+    @Secured("ROLE_MANAGER")
     @PatchMapping("/state/{taskId}")
     public ResponseEntity<UpdateTaskResponse> updateTaskState(
             @PathVariable @NotNull Long taskId,
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.application.port.outbound.task.LoadCommentPort;
+import clap.server.application.port.outbound.taskhistory.LoadCommentPort;
 import clap.server.domain.model.task.Comment;
 
 import java.util.Optional;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskHistoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskHistoryPersistenceAdapter.java
@@ -4,7 +4,8 @@
 import clap.server.adapter.outbound.persistense.entity.task.TaskHistoryEntity;
 import clap.server.adapter.outbound.persistense.mapper.TaskHistoryPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.task.TaskHistoryRepository;
-import clap.server.application.port.outbound.task.LoadTaskHistoryPort;
+import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
+import clap.server.application.port.outbound.taskhistory.LoadTaskHistoryPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
 
 import clap.server.domain.model.task.TaskHistory;
@@ -15,7 +16,7 @@
 
 @PersistenceAdapter
 @RequiredArgsConstructor
-public class TaskHistoryPersistenceAdapter implements LoadTaskHistoryPort {
+public class TaskHistoryPersistenceAdapter implements LoadTaskHistoryPort, CommandTaskHistoryPort {
     private final TaskHistoryRepository taskHistoryRepository;
     private final TaskHistoryPersistenceMapper taskHistoryPersistenceMapper;
 
@@ -26,4 +27,11 @@ public List<TaskHistory> findAllTaskHistoriesByTaskId(Long taskId) {
                 .map(taskHistoryPersistenceMapper::toDomain)
                 .toList();
     }
+
+    @Override
+    public TaskHistory save(TaskHistory taskHistory) {
+        TaskHistoryEntity taskHistoryEntity = taskHistoryPersistenceMapper.toEntity(taskHistory);
+        TaskHistoryEntity savedTaskHistoryEntity = taskHistoryRepository.save(taskHistoryEntity);
+        return taskHistoryPersistenceMapper.toDomain(savedTaskHistoryEntity);
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskModificationInfo.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskModificationInfo.java
@@ -17,13 +17,10 @@ public class TaskModificationInfo {
     @JoinColumn(name = "task_id")
     private TaskEntity task;
 
-    @Column(name = "modified_field")
-    private String modifiedField; //TODO: 속성 필요성 검토
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "modified_member_id")
     private MemberEntity modifiedMember;
 
-    @Column(name = "new_value")
-    private String newValue; //TODO: 속성 필요성 검토
+    @JoinColumn(name = "modified_status")
+    private String modifiedStatus;
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java
@@ -17,16 +17,6 @@ public enum TaskStatus {
 
     private final String description;
 
-    @JsonCreator
-    public static TaskStatus fromDescription(String description) {
-        for (TaskStatus status : TaskStatus.values()) {
-            if (status.getDescription().equals(description)) {
-                return status;
-            }
-        }
-        throw new IllegalArgumentException("Unknown description: " + description);
-    }
-
     public static List<TaskStatus> getTaskBoardStatusList() {
         return List.of(
                 TaskStatus.IN_PROGRESS,
diff --git a/src/main/java/clap/server/application/mapper/TaskHistoryMapper.java b/src/main/java/clap/server/application/mapper/TaskHistoryMapper.java
@@ -28,7 +28,7 @@ public static FindTaskHistoryResponse toFindTaskHistoryResponse(List<TaskHistory
                                 );
                                 case STATUS_SWITCHED -> new FindTaskHistoryResponse.Details(
                                         new FindTaskHistoryResponse.TaskDetails(
-                                                taskHistory.getTaskModificationInfo().getTask().getTaskStatus().getDescription()
+                                                taskHistory.getTaskModificationInfo().getModifiedStatus()
                                         ),
                                         null,
                                         null
diff --git a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
@@ -10,9 +10,11 @@
 public class CategoryResponseMapper {
 
     public static FindAllCategoryResponse toFindAllCategoryResponse(
-            List<FindMainCategoryResponse> mainCategoryResponses,
+            Long id,
+            String name,
+            String code,
             List<FindSubCategoryResponse> subCategoryResponses) {
-        return new FindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+        return new FindAllCategoryResponse(id, name, code, subCategoryResponses);
     }
 
     public static FindMainCategoryResponse toFindMainCategoryResponse(Category category) {
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
@@ -2,6 +2,8 @@
 
 import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
 
+import java.util.List;
+
 public interface FindAllCategoryUsecase {
-    FindAllCategoryResponse findAllCategory();
+    List<FindAllCategoryResponse> findAllCategory();
 }
diff --git a/src/main/java/clap/server/application/port/outbound/taskhistory/CommandCommentPort.java b/src/main/java/clap/server/application/port/outbound/taskhistory/CommandCommentPort.java
@@ -1,4 +1,4 @@
-package clap.server.application.port.outbound.task;
+package clap.server.application.port.outbound.taskhistory;
 
 import clap.server.domain.model.task.Comment;
 
diff --git a/src/main/java/clap/server/application/port/outbound/taskhistory/CommandTaskHistoryPort.java b/src/main/java/clap/server/application/port/outbound/taskhistory/CommandTaskHistoryPort.java
@@ -0,0 +1,8 @@
+package clap.server.application.port.outbound.taskhistory;
+
+import clap.server.domain.model.task.TaskHistory;
+
+public interface CommandTaskHistoryPort {
+    TaskHistory save(TaskHistory taskHistory);
+
+}
diff --git a/src/main/java/clap/server/application/port/outbound/taskhistory/LoadCommentPort.java b/src/main/java/clap/server/application/port/outbound/taskhistory/LoadCommentPort.java
@@ -1,4 +1,4 @@
-package clap.server.application.port.outbound.task;
+package clap.server.application.port.outbound.taskhistory;
 
 import clap.server.domain.model.task.Comment;
 
diff --git a/src/main/java/clap/server/application/port/outbound/taskhistory/LoadTaskHistoryPort.java b/src/main/java/clap/server/application/port/outbound/taskhistory/LoadTaskHistoryPort.java
@@ -1,4 +1,4 @@
-package clap.server.application.port.outbound.task;
+package clap.server.application.port.outbound.taskhistory;
 
 
 import clap.server.domain.model.task.TaskHistory;
diff --git a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
@@ -1,27 +1,26 @@
 package clap.server.application.service.admin;
 
 import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
-import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
 import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
 
 @ApplicationService
 @RequiredArgsConstructor
 public class DeleteCategoryService implements DeleteCategoryUsecase {
     private final LoadCategoryPort loadCategoryPort;
-    private final LoadMemberPort loadMemberPort;
+    private final MemberService memberService;
 
     @Override
     @Transactional
     public void deleteCategory(Long adminId, Long categoryId) {
-        Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        Member admin = memberService.findActiveMember(adminId);
         loadCategoryPort.findById(categoryId)
                 .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
                 .deleteCategory(admin);
diff --git a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
@@ -1,16 +1,15 @@
 package clap.server.application.service.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
-import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
 import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
 import clap.server.application.mapper.response.CategoryResponseMapper;
 import clap.server.application.port.inbound.admin.FindAllCategoryUsecase;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Category;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @ApplicationService
@@ -20,16 +19,23 @@ public class FindAllCategoryService implements FindAllCategoryUsecase {
 
     @Override
     @Transactional(readOnly = true)
-    public FindAllCategoryResponse findAllCategory() {
-        List<FindMainCategoryResponse> mainCategoryResponses = new ArrayList<>();
-        List<FindSubCategoryResponse> subCategoryResponses = new ArrayList<>();
-        loadCategoryPort.findAll().forEach(category -> {
-            if (category.getMainCategory() == null) {
-                mainCategoryResponses.add(CategoryResponseMapper.toFindMainCategoryResponse(category));
-            } else {
-                subCategoryResponses.add(CategoryResponseMapper.toFindSubCategoryResponse(category));
-            }
-        });
-        return CategoryResponseMapper.toFindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+    public List<FindAllCategoryResponse> findAllCategory() {
+        List<Category> categories = loadCategoryPort.findAll();
+        return categories.stream().filter(category -> category.getMainCategory() == null)
+                .map(parent -> CategoryResponseMapper.toFindAllCategoryResponse(
+                        parent.getCategoryId(),
+                        parent.getName(),
+                        parent.getCode(),
+                        getSubCategories(categories, parent) // 2차 카테고리 리스트 변환
+                ))
+                .toList();
+    }
+
+    private List<FindSubCategoryResponse> getSubCategories(List<Category> categories, Category parent) {
+        return categories.stream()
+                .filter(category -> category.getMainCategory() != null &&
+                                    category.getMainCategory().getCategoryId().equals(parent.getCategoryId())) // 부모가 같은 것들 필터링
+                .map(CategoryResponseMapper::toFindSubCategoryResponse)
+                .toList();
     }
 }
diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -3,18 +3,21 @@
 import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.FindApprovalFormResponse;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
 import clap.server.application.port.inbound.domain.LabelService;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
+import clap.server.domain.model.task.TaskHistory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,6 +31,7 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     private final CategoryService categoryService;
     private final LabelService labelService;
     private final CommandTaskPort commandTaskPort;
+    private final CommandTaskHistoryPort commandTaskHistoryPort;
 
     @Override
     @Transactional
@@ -39,6 +43,8 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
         Label label = labelService.findById(approvalTaskRequest.labelId());
 
         task.approveTask(reviewer, processor, approvalTaskRequest.dueDate(), category, label);
+        TaskHistory taskHistory = TaskHistory.createTaskHistory(TaskHistoryType.PROCESSOR_ASSIGNED, task, null, processor,null);
+        commandTaskHistoryPort.save(taskHistory);
         return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task));
     }
 
diff --git a/src/main/java/clap/server/application/service/task/FindTaskHistoriesService.java b/src/main/java/clap/server/application/service/task/FindTaskHistoriesService.java
@@ -6,7 +6,7 @@
 import clap.server.application.port.inbound.task.FindTaskHistoriesUsecase;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 
-import clap.server.application.port.outbound.task.LoadTaskHistoryPort;
+import clap.server.application.port.outbound.taskhistory.LoadTaskHistoryPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Attachment;
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
diff --git a/src/main/java/clap/server/domain/model/task/TaskHistory.java b/src/main/java/clap/server/domain/model/task/TaskHistory.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class FindCategoryController {`
`27`	`27`
`28`	`28`	`@Operation(summary = "모든 카테고리 조회")`
`29`	`29`	`@GetMapping("/category")`
`30`		`- public ResponseEntity<FindAllCategoryResponse> findAllCategory() {`
	`30`	`+ public ResponseEntity<List<FindAllCategoryResponse>> findAllCategory() {`
`31`	`31`	`return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());`
`32`	`32`	`}`
`33`	`33`