From ee382d3ed063ec92d2f0f89a922a2051a97378ae Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 07:04:58 +0700
Subject: [PATCH 01/40] =?UTF-8?q?CLAP-150=20Fix:=20=EC=9B=B9=ED=9B=85=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EB=93=A4=20=ED=99=98=EA=B2=BD=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 .../adapter/outbound/api/AgitClient.java      | 10 +++----
 .../adapter/outbound/api/EmailClient.java     |  4 +--
 .../adapter/outbound/api/KakaoWorkClient.java |  8 +++---
 src/main/resources/application.yml            | 27 ++-----------------
 src/main/resources/notifications.yml          | 20 ++++++++++++++
 5 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 src/main/resources/notifications.yml

diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
index 026018cd..ee4ff073 100644
--- a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendAgitRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
@@ -12,12 +12,12 @@
 import org.springframework.web.client.RestTemplate;
 
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class AgitClient implements SendAgitPort {
 
-    @Value("${agit.url}")
-    private String AGITWEBHOOK_URL;
+    @Value("${webhook.agit.url}")
+    private String AGIT_WEBHOOK_URL;
 
     @Override
     public void sendAgit(SendAgitRequest request) {
@@ -48,6 +48,6 @@ else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
         HttpEntity<String> entity = new HttpEntity<>(payload, headers);
 
         // Post 요청
-        restTemplate.exchange(AGITWEBHOOK_URL, HttpMethod.POST, entity, String.class);
+        restTemplate.exchange(AGIT_WEBHOOK_URL, HttpMethod.POST, entity, String.class);
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
index ee5fb2f9..979233b0 100644
--- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendEmailPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.NotificationErrorCode;
 import jakarta.mail.internet.MimeMessage;
@@ -13,7 +13,7 @@
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring6.SpringTemplateEngine;
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class EmailClient implements SendEmailPort {
 
diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
index 9557f973..aa0a7743 100644
--- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.NotificationErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -13,14 +13,14 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class KakaoWorkClient implements SendKaKaoWorkPort {
 
-    @Value("${kakaowork.url}")
+    @Value("${webhook.kakaowork.url}")
     private String kakaworkUrl;
 
-    @Value("${kakaowork.auth}")
+    @Value("${webhook.kakaowork.auth}")
     private String kakaworkAuth;
 
     private final ObjectBlockService makeObjectBlock;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 713aff54..c9efe054 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,25 +9,11 @@ spring:
       - auth.yml
       - elasticsearch.yml
       - s3.yml
-
+      - notifications.yml
   application:
     name: taskflow
   web.resources.add-mappings: false
 
-  # 구글 알림 이메일 발신자 정보 설정(논의 필요)
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: leegd120@gmail.com
-    password: znlictzarqurxlla
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-
-
 
 server:
   port: ${APPLICATION_PORT:8080}
@@ -45,15 +31,6 @@ web:
     local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
     service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
 
-
-# 카카오워크 및 agit url, accessKey값 환경 변수로 설정
-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
-
 local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
 service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
 
@@ -83,4 +60,4 @@ logging:
 spring.config.activate.on-profile: prod
 logging:
   level:
-    root: INFO
+    root: INFO
\ No newline at end of file
diff --git a/src/main/resources/notifications.yml b/src/main/resources/notifications.yml
new file mode 100644
index 00000000..e4ef655e
--- /dev/null
+++ b/src/main/resources/notifications.yml
@@ -0,0 +1,20 @@
+#TODO 구글 알림 이메일 발신자 정보 설정(논의 필요)
+spring:
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${MAIL_USERNAME}
+    password: ${MAIL_PASSWORD}
+  properties:
+    mail:
+      smtp:
+        auth: true
+        starttls:
+          enable: true
+
+webhook:
+  kakaowork:
+    url: ${KAKAOWORK_WEBHOOK_URL}
+    auth: ${KAKAOWORK_WEBHOOK_AUTH}
+  agit:
+    url: ${AGIT_WEBHOOK_URL}
\ No newline at end of file

From 58d34279464595c25487995c8098719340be991a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 07:09:24 +0700
Subject: [PATCH 02/40] =?UTF-8?q?CLAP-150=20Fix:=20email=20config=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 .../clap/server/config/mail/EmailConfig.java  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/main/java/clap/server/config/mail/EmailConfig.java

diff --git a/src/main/java/clap/server/config/mail/EmailConfig.java b/src/main/java/clap/server/config/mail/EmailConfig.java
new file mode 100644
index 00000000..b2a1b065
--- /dev/null
+++ b/src/main/java/clap/server/config/mail/EmailConfig.java
@@ -0,0 +1,43 @@
+package clap.server.config.mail;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+
+import java.util.Properties;
+
+@Configuration
+public class EmailConfig {
+
+    @Value("${spring.mail.host}")
+    private String host;
+
+    @Value("${spring.mail.port}")
+    private int port;
+
+    @Value("${spring.mail.username}")
+    private String username;
+
+    @Value("${spring.mail.password}")
+    private String password;
+
+    @Bean
+    public JavaMailSender javaMailSender() {
+        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+        mailSender.setHost(host);
+        mailSender.setPort(port);
+        mailSender.setUsername(username);
+        mailSender.setPassword(password);
+
+        Properties props = mailSender.getJavaMailProperties();
+        props.put("mail.transport.protocol", "smtp");
+        props.put("mail.smtp.auth", "true");
+        props.put("mail.smtp.starttls.enable", "true");
+        props.put("mail.debug", "true");
+
+        return mailSender;
+    }
+}
+

From ed858875ea7639f08b107d3648e5ba6914535599 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 09:51:40 +0700
Subject: [PATCH 03/40] =?UTF-8?q?CLAP-150=20Remove:=20test=20yml=20?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 src/test/resources/application.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index b10d6c61..470fc61a 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -58,11 +58,3 @@ 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
-
-

From dbf5a5257f14fd88f2cf17e4bd098e150d594f15 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:02:58 +0700
Subject: [PATCH 04/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=9E=AC=EA=B3=84=EC=82=B0=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=93=B0=EC=9D=BC=20processor=20order=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=A0=84=EC=97=AD=20=EC=83=81=EC=88=98=20=EC=84=A0?=
 =?UTF-8?q?=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../model/task/constants/TaskProcessorOrderPolicy.java    | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java

diff --git a/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java b/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
new file mode 100644
index 00000000..78bc9cfc
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
@@ -0,0 +1,8 @@
+package clap.server.domain.model.task.constants;
+
+import lombok.Getter;
+
+@Getter
+public class TaskProcessorOrderPolicy {
+    public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
+}
\ No newline at end of file

From ab56c5a6564f3e9fff4176443cc4b63db853deec Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:04:54 +0700
Subject: [PATCH 05/40] =?UTF-8?q?CLAP-155=20Rename:=20=ED=8C=A8=ED=82=A4?=
 =?UTF-8?q?=EC=A7=80=20=EC=9C=84=EC=B9=98=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../adapter/outbound/infrastructure/s3/S3UploadAdapter.java | 6 +++---
 .../clap/server/application/Task/CreateTaskService.java     | 4 ++--
 .../server/application/Task/FindTaskDetailsService.java     | 2 --
 .../clap/server/application/Task/UpdateTaskService.java     | 4 ++--
 .../server/application/port/outbound/s3/S3UploadPort.java   | 6 +++---
 .../constants/FilePathConstants.java}                       | 4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename src/main/java/clap/server/{domain/model/task/FilePath.java => common/constants/FilePathConstants.java} (76%)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
index 44c7149e..68798b73 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
@@ -3,7 +3,7 @@
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.common.annotation.architecture.InfrastructureAdapter;
 import clap.server.config.s3.KakaoS3Config;
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.exception.S3Exception;
 import clap.server.exception.code.S3Errorcode;
 import lombok.RequiredArgsConstructor;
@@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort {
     private final KakaoS3Config kakaoS3Config;
     private final S3Client s3Client;
 
-    public List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles)  {
+    public List<String> uploadFiles(FilePathConstants filePrefix, List<MultipartFile> multipartFiles)  {
         return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList();
     }
 
-    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) {
+    public String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file) {
         try {
             Path filePath = getFilePath(file);
             String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index 2c978d92..1e19c7ed 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/Task/CreateTaskService.java
@@ -23,7 +23,7 @@
 import clap.server.domain.model.notification.Notification;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
 
@@ -64,7 +64,7 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
     }
 
     private void saveAttachments(List<MultipartFile> files, Task task) {
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
diff --git a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java b/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
index 6bf4a9dd..32194b72 100644
--- a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
+++ b/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
@@ -2,14 +2,12 @@
 
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse;
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.task.FindTaskDetailsUsecase;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Task;
 import clap.server.exception.ApplicationException;
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 372f2cba..93cf9e98 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -20,7 +20,7 @@
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.task.Task;
 
 import clap.server.exception.ApplicationException;
@@ -100,7 +100,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
         List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
         attachmentsToDelete.forEach(Attachment::softDelete);
 
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
diff --git a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
index a55f06a9..63423da3 100644
--- a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
+++ b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
@@ -1,12 +1,12 @@
 package clap.server.application.port.outbound.s3;
 
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 public interface S3UploadPort {
-    List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles);
+    List<String> uploadFiles(FilePathConstants filePrefix, List<MultipartFile> multipartFiles);
 
-    String uploadSingleFile(FilePath filePrefix, MultipartFile file);
+    String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file);
 }
diff --git a/src/main/java/clap/server/domain/model/task/FilePath.java b/src/main/java/clap/server/common/constants/FilePathConstants.java
similarity index 76%
rename from src/main/java/clap/server/domain/model/task/FilePath.java
rename to src/main/java/clap/server/common/constants/FilePathConstants.java
index 6786b741..92393f90 100644
--- a/src/main/java/clap/server/domain/model/task/FilePath.java
+++ b/src/main/java/clap/server/common/constants/FilePathConstants.java
@@ -1,11 +1,11 @@
-package clap.server.domain.model.task;
+package clap.server.common.constants;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
-public enum FilePath {
+public enum FilePathConstants {
     TASK_IMAGE("task/image"),
     TASK_DOCUMENT("task/docs"),
     MEMBER_IMAGE("member/image"),

From 14ba998b1972440e00ac50343c6804281ba9a653 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:07:16 +0700
Subject: [PATCH 06/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20request=20dto=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../dto/task/request/UpdateTaskOrderRequest.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java
new file mode 100644
index 00000000..b39ded57
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java
@@ -0,0 +1,14 @@
+package clap.server.adapter.inbound.web.dto.task.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+
+public record UpdateTaskOrderRequest(
+        @Schema(description = "변경할 위치의 상위 작업 ID, 가장 상위일 경우 0 입력")
+        long prevTaskId,
+        @Min(1) @Schema(description = "순서 또는 상태를 변경할 작업의 ID")
+        long targetTaskId,
+        @Schema(description = "변경할 위치의 하위 작업 ID, 가장 하위일 경우 0 입력")
+        long nextTaskId
+) {
+}

From 9a80afe33430c789d83285b64e08bd6ab8c4e5b1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:08:47 +0700
Subject: [PATCH 07/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20usecase=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../persistense/TaskPersistenceAdapter.java   |  16 ++-
 .../repository/task/TaskRepository.java       |   7 +-
 .../Task/MoveTaskBoardService.java            | 125 ++++++++++++++++++
 .../inbound/task/MoveTaskBoardUsecase.java    |   9 ++
 .../port/outbound/task/LoadTaskPort.java      |   9 +-
 5 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/clap/server/application/Task/MoveTaskBoardService.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index c0ea7eea..662ec33b 100644
--- 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,9 @@
 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.FilterRequestedTasksResponse;
+import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 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;
@@ -75,4 +75,16 @@ public Page<FilterAllTasksResponse> findAllTasks (Pageable pageable, FilterTaskL
                 .map(taskPersistenceMapper::toDomain);
         return taskList.map(TaskMapper::toFilterAllTasksResponse);
     }
+    @Override
+    public Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder){
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder){
+        Optional<TaskEntity> taskEntity =  taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index 6fa3eb6c..210f17ab 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -12,6 +12,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface TaskRepository extends JpaRepository<TaskEntity, Long>, TaskCustomRepository {
@@ -28,7 +29,8 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
     @Query("SELECT t FROM TaskEntity t " +
             "WHERE t.processor.memberId = :processorId " +
             "AND t.taskStatus IN :taskStatus " +
-            "AND (t.taskStatus != 'COMPLETED' OR t.finishedAt >= :untilDate)")
+            "AND (t.taskStatus != 'COMPLETED' OR t.finishedAt <= :untilDate) " +
+            "ORDER BY t.processorOrder ASC ")
     Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             @Param("processorId") Long processorId,
             @Param("taskStatus") List<TaskStatus> taskStatus,
@@ -36,7 +38,10 @@ Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             Pageable pageable
     );
 
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(
+            Long processorId, TaskStatus taskStatus, Long processorOrder);
 
 }
 
diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
new file mode 100644
index 00000000..f8c407a8
--- /dev/null
+++ b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
@@ -0,0 +1,125 @@
+package clap.server.application.Task;
+
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.application.port.outbound.task.LoadTaskPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.TaskErrorCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@ApplicationService
+@RequiredArgsConstructor
+class MoveTaskBoardService implements MoveTaskBoardUsecase {
+    private final MemberService memberService;
+    private final TaskService taskService;
+    private final LoadTaskPort loadTaskPort;
+    private final CommandTaskPort commandTaskPort;
+
+    @Override
+    @Transactional
+    public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
+        validateRequest(request, null);
+        Member processor = memberService.findActiveMember(processorId);
+        Task targetTask = taskService.findById(request.targetTaskId());
+
+        // 가장 상위로 이동
+        if (request.prevTaskId() == 0) {
+            moveToTop(processorId, targetTask, request.nextTaskId());
+        }
+        // 가장 하위로 이동
+        else if (request.nextTaskId() == 0) {
+            moveToBottom(processorId, targetTask, request.prevTaskId());
+        } else {
+            Task prevTask = taskService.findById(request.prevTaskId());
+            Task nextTask = taskService.findById(request.nextTaskId());
+            // 같은 상태에서의 순서 변경인지 검증
+            Task.checkTaskStatusIsSame(targetTask, prevTask, nextTask);
+            updateNewTaskOrder(processor.getMemberId(), targetTask, prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+        }
+    }
+
+    private static void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
+        if(request.prevTaskId()==0 && request.nextTaskId()==0){
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        if(targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)){
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+    }
+
+    private void updateNewTaskOrder(Long processorId, Task targetTask, Long prevTaskOrder, Long nextTaskOrder) {
+        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+        commandTaskPort.save(targetTask);
+    }
+
+    private void moveToTop(Long processorId, Task targetTask, Long nextTaskId) {
+        Task nextTask = taskService.findById(nextTaskId);
+        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
+        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+        updateNewTaskOrder(processorId, targetTask, prevTaskOrder, nextTask.getProcessorOrder());
+    }
+
+    private void moveToBottom(Long processorId, Task targetTask, Long prevTaskId) {
+        Task prevTask = taskService.findById(prevTaskId);
+        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
+        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+        log.info("바닥 전환 진입 {}: ", nextTaskOrder);
+        updateNewTaskOrder(processorId, targetTask, prevTask.getProcessorOrder(), nextTaskOrder);
+    }
+
+
+    @Override
+    @Transactional
+    public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus targetStatus) {
+        log.info("상태 전환 진입 {}: ", targetStatus);
+        validateRequest(request, targetStatus);
+        Member processor = memberService.findActiveMember(processorId);
+        Task targetTask = taskService.findById(request.targetTaskId());
+
+        // 가장 상위로 이동
+        if (request.prevTaskId() == 0) {
+            moveToTopWithStatusChange(processorId, targetTask, request.nextTaskId(), targetStatus);
+        }
+        // 가장 하위로 이동
+        else if (request.nextTaskId() == 0) {
+            moveToBottomWithStatusChange(processorId, targetTask, request.prevTaskId(), targetStatus);
+        } else {
+            Task prevTask = taskService.findById(request.prevTaskId());
+            Task nextTask = taskService.findById(request.nextTaskId());
+            // 다른 상태로의 상태 전환인지 검증
+            Task.validateTaskStatusTransition(prevTask, nextTask, targetStatus);
+            updateNewTaskOrderAndStatus(targetStatus, targetTask, processor.getMemberId(), prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+        }
+    }
+
+    private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
+        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+        targetTask.changeTaskStatus(targetStatus);
+        commandTaskPort.save(targetTask);
+    }
+
+    private void moveToTopWithStatusChange(Long processorId, Task targetTask, Long nextTaskId, TaskStatus targetStatus) {
+        Task nextTask = taskService.findById(nextTaskId);
+        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
+        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTaskOrder, nextTask.getProcessorOrder());
+    }
+
+    private void moveToBottomWithStatusChange(Long processorId, Task targetTask, Long prevTaskId, TaskStatus targetStatus) {
+        Task prevTask = taskService.findById(prevTaskId);
+        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
+        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTask.getProcessorOrder(), nextTaskOrder);
+    }
+
+}
diff --git a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
new file mode 100644
index 00000000..b89adb3c
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.task;
+
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
+public interface MoveTaskBoardUsecase {
+    void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request);
+    void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
+}
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
index ff18bf14..eb4dda87 100644
--- 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,13 +1,10 @@
 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.FilterAllTasksResponse;
+import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
 import clap.server.domain.model.task.Task;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -29,4 +26,8 @@ public interface LoadTaskPort {
     Page<FilterAllTasksResponse> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
     Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable);
+
+    Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
+
+    Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 }
\ No newline at end of file

From dd75af08b67c8f0f0ddc9d441272ff30cbb63f2f Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:09:35 +0700
Subject: [PATCH 08/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20usecase=EC=9D=98=20?=
 =?UTF-8?q?=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../clap/server/domain/model/task/Task.java   | 65 ++++++++++++++++++-
 .../server/exception/code/TaskErrorCode.java  |  5 +-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index fb17bcd0..6e740d61 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -14,6 +14,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
+import static clap.server.domain.model.task.constants.TaskProcessorOrderPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+
 @Getter
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -54,8 +56,8 @@ public void updateTask(TaskStatus status, Category category, String title, Strin
     }
 
     public void setInitialProcessorOrder() {
-        if(this.processor == null) {
-            this.processorOrder = this.taskId * 128L;
+        if (this.processor == null) {
+            this.processorOrder = this.taskId * DEFAULT_PROCESSOR_ORDER_GAP;
         }
     }
 
@@ -76,7 +78,64 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate
         this.taskStatus = TaskStatus.IN_PROGRESS;
     }
 
-    private static String toTaskCode(Category category){
+    private static String toTaskCode(Category category) {
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
+
+    public void changeTaskStatus(TaskStatus newStatus) {
+        if (newStatus == null) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        this.taskStatus = newStatus;
+    }
+
+    public void updateProcessorOrder(Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
+        if (!Objects.equals(processorId, this.processor.getMemberId())) {
+            throw new DomainException(TaskErrorCode.NOT_A_PROCESSOR);
+        }
+        long newProcessorOrder;
+
+        // 최상위 이동: 가장 작은 processorOrder보다 더 작은 값 설정
+        if (prevTaskOrder == null && nextTaskOrder != null) {
+            newProcessorOrder = nextTaskOrder - DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        // 최하위 이동: 가장 큰 processorOrder보다 더 큰 값 설정
+        else if (prevTaskOrder != null && nextTaskOrder == null) {
+            newProcessorOrder = prevTaskOrder + DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        // 중간 위치로 이동: prevTask와 nextTask의 processorOrder 평균값 사용
+        else if (prevTaskOrder != null && nextTaskOrder != null) {
+            if (nextTaskOrder - prevTaskOrder < 2) {
+                throw new DomainException(TaskErrorCode.INVALID_TASK_ORDER);
+            }
+            newProcessorOrder = (prevTaskOrder + nextTaskOrder) / 2;
+        }
+        // 기본값 (예외적인 상황 방지)
+        else {
+            newProcessorOrder = DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        this.processorOrder = newProcessorOrder;
+    }
+
+
+
+    public static void checkTaskStatusIsSame(Task targetTask, Task prevTask, Task nextTask) {
+        if (targetTask.getTaskStatus() == null) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+        if (targetTask.getTaskStatus() != prevTask.getTaskStatus() ||
+                targetTask.getTaskStatus() != nextTask.getTaskStatus()) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+    }
+
+    public static void validateTaskStatusTransition(Task prevTask, Task nextTask, TaskStatus targetStatus) {
+        if (prevTask != null && prevTask.getTaskStatus() != targetStatus) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        if (nextTask != null && nextTask.getTaskStatus() != targetStatus) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+    }
+
 }
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 6d6ff5c7..f93fefa2 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -11,7 +11,10 @@ public enum TaskErrorCode implements BaseErrorCode {
     CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_002", "카테고리를 찾을 수 없습니다."),
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
     TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
-    LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다.")
+    LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다."),
+    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 수정 권한이 없습니다."),
+    INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
+    INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
     ;
 
     private final HttpStatus httpStatus;

From 0df5096a2596958177b30329f6e0155fe300f5ee Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:10:31 +0700
Subject: [PATCH 09/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=9C=20=EC=83=81=ED=83=9C=EB=93=A4?=
 =?UTF-8?q?=EC=9D=84=20task=20status=EC=97=90=EC=84=9C=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../entity/task/constant/TaskStatus.java         | 14 +++++++++-----
 .../application/Task/TaskBoardService.java       | 16 ++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

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
index 29972c3d..83a653f4 100644
--- 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
@@ -1,10 +1,11 @@
 package clap.server.adapter.outbound.persistense.entity.task.constant;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 @Getter
 @RequiredArgsConstructor
 public enum TaskStatus {
@@ -16,10 +17,6 @@ public enum TaskStatus {
 
     private final String description;
 
-    @JsonValue
-    public String getDescription() {
-        return description;
-    }
     @JsonCreator
     public static TaskStatus fromDescription(String description) {
         for (TaskStatus status : TaskStatus.values()) {
@@ -29,4 +26,11 @@ public static TaskStatus fromDescription(String description) {
         }
         throw new IllegalArgumentException("Unknown description: " + description);
     }
+
+    public static List<TaskStatus> getTaskBoardStatusList() {
+        return List.of(
+                TaskStatus.IN_PROGRESS,
+                TaskStatus.PENDING_COMPLETED,
+                TaskStatus.COMPLETED);
+    }
 }
diff --git a/src/main/java/clap/server/application/Task/TaskBoardService.java b/src/main/java/clap/server/application/Task/TaskBoardService.java
index 2e597453..57246e25 100644
--- a/src/main/java/clap/server/application/Task/TaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/TaskBoardService.java
@@ -4,9 +4,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.MemberService;
-import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
-import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
@@ -22,23 +20,17 @@
 @ApplicationService
 @RequiredArgsConstructor
 class TaskBoardService implements TaskBoardUsecase {
-    private final static List<TaskStatus> VIEWABLE_STATUSES = List.of(
-            TaskStatus.IN_PROGRESS,
-            TaskStatus.PENDING_COMPLETED,
-            TaskStatus.COMPLETED
-    );
+    private final static List<TaskStatus> VIEWABLE_STATUSES = TaskStatus.getTaskBoardStatusList();
+
     private final MemberService memberService;
-    private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
-    private final CommandTaskPort commandTaskPort;
 
-    @Transactional(readOnly = true)
     @Override
+    @Transactional(readOnly = true)
     public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
         memberService.findById(processorId);
-        LocalDateTime untilDateTime = untilDate==null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
+        LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
         Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDateTime, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
-
 }

From 4cac6810912c71c90434c0b4c551941de21e5d84 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:11:09 +0700
Subject: [PATCH 10/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20API=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../inbound/web/task/TaskBoardController.java | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index b2a5a6ea..4d763736 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -1,10 +1,15 @@
 package clap.server.adapter.inbound.web.task;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
@@ -12,10 +17,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
 
@@ -26,16 +28,30 @@
 @RequestMapping("/api/task-board")
 public class TaskBoardController {
     private final TaskBoardUsecase taskBoardUsecase;
+    private final MoveTaskBoardUsecase moveTaskBoardUsecase;
 
+    @Operation(summary = "작업 보드 조회 API")
     @GetMapping
     public ResponseEntity<TaskBoardResponse> getTaskBoard(@RequestParam(defaultValue = "0") int page,
                                                           @RequestParam(defaultValue = "20") int pageSize,
                                                           @Parameter(description = "yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
-                                                              @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
+                                                          @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
                                                           @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
         return ResponseEntity.ok(taskBoardUsecase.getTaskBoards(userInfo.getUserId(), untilDate, pageable));
     }
 
+    @Operation(summary = "작업 보드 순서 및 상태 변경 API")
+    @PatchMapping
+    public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태, 상태 전환이 아니라면 입력 X", schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
+                                @RequestParam(required = false) TaskStatus status,
+                                @RequestBody UpdateTaskOrderRequest request,
+                                @AuthenticationPrincipal SecurityUserDetails userInfo) {
+        if (status == null) {
+            moveTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
+        } else {
+            moveTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+        }
+    }
 
 }

From bda652eae8a5d5b567d10af33f9e92add9157df9 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:17:30 +0700
Subject: [PATCH 11/40] =?UTF-8?q?CLAP-155=20Remove:=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../server/application/Task/MoveTaskBoardService.java  |  2 +-
 src/main/java/clap/server/domain/model/task/Task.java  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
index f8c407a8..135af77a 100644
--- a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
@@ -104,7 +104,7 @@ else if (request.nextTaskId() == 0) {
 
     private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
-        targetTask.changeTaskStatus(targetStatus);
+        targetTask.updateTaskStatus(targetStatus);
         commandTaskPort.save(targetTask);
     }
 
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 6e740d61..be2add3a 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -62,6 +62,9 @@ public void setInitialProcessorOrder() {
     }
 
     public void updateTaskStatus(TaskStatus status) {
+        if (status == null) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
         this.taskStatus = status;
     }
 
@@ -82,13 +85,6 @@ private static String toTaskCode(Category category) {
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
 
-    public void changeTaskStatus(TaskStatus newStatus) {
-        if (newStatus == null) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-        this.taskStatus = newStatus;
-    }
-
     public void updateProcessorOrder(Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         if (!Objects.equals(processorId, this.processor.getMemberId())) {
             throw new DomainException(TaskErrorCode.NOT_A_PROCESSOR);

From 79cfa62027d6f0b040f2e710539bd7c02893325e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:30:36 +0700
Subject: [PATCH 12/40] =?UTF-8?q?CLAP-155=20Rename:=20=EB=84=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../adapter/inbound/web/task/TaskBoardController.java     | 8 ++++----
 ...eTaskBoardService.java => UpdateTaskBoardService.java} | 4 ++--
 ...eTaskBoardUsecase.java => UpdateTaskBoardUsecase.java} | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/clap/server/application/Task/{MoveTaskBoardService.java => UpdateTaskBoardService.java} (97%)
 rename src/main/java/clap/server/application/port/inbound/task/{MoveTaskBoardUsecase.java => UpdateTaskBoardUsecase.java} (90%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index 4d763736..00e7b505 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -4,7 +4,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -28,7 +28,7 @@
 @RequestMapping("/api/task-board")
 public class TaskBoardController {
     private final TaskBoardUsecase taskBoardUsecase;
-    private final MoveTaskBoardUsecase moveTaskBoardUsecase;
+    private final UpdateTaskBoardUsecase updateTaskBoardUsecase;
 
     @Operation(summary = "작업 보드 조회 API")
     @GetMapping
@@ -48,9 +48,9 @@ public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태
                                 @RequestBody UpdateTaskOrderRequest request,
                                 @AuthenticationPrincipal SecurityUserDetails userInfo) {
         if (status == null) {
-            moveTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
+            updateTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
         } else {
-            moveTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+            updateTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
         }
     }
 
diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
similarity index 97%
rename from src/main/java/clap/server/application/Task/MoveTaskBoardService.java
rename to src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
index 135af77a..5f6129a6 100644
--- a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
@@ -4,7 +4,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
-import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -19,7 +19,7 @@
 @Slf4j
 @ApplicationService
 @RequiredArgsConstructor
-class MoveTaskBoardService implements MoveTaskBoardUsecase {
+class UpdateTaskBoardService implements UpdateTaskBoardUsecase {
     private final MemberService memberService;
     private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
diff --git a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
similarity index 90%
rename from src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
rename to src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
index b89adb3c..3a7ebf9a 100644
--- a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
-public interface MoveTaskBoardUsecase {
+public interface UpdateTaskBoardUsecase {
     void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request);
     void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
 }

From d0115c47d98144cd33b96d57fac9b1e72fade65e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:02:18 +0700
Subject: [PATCH 13/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C,=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=EA=B0=92=EA=B3=BC=20id=EB=A5=BC=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=B4=20=EC=97=94=ED=8B=B0=ED=8B=B0=EB=A5=BC=20=EC=B0=BE?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../outbound/persistense/TaskPersistenceAdapter.java        | 6 ++++++
 .../persistense/repository/task/TaskRepository.java         | 2 ++
 .../server/application/port/outbound/task/LoadTaskPort.java | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index 662ec33b..1b72d24a 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -63,6 +63,12 @@ public Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> s
         return tasks.map(taskPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Task> findByIdAndStatus(Long id, TaskStatus status) {
+        Optional<TaskEntity> taskEntity = taskRepository.findByTaskIdAndTaskStatus(id, status);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
     @Override
     public List<Task> findYesterdayTaskByDate(LocalDateTime now) {
         return taskRepository.findYesterdayTaskByUpdatedAtIsBetween(now.minusDays(1), now)
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index 210f17ab..99099b28 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -38,6 +38,8 @@ Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             Pageable pageable
     );
 
+    Optional<TaskEntity> findByTaskIdAndTaskStatus(Long id, TaskStatus status);
+
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(
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
index eb4dda87..c6e69572 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
@@ -27,6 +27,8 @@ public interface LoadTaskPort {
 
     Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable);
 
+    Optional<Task> findByIdAndStatus(Long id, TaskStatus status);
+
     Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);

From c9dc206feea38ccb16d9ea5faee806d607d23bd6 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:03:00 +0700
Subject: [PATCH 14/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=88=9C=EC=84=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EA=B3=BC,=20=EC=A0=84/=ED=9B=84=EC=9D=98=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EB=A5=BC=20=EB=B9=84=EA=B5=90=20?=
 =?UTF-8?q?=EA=B2=80=EC=A6=9D=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../clap/server/domain/model/task/Task.java   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index be2add3a..b2cddfee 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -113,25 +113,4 @@ else if (prevTaskOrder != null && nextTaskOrder != null) {
         this.processorOrder = newProcessorOrder;
     }
 
-
-
-    public static void checkTaskStatusIsSame(Task targetTask, Task prevTask, Task nextTask) {
-        if (targetTask.getTaskStatus() == null) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-        if (targetTask.getTaskStatus() != prevTask.getTaskStatus() ||
-                targetTask.getTaskStatus() != nextTask.getTaskStatus()) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-    }
-
-    public static void validateTaskStatusTransition(Task prevTask, Task nextTask, TaskStatus targetStatus) {
-        if (prevTask != null && prevTask.getTaskStatus() != targetStatus) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-        if (nextTask != null && nextTask.getTaskStatus() != targetStatus) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-    }
-
 }

From b30c84bccfb975caf24820dfc8c1717cd5c05b57 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:03:23 +0700
Subject: [PATCH 15/40] =?UTF-8?q?CLAP-155=20Docs:=20=EC=A3=BC=EC=84=9D=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../Task/UpdateTaskBoardService.java          | 116 ++++++++++++++----
 1 file changed, 90 insertions(+), 26 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
index 5f6129a6..958fdaf2 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
@@ -25,9 +25,20 @@ class UpdateTaskBoardService implements UpdateTaskBoardUsecase {
     private final LoadTaskPort loadTaskPort;
     private final CommandTaskPort commandTaskPort;
 
+    private Task findByIdAndStatus(Long taskId, TaskStatus status) {
+        return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
+    }
+
+    /**
+     * 작업(Task)의 순서를 업데이트하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param request 순서 변경 요청 객체
+     */
     @Override
     @Transactional
     public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
+        // 요청 유효성 검증
         validateRequest(request, null);
         Member processor = memberService.findActiveMember(processorId);
         Task targetTask = taskService.findById(request.targetTaskId());
@@ -40,86 +51,139 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         else if (request.nextTaskId() == 0) {
             moveToBottom(processorId, targetTask, request.prevTaskId());
         } else {
-            Task prevTask = taskService.findById(request.prevTaskId());
-            Task nextTask = taskService.findById(request.nextTaskId());
-            // 같은 상태에서의 순서 변경인지 검증
-            Task.checkTaskStatusIsSame(targetTask, prevTask, nextTask);
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
+
+            // 새로운 작업 순서 업데이트
             updateNewTaskOrder(processor.getMemberId(), targetTask, prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
         }
     }
 
+    /**
+     * 순서 변경 요청의 유효성을 검증하는 메서드
+     */
     private static void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
-        if(request.prevTaskId()==0 && request.nextTaskId()==0){
+        // 이전 및 다음 작업 ID가 모두 0인 경우 예외 발생
+        if (request.prevTaskId() == 0 && request.nextTaskId() == 0) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
-        if(targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)){
+
+        // 타겟 상태가 유효한지 검증
+        if (targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
     }
 
+    /**
+     * 새로운 processorOrder를 계산하고 저장하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param prevTaskOrder 이전 작업의 processorOrder 값
+     * @param nextTaskOrder 다음 작업의 processorOrder 값
+     */
     private void updateNewTaskOrder(Long processorId, Task targetTask, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
         commandTaskPort.save(targetTask);
     }
 
+    /**
+     * 작업을 가장 상위로 이동시키는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param nextTaskId 다음 작업의 ID
+     */
     private void moveToTop(Long processorId, Task targetTask, Long nextTaskId) {
-        Task nextTask = taskService.findById(nextTaskId);
+        // 다음 작업 찾기
+        Task nextTask = findByIdAndStatus(nextTaskId, targetTask.getTaskStatus());
+
+        // 해당 상태에서 바로 앞에 있는 작업 찾기
         Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
-        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+
+        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+
         updateNewTaskOrder(processorId, targetTask, prevTaskOrder, nextTask.getProcessorOrder());
     }
 
+    /**
+     * 작업을 가장 하위로 이동시키는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param prevTaskId 이전 작업의 ID
+     */
     private void moveToBottom(Long processorId, Task targetTask, Long prevTaskId) {
-        Task prevTask = taskService.findById(prevTaskId);
+        // 이전 작업 찾기
+        Task prevTask = findByIdAndStatus(prevTaskId, targetTask.getTaskStatus());
+
+        // 해당 상태에서 바로 뒤에 있는 작업 찾기
         Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
-        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
-        log.info("바닥 전환 진입 {}: ", nextTaskOrder);
+
+        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
+
         updateNewTaskOrder(processorId, targetTask, prevTask.getProcessorOrder(), nextTaskOrder);
     }
 
-
+    /**
+     * 작업의 상태와 순서를 동시에 변경하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param request 순서 변경 요청 객체
+     * @param targetStatus 변경할 작업 상태
+     */
     @Override
     @Transactional
     public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus targetStatus) {
-        log.info("상태 전환 진입 {}: ", targetStatus);
         validateRequest(request, targetStatus);
+
         Member processor = memberService.findActiveMember(processorId);
+
         Task targetTask = taskService.findById(request.targetTaskId());
 
-        // 가장 상위로 이동
         if (request.prevTaskId() == 0) {
             moveToTopWithStatusChange(processorId, targetTask, request.nextTaskId(), targetStatus);
-        }
-        // 가장 하위로 이동
-        else if (request.nextTaskId() == 0) {
+        } else if (request.nextTaskId() == 0) {
             moveToBottomWithStatusChange(processorId, targetTask, request.prevTaskId(), targetStatus);
         } else {
-            Task prevTask = taskService.findById(request.prevTaskId());
-            Task nextTask = taskService.findById(request.nextTaskId());
-            // 다른 상태로의 상태 전환인지 검증
-            Task.validateTaskStatusTransition(prevTask, nextTask, targetStatus);
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
+
             updateNewTaskOrderAndStatus(targetStatus, targetTask, processor.getMemberId(), prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
         }
     }
 
+    /**
+     * 작업의 상태와 순서를 업데이트하는 메서드
+     */
     private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
         targetTask.updateTaskStatus(targetStatus);
         commandTaskPort.save(targetTask);
     }
 
+    /**
+     * 상태 변경을 포함하여 작업을 가장 상위로 이동하는 메서드
+     */
     private void moveToTopWithStatusChange(Long processorId, Task targetTask, Long nextTaskId, TaskStatus targetStatus) {
-        Task nextTask = taskService.findById(nextTaskId);
+        Task nextTask = findByIdAndStatus(nextTaskId, targetStatus);
         Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
-        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+
+        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+
         updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTaskOrder, nextTask.getProcessorOrder());
     }
 
+    /**
+     * 상태 변경을 포함하여 작업을 가장 하위로 이동하는 메서드
+     */
     private void moveToBottomWithStatusChange(Long processorId, Task targetTask, Long prevTaskId, TaskStatus targetStatus) {
-        Task prevTask = taskService.findById(prevTaskId);
+        Task prevTask = findByIdAndStatus(prevTaskId, targetStatus);
         Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
-        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+
+        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
+
         updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTask.getProcessorOrder(), nextTaskOrder);
     }
-
 }
+

From 15ea89d91eeb7225610c80552c3a16783fe91c9c Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:26:59 +0700
Subject: [PATCH 16/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=8A=B9=EC=9D=B8?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9D=B4=20=EC=9E=88=EB=8A=94=20member?=
 =?UTF-8?q?=EC=9D=84=20=EB=B0=94=EB=A1=9C=20=EC=B0=BE=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../outbound/persistense/MemberPersistenceAdapter.java      | 6 ++++++
 .../persistense/repository/member/MemberRepository.java     | 2 ++
 .../application/port/inbound/domain/MemberService.java      | 6 ++++++
 .../application/port/outbound/member/LoadMemberPort.java    | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 18a1f9a0..f07be47c 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -48,6 +48,12 @@ public List<Member> findReviewers() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public Optional<Member> findReviewerById(Long id) {
+        Optional<MemberEntity> memberEntity =  memberRepository.findByMemberIdAndIsReviewerTrue(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public void save(final Member member) {
         MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index 0bbec88e..e1bd0b45 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -21,5 +21,7 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
     Optional<MemberEntity> findByNickname(String nickname);
 
     List<MemberEntity> findByIsReviewerTrue();
+
+    Optional<MemberEntity> findByMemberIdAndIsReviewerTrue(Long memberId);
 }
 
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index ac2fb651..99e23229 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -24,6 +24,12 @@ public Member findActiveMember(Long memberId) {
                 () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
     }
 
+    public Member findReviewer(Long memberId) {
+        return loadMemberPort.findReviewerById(memberId).orElseThrow(
+                ()-> new ApplicationException(MemberErrorCode.NOT_A_REVIEWER)
+        );
+    }
+
     public List<Member> findReviewers() {
         return loadMemberPort.findReviewers();
     }
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index ab81c42d..70c04c75 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -14,4 +14,6 @@ public interface LoadMemberPort {
 
     List<Member> findReviewers();
 
+    Optional<Member> findReviewerById(Long id);
+
 }

From 7da6f9f053e7d36e40e69266092ace91e53b84b8 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:31:31 +0700
Subject: [PATCH 17/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=EC=9E=90=EC=9D=B8=EC=9D=B4=20=EA=B2=80=EC=A6=9D=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=EC=9D=84=20=EB=8F=84=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=20=EB=A0=88=EB=B2=A8=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../application/Task/UpdateTaskService.java   | 37 ++++++-------------
 .../server/domain/model/member/Member.java    |  1 -
 .../clap/server/domain/model/task/Task.java   |  8 +++-
 .../server/exception/code/TaskErrorCode.java  |  4 +-
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 4d9b1b4b..1301e9ce 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -5,6 +5,7 @@
 import clap.server.application.mapper.AttachmentMapper;
 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.UpdateTaskLabelUsecase;
@@ -14,17 +15,14 @@
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
-import clap.server.application.port.outbound.task.LoadLabelPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
-import clap.server.common.constants.FilePathConstants;
+import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
-
 import clap.server.exception.ApplicationException;
-import clap.server.exception.code.LabelErrorCode;
-import clap.server.exception.code.MemberErrorCode;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,9 +30,6 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Objects;
-
-import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
 
 
 @ApplicationService
@@ -45,9 +40,10 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
+
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
-    private final LoadLabelPort loadLabelPort;
+    private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadAdapter s3UploadAdapter;
 
@@ -58,14 +54,10 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         Category category = categoryService.findById(updateTaskRequest.categoryId());
         Task task = taskService.findById(taskId);
 
-        if(!Objects.equals(requester.getMemberId(), task.getRequester().getMemberId())) {
-            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-
-        task.updateTask(task.getTaskStatus(), category, updateTaskRequest.title(), updateTaskRequest.description());
+        task.updateTask(requesterId, category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
-        if (!updateTaskRequest.attachmentsToDelete().isEmpty()){
+        if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
             updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
         }
         return TaskMapper.toUpdateTaskResponse(updatedTask);
@@ -86,11 +78,9 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
+        Member reviewer = memberService.findReviewer(userId);
         Member processor = memberService.findById(request.processorId());
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+
         Task task = taskService.findById(taskId);
         task.updateProcessor(processor);
         Task updateTask = commandTaskPort.save(task);
@@ -102,12 +92,9 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+        Member reviewer = memberService.findReviewer(userId);
         Task task = taskService.findById(taskId);
-        Label label = loadLabelPort.findById(request.labelId()).orElseThrow(() -> new ApplicationException(LabelErrorCode.LABEL_NOT_FOUND));
+        Label label = labelService.findById(request.labelId());
 
         task.updateLabel(label);
         Task updatetask = commandTaskPort.save(task);
@@ -125,7 +112,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
 
     private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task) {
         List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
-        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
+        if (attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
             throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
         }
         return attachmentsOfTask;
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
index f55b3fcc..c1e2f682 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -1,6 +1,5 @@
 package clap.server.domain.model.member;
 
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
 import lombok.*;
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 398fd510..4d4694de 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
 import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.AccessLevel;
@@ -45,8 +46,11 @@ public static Task createTask(Member member, Category category, String title, St
                 .build();
     }
 
-    public void updateTask(TaskStatus status, Category category, String title, String description) {
-        if (status != TaskStatus.REQUESTED) {
+    public void updateTask(Long requesterId, Category category, String title, String description) {
+        if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
+            throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
+        }
+        if (this.taskStatus != TaskStatus.REQUESTED) {
             throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
         }
         this.category = category;
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index f93fefa2..8c8a2cf7 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -12,9 +12,11 @@ public enum TaskErrorCode implements BaseErrorCode {
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
     TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
     LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다."),
-    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 수정 권한이 없습니다."),
+    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 처리 및 수정 권한이 없습니다."),
     INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
     INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
+    NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
+    NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_009", "작업 수정 권한이 없습니다."),
     ;
 
     private final HttpStatus httpStatus;

From 9605bffbf7d078ff3d1492ff75c2b395c079d3f5 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:46:28 +0700
Subject: [PATCH 18/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9A=94=EC=B2=AD=20=EC=83=81=ED=83=9C=EC=9D=B8?=
 =?UTF-8?q?=EC=A7=80=20=EA=B2=80=EC=A6=9D=ED=95=98=EB=8A=94=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../server/application/Task/ApprovalTaskService.java   |  9 ++-------
 src/main/java/clap/server/domain/model/task/Task.java  | 10 +++++++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/ApprovalTaskService.java b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
index 58b115c5..979ee2eb 100644
--- a/src/main/java/clap/server/application/Task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
@@ -36,10 +36,7 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     @Override
     @Transactional
     public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId, ApprovalTaskRequest approvalTaskRequest) {
-        Member reviewer = memberService.findActiveMember(reviewerId);
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+        Member reviewer = memberService.findReviewer(reviewerId);
         Task task = taskService.findById(taskId);
         Member processor = memberService.findById(approvalTaskRequest.processorId());
         Category category = categoryService.findById(approvalTaskRequest.categoryId());
@@ -54,9 +51,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
     public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         memberService.findActiveMember(managerId);
         Task task = taskService.findById(taskId);
-        if (task.getTaskStatus() != TaskStatus.REQUESTED) {
-            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
+        task.validateTaskRequested();
         return TaskMapper.toFindApprovalFormResponse(task);
     }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 4d4694de..efdfeba5 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -50,15 +50,19 @@ public void updateTask(Long requesterId, Category category, String title, String
         if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
             throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
         }
-        if (this.taskStatus != TaskStatus.REQUESTED) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
+        validateTaskRequested();
         this.category = category;
         this.title = title;
         this.description = description;
         this.taskCode = toTaskCode(category);
     }
 
+    public void validateTaskRequested() {
+        if (this.taskStatus != TaskStatus.REQUESTED) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+    }
+
     public void setInitialProcessorOrder() {
         if (this.processor == null) {
             this.processorOrder = this.taskId * DEFAULT_PROCESSOR_ORDER_GAP;

From b175bdffcc8ff382ce5bd3a6619712a4b4499e8a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:47:36 +0700
Subject: [PATCH 19/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=8A=B9=EC=9D=B8?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../port/inbound/label/FindLabelListUsecase.java         | 4 ++--
 .../application/service/label/FindLabelListService.java  | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
index fbfe94cb..e475b489 100644
--- a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
@@ -8,6 +8,6 @@
 
 public interface FindLabelListUsecase {
 
-    SliceResponse<FindLabelListResponse> findLabelList(Long userId, Pageable pageable);
-    List<FindLabelListResponse> findLabelListAdmin(Long userId);
+    SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable);
+    List<FindLabelListResponse> findLabelListAdmin(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/service/label/FindLabelListService.java b/src/main/java/clap/server/application/service/label/FindLabelListService.java
index 77f3bd26..57d23a49 100644
--- a/src/main/java/clap/server/application/service/label/FindLabelListService.java
+++ b/src/main/java/clap/server/application/service/label/FindLabelListService.java
@@ -25,13 +25,8 @@ public class FindLabelListService implements FindLabelListUsecase {
     private final MemberService memberService;
 
     @Override
-    public SliceResponse<FindLabelListResponse> findLabelList(Long userId, Pageable pageable) {
-        Member member = memberService.findActiveMember(userId);
-
-        // 담당자인데 검토자가 아닌 경우 Error 처리
-        if (!member.getMemberInfo().isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+    public SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable) {
+        Member member = memberService.findReviewer(memberId);
         return loadLabelPort.findLabelListBySlice(pageable);
     }
 

From 84636a39ee53bd6bfa51f202c53b0ebf1be38224 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 07:04:58 +0700
Subject: [PATCH 20/40] =?UTF-8?q?CLAP-150=20Fix:=20=EC=9B=B9=ED=9B=85=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EB=93=A4=20=ED=99=98=EA=B2=BD=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 .../adapter/outbound/api/AgitClient.java      | 10 +++----
 .../adapter/outbound/api/EmailClient.java     |  4 +--
 .../adapter/outbound/api/KakaoWorkClient.java |  8 +++---
 src/main/resources/application.yml            | 27 ++-----------------
 src/main/resources/notifications.yml          | 20 ++++++++++++++
 5 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 src/main/resources/notifications.yml

diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
index 026018cd..ee4ff073 100644
--- a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/AgitClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendAgitRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
@@ -12,12 +12,12 @@
 import org.springframework.web.client.RestTemplate;
 
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class AgitClient implements SendAgitPort {
 
-    @Value("${agit.url}")
-    private String AGITWEBHOOK_URL;
+    @Value("${webhook.agit.url}")
+    private String AGIT_WEBHOOK_URL;
 
     @Override
     public void sendAgit(SendAgitRequest request) {
@@ -48,6 +48,6 @@ else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
         HttpEntity<String> entity = new HttpEntity<>(payload, headers);
 
         // Post 요청
-        restTemplate.exchange(AGITWEBHOOK_URL, HttpMethod.POST, entity, String.class);
+        restTemplate.exchange(AGIT_WEBHOOK_URL, HttpMethod.POST, entity, String.class);
     }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
index ee5fb2f9..979233b0 100644
--- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendEmailPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.NotificationErrorCode;
 import jakarta.mail.internet.MimeMessage;
@@ -13,7 +13,7 @@
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring6.SpringTemplateEngine;
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class EmailClient implements SendEmailPort {
 
diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
index 9557f973..aa0a7743 100644
--- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
+++ b/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
-import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.common.annotation.architecture.ExternalApiAdapter;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.NotificationErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -13,14 +13,14 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
 
-@PersistenceAdapter
+@ExternalApiAdapter
 @RequiredArgsConstructor
 public class KakaoWorkClient implements SendKaKaoWorkPort {
 
-    @Value("${kakaowork.url}")
+    @Value("${webhook.kakaowork.url}")
     private String kakaworkUrl;
 
-    @Value("${kakaowork.auth}")
+    @Value("${webhook.kakaowork.auth}")
     private String kakaworkAuth;
 
     private final ObjectBlockService makeObjectBlock;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 713aff54..c9efe054 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,25 +9,11 @@ spring:
       - auth.yml
       - elasticsearch.yml
       - s3.yml
-
+      - notifications.yml
   application:
     name: taskflow
   web.resources.add-mappings: false
 
-  # 구글 알림 이메일 발신자 정보 설정(논의 필요)
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: leegd120@gmail.com
-    password: znlictzarqurxlla
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-
-
 
 server:
   port: ${APPLICATION_PORT:8080}
@@ -45,15 +31,6 @@ web:
     local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
     service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
 
-
-# 카카오워크 및 agit url, accessKey값 환경 변수로 설정
-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
-
 local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
 service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
 
@@ -83,4 +60,4 @@ logging:
 spring.config.activate.on-profile: prod
 logging:
   level:
-    root: INFO
+    root: INFO
\ No newline at end of file
diff --git a/src/main/resources/notifications.yml b/src/main/resources/notifications.yml
new file mode 100644
index 00000000..e4ef655e
--- /dev/null
+++ b/src/main/resources/notifications.yml
@@ -0,0 +1,20 @@
+#TODO 구글 알림 이메일 발신자 정보 설정(논의 필요)
+spring:
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${MAIL_USERNAME}
+    password: ${MAIL_PASSWORD}
+  properties:
+    mail:
+      smtp:
+        auth: true
+        starttls:
+          enable: true
+
+webhook:
+  kakaowork:
+    url: ${KAKAOWORK_WEBHOOK_URL}
+    auth: ${KAKAOWORK_WEBHOOK_AUTH}
+  agit:
+    url: ${AGIT_WEBHOOK_URL}
\ No newline at end of file

From a7e726e005d346c01e81ffd5be66780106ae38f7 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 07:09:24 +0700
Subject: [PATCH 21/40] =?UTF-8?q?CLAP-150=20Fix:=20email=20config=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 .../clap/server/config/mail/EmailConfig.java  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/main/java/clap/server/config/mail/EmailConfig.java

diff --git a/src/main/java/clap/server/config/mail/EmailConfig.java b/src/main/java/clap/server/config/mail/EmailConfig.java
new file mode 100644
index 00000000..b2a1b065
--- /dev/null
+++ b/src/main/java/clap/server/config/mail/EmailConfig.java
@@ -0,0 +1,43 @@
+package clap.server.config.mail;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+
+import java.util.Properties;
+
+@Configuration
+public class EmailConfig {
+
+    @Value("${spring.mail.host}")
+    private String host;
+
+    @Value("${spring.mail.port}")
+    private int port;
+
+    @Value("${spring.mail.username}")
+    private String username;
+
+    @Value("${spring.mail.password}")
+    private String password;
+
+    @Bean
+    public JavaMailSender javaMailSender() {
+        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+        mailSender.setHost(host);
+        mailSender.setPort(port);
+        mailSender.setUsername(username);
+        mailSender.setPassword(password);
+
+        Properties props = mailSender.getJavaMailProperties();
+        props.put("mail.transport.protocol", "smtp");
+        props.put("mail.smtp.auth", "true");
+        props.put("mail.smtp.starttls.enable", "true");
+        props.put("mail.debug", "true");
+
+        return mailSender;
+    }
+}
+

From 550fa84aeef30ea73031628cf42cee1bf7b36c38 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 09:51:40 +0700
Subject: [PATCH 22/40] =?UTF-8?q?CLAP-150=20Remove:=20test=20yml=20?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #123
---
 src/test/resources/application.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index b10d6c61..470fc61a 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -58,11 +58,3 @@ 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
-
-

From 20f00264e8d7b4bcb9458983964086de007c0026 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:02:58 +0700
Subject: [PATCH 23/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=9E=AC=EA=B3=84=EC=82=B0=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=93=B0=EC=9D=BC=20processor=20order=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=A0=84=EC=97=AD=20=EC=83=81=EC=88=98=20=EC=84=A0?=
 =?UTF-8?q?=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../model/task/constants/TaskProcessorOrderPolicy.java    | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java

diff --git a/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java b/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
new file mode 100644
index 00000000..78bc9cfc
--- /dev/null
+++ b/src/main/java/clap/server/domain/model/task/constants/TaskProcessorOrderPolicy.java
@@ -0,0 +1,8 @@
+package clap.server.domain.model.task.constants;
+
+import lombok.Getter;
+
+@Getter
+public class TaskProcessorOrderPolicy {
+    public static final long DEFAULT_PROCESSOR_ORDER_GAP = (long) Math.pow(2,6);
+}
\ No newline at end of file

From 67f654a89fd7ce092ddd57debddda5857a12a3ee Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:04:54 +0700
Subject: [PATCH 24/40] git rebase

---
 .../infrastructure/s3/S3UploadAdapter.java      |  6 +++---
 .../application/Task/CreateTaskService.java     |  4 ++--
 .../Task/FindTaskDetailsService.java            |  2 --
 .../application/Task/UpdateTaskService.java     | 17 +++++++++--------
 .../port/outbound/s3/S3UploadPort.java          |  6 +++---
 .../constants/FilePathConstants.java}           |  4 ++--
 6 files changed, 19 insertions(+), 20 deletions(-)
 rename src/main/java/clap/server/{domain/model/task/FilePath.java => common/constants/FilePathConstants.java} (76%)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
index 44c7149e..68798b73 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java
@@ -3,7 +3,7 @@
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.common.annotation.architecture.InfrastructureAdapter;
 import clap.server.config.s3.KakaoS3Config;
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.exception.S3Exception;
 import clap.server.exception.code.S3Errorcode;
 import lombok.RequiredArgsConstructor;
@@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort {
     private final KakaoS3Config kakaoS3Config;
     private final S3Client s3Client;
 
-    public List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles)  {
+    public List<String> uploadFiles(FilePathConstants filePrefix, List<MultipartFile> multipartFiles)  {
         return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList();
     }
 
-    public String uploadSingleFile(FilePath filePrefix, MultipartFile file) {
+    public String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file) {
         try {
             Path filePath = getFilePath(file);
             String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
index 2c978d92..1e19c7ed 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/Task/CreateTaskService.java
@@ -23,7 +23,7 @@
 import clap.server.domain.model.notification.Notification;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
 
@@ -64,7 +64,7 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT
     }
 
     private void saveAttachments(List<MultipartFile> files, Task task) {
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
diff --git a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java b/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
index 6bf4a9dd..32194b72 100644
--- a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
+++ b/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
@@ -2,14 +2,12 @@
 
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse;
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.task.FindTaskDetailsUsecase;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Task;
 import clap.server.exception.ApplicationException;
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index d8163b6c..4cb8a153 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -1,23 +1,27 @@
 package clap.server.application.Task;
 
-import clap.server.adapter.inbound.web.dto.task.*;
+import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
+import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
+import clap.server.adapter.inbound.web.dto.task.UpdateTaskStatusRequest;
+import clap.server.adapter.inbound.web.dto.task.UpdateTaskProcessorRequest;
 import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.application.mapper.AttachmentMapper;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
-import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskStatusUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadAttachmentPort;
-import clap.server.application.port.outbound.task.LoadLabelPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
-import clap.server.domain.model.task.*;
+import clap.server.domain.model.task.Attachment;
+import clap.server.domain.model.task.Category;
+import clap.server.common.constants.FilePathConstants;
+import clap.server.domain.model.task.Task;
 
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.LabelErrorCode;
@@ -31,20 +35,17 @@
 import java.util.List;
 import java.util.Objects;
 
-import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
-
 
 @ApplicationService
 @RequiredArgsConstructor
 @Slf4j
-public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUsecase, UpdateTaskProcessorUsecase, UpdateTaskLabelUsecase {
+public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUsecase, UpdateTaskProcessorUsecase {
 
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
-    private final LoadLabelPort loadLabelPort;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadAdapter s3UploadAdapter;
 
diff --git a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
index a55f06a9..63423da3 100644
--- a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
+++ b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java
@@ -1,12 +1,12 @@
 package clap.server.application.port.outbound.s3;
 
-import clap.server.domain.model.task.FilePath;
+import clap.server.common.constants.FilePathConstants;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 public interface S3UploadPort {
-    List<String> uploadFiles(FilePath filePrefix, List<MultipartFile> multipartFiles);
+    List<String> uploadFiles(FilePathConstants filePrefix, List<MultipartFile> multipartFiles);
 
-    String uploadSingleFile(FilePath filePrefix, MultipartFile file);
+    String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file);
 }
diff --git a/src/main/java/clap/server/domain/model/task/FilePath.java b/src/main/java/clap/server/common/constants/FilePathConstants.java
similarity index 76%
rename from src/main/java/clap/server/domain/model/task/FilePath.java
rename to src/main/java/clap/server/common/constants/FilePathConstants.java
index 6786b741..92393f90 100644
--- a/src/main/java/clap/server/domain/model/task/FilePath.java
+++ b/src/main/java/clap/server/common/constants/FilePathConstants.java
@@ -1,11 +1,11 @@
-package clap.server.domain.model.task;
+package clap.server.common.constants;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
-public enum FilePath {
+public enum FilePathConstants {
     TASK_IMAGE("task/image"),
     TASK_DOCUMENT("task/docs"),
     MEMBER_IMAGE("member/image"),

From 913723a6423f51c9f0c8f2a8e8a78be9684aec2e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:07:16 +0700
Subject: [PATCH 25/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20request=20dto=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../dto/task/request/UpdateTaskOrderRequest.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java
new file mode 100644
index 00000000..b39ded57
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskOrderRequest.java
@@ -0,0 +1,14 @@
+package clap.server.adapter.inbound.web.dto.task.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+
+public record UpdateTaskOrderRequest(
+        @Schema(description = "변경할 위치의 상위 작업 ID, 가장 상위일 경우 0 입력")
+        long prevTaskId,
+        @Min(1) @Schema(description = "순서 또는 상태를 변경할 작업의 ID")
+        long targetTaskId,
+        @Schema(description = "변경할 위치의 하위 작업 ID, 가장 하위일 경우 0 입력")
+        long nextTaskId
+) {
+}

From 790107a78bd860362113ed408b39fa94804cac44 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:08:47 +0700
Subject: [PATCH 26/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20usecase=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../persistense/TaskPersistenceAdapter.java   |  16 ++-
 .../repository/task/TaskRepository.java       |   7 +-
 .../Task/MoveTaskBoardService.java            | 125 ++++++++++++++++++
 .../inbound/task/MoveTaskBoardUsecase.java    |   9 ++
 .../port/outbound/task/LoadTaskPort.java      |   9 +-
 5 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/clap/server/application/Task/MoveTaskBoardService.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index c0ea7eea..662ec33b 100644
--- 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,9 @@
 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.FilterRequestedTasksResponse;
+import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 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;
@@ -75,4 +75,16 @@ public Page<FilterAllTasksResponse> findAllTasks (Pageable pageable, FilterTaskL
                 .map(taskPersistenceMapper::toDomain);
         return taskList.map(TaskMapper::toFilterAllTasksResponse);
     }
+    @Override
+    public Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder){
+        Optional<TaskEntity> taskEntity = taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder){
+        Optional<TaskEntity> taskEntity =  taskRepository.findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(processorId, taskStatus, processorOrder);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index 6fa3eb6c..210f17ab 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -12,6 +12,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface TaskRepository extends JpaRepository<TaskEntity, Long>, TaskCustomRepository {
@@ -28,7 +29,8 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
     @Query("SELECT t FROM TaskEntity t " +
             "WHERE t.processor.memberId = :processorId " +
             "AND t.taskStatus IN :taskStatus " +
-            "AND (t.taskStatus != 'COMPLETED' OR t.finishedAt >= :untilDate)")
+            "AND (t.taskStatus != 'COMPLETED' OR t.finishedAt <= :untilDate) " +
+            "ORDER BY t.processorOrder ASC ")
     Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             @Param("processorId") Long processorId,
             @Param("taskStatus") List<TaskStatus> taskStatus,
@@ -36,7 +38,10 @@ Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             Pageable pageable
     );
 
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
+    Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(
+            Long processorId, TaskStatus taskStatus, Long processorOrder);
 
 }
 
diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
new file mode 100644
index 00000000..f8c407a8
--- /dev/null
+++ b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
@@ -0,0 +1,125 @@
+package clap.server.application.Task;
+
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.outbound.task.CommandTaskPort;
+import clap.server.application.port.outbound.task.LoadTaskPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Task;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.TaskErrorCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@ApplicationService
+@RequiredArgsConstructor
+class MoveTaskBoardService implements MoveTaskBoardUsecase {
+    private final MemberService memberService;
+    private final TaskService taskService;
+    private final LoadTaskPort loadTaskPort;
+    private final CommandTaskPort commandTaskPort;
+
+    @Override
+    @Transactional
+    public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
+        validateRequest(request, null);
+        Member processor = memberService.findActiveMember(processorId);
+        Task targetTask = taskService.findById(request.targetTaskId());
+
+        // 가장 상위로 이동
+        if (request.prevTaskId() == 0) {
+            moveToTop(processorId, targetTask, request.nextTaskId());
+        }
+        // 가장 하위로 이동
+        else if (request.nextTaskId() == 0) {
+            moveToBottom(processorId, targetTask, request.prevTaskId());
+        } else {
+            Task prevTask = taskService.findById(request.prevTaskId());
+            Task nextTask = taskService.findById(request.nextTaskId());
+            // 같은 상태에서의 순서 변경인지 검증
+            Task.checkTaskStatusIsSame(targetTask, prevTask, nextTask);
+            updateNewTaskOrder(processor.getMemberId(), targetTask, prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+        }
+    }
+
+    private static void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
+        if(request.prevTaskId()==0 && request.nextTaskId()==0){
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        if(targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)){
+            throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+    }
+
+    private void updateNewTaskOrder(Long processorId, Task targetTask, Long prevTaskOrder, Long nextTaskOrder) {
+        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+        commandTaskPort.save(targetTask);
+    }
+
+    private void moveToTop(Long processorId, Task targetTask, Long nextTaskId) {
+        Task nextTask = taskService.findById(nextTaskId);
+        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
+        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+        updateNewTaskOrder(processorId, targetTask, prevTaskOrder, nextTask.getProcessorOrder());
+    }
+
+    private void moveToBottom(Long processorId, Task targetTask, Long prevTaskId) {
+        Task prevTask = taskService.findById(prevTaskId);
+        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
+        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+        log.info("바닥 전환 진입 {}: ", nextTaskOrder);
+        updateNewTaskOrder(processorId, targetTask, prevTask.getProcessorOrder(), nextTaskOrder);
+    }
+
+
+    @Override
+    @Transactional
+    public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus targetStatus) {
+        log.info("상태 전환 진입 {}: ", targetStatus);
+        validateRequest(request, targetStatus);
+        Member processor = memberService.findActiveMember(processorId);
+        Task targetTask = taskService.findById(request.targetTaskId());
+
+        // 가장 상위로 이동
+        if (request.prevTaskId() == 0) {
+            moveToTopWithStatusChange(processorId, targetTask, request.nextTaskId(), targetStatus);
+        }
+        // 가장 하위로 이동
+        else if (request.nextTaskId() == 0) {
+            moveToBottomWithStatusChange(processorId, targetTask, request.prevTaskId(), targetStatus);
+        } else {
+            Task prevTask = taskService.findById(request.prevTaskId());
+            Task nextTask = taskService.findById(request.nextTaskId());
+            // 다른 상태로의 상태 전환인지 검증
+            Task.validateTaskStatusTransition(prevTask, nextTask, targetStatus);
+            updateNewTaskOrderAndStatus(targetStatus, targetTask, processor.getMemberId(), prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
+        }
+    }
+
+    private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
+        targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
+        targetTask.changeTaskStatus(targetStatus);
+        commandTaskPort.save(targetTask);
+    }
+
+    private void moveToTopWithStatusChange(Long processorId, Task targetTask, Long nextTaskId, TaskStatus targetStatus) {
+        Task nextTask = taskService.findById(nextTaskId);
+        Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
+        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTaskOrder, nextTask.getProcessorOrder());
+    }
+
+    private void moveToBottomWithStatusChange(Long processorId, Task targetTask, Long prevTaskId, TaskStatus targetStatus) {
+        Task prevTask = taskService.findById(prevTaskId);
+        Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
+        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+        updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTask.getProcessorOrder(), nextTaskOrder);
+    }
+
+}
diff --git a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
new file mode 100644
index 00000000..b89adb3c
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.task;
+
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+
+public interface MoveTaskBoardUsecase {
+    void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request);
+    void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
+}
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
index ff18bf14..eb4dda87 100644
--- 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,13 +1,10 @@
 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.FilterAllTasksResponse;
+import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
 import clap.server.domain.model.task.Task;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -29,4 +26,8 @@ public interface LoadTaskPort {
     Page<FilterAllTasksResponse> findAllTasks(Pageable pageable, FilterTaskListRequest findTaskListRequest);
 
     Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable);
+
+    Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
+
+    Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 }
\ No newline at end of file

From 362b98f7a727b05a8ce2f042497138a3b8be82bb Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:09:35 +0700
Subject: [PATCH 27/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20usecase=EC=9D=98=20?=
 =?UTF-8?q?=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../clap/server/domain/model/task/Task.java   | 65 ++++++++++++++++++-
 .../server/exception/code/TaskErrorCode.java  |  5 +-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 3b0b2814..e161b7b6 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -14,6 +14,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
+import static clap.server.domain.model.task.constants.TaskProcessorOrderPolicy.DEFAULT_PROCESSOR_ORDER_GAP;
+
 @Getter
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -54,8 +56,8 @@ public void updateTask(TaskStatus status, Category category, String title, Strin
     }
 
     public void setInitialProcessorOrder() {
-        if(this.processor == null) {
-            this.processorOrder = this.taskId * 128L;
+        if (this.processor == null) {
+            this.processorOrder = this.taskId * DEFAULT_PROCESSOR_ORDER_GAP;
         }
     }
 
@@ -80,7 +82,64 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate
         this.taskStatus = TaskStatus.IN_PROGRESS;
     }
 
-    private static String toTaskCode(Category category){
+    private static String toTaskCode(Category category) {
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
+
+    public void changeTaskStatus(TaskStatus newStatus) {
+        if (newStatus == null) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        this.taskStatus = newStatus;
+    }
+
+    public void updateProcessorOrder(Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
+        if (!Objects.equals(processorId, this.processor.getMemberId())) {
+            throw new DomainException(TaskErrorCode.NOT_A_PROCESSOR);
+        }
+        long newProcessorOrder;
+
+        // 최상위 이동: 가장 작은 processorOrder보다 더 작은 값 설정
+        if (prevTaskOrder == null && nextTaskOrder != null) {
+            newProcessorOrder = nextTaskOrder - DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        // 최하위 이동: 가장 큰 processorOrder보다 더 큰 값 설정
+        else if (prevTaskOrder != null && nextTaskOrder == null) {
+            newProcessorOrder = prevTaskOrder + DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        // 중간 위치로 이동: prevTask와 nextTask의 processorOrder 평균값 사용
+        else if (prevTaskOrder != null && nextTaskOrder != null) {
+            if (nextTaskOrder - prevTaskOrder < 2) {
+                throw new DomainException(TaskErrorCode.INVALID_TASK_ORDER);
+            }
+            newProcessorOrder = (prevTaskOrder + nextTaskOrder) / 2;
+        }
+        // 기본값 (예외적인 상황 방지)
+        else {
+            newProcessorOrder = DEFAULT_PROCESSOR_ORDER_GAP;
+        }
+        this.processorOrder = newProcessorOrder;
+    }
+
+
+
+    public static void checkTaskStatusIsSame(Task targetTask, Task prevTask, Task nextTask) {
+        if (targetTask.getTaskStatus() == null) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+        if (targetTask.getTaskStatus() != prevTask.getTaskStatus() ||
+                targetTask.getTaskStatus() != nextTask.getTaskStatus()) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+    }
+
+    public static void validateTaskStatusTransition(Task prevTask, Task nextTask, TaskStatus targetStatus) {
+        if (prevTask != null && prevTask.getTaskStatus() != targetStatus) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+        if (nextTask != null && nextTask.getTaskStatus() != targetStatus) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
+    }
+
 }
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 6d6ff5c7..f93fefa2 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -11,7 +11,10 @@ public enum TaskErrorCode implements BaseErrorCode {
     CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_002", "카테고리를 찾을 수 없습니다."),
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
     TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
-    LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다.")
+    LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다."),
+    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 수정 권한이 없습니다."),
+    INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
+    INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
     ;
 
     private final HttpStatus httpStatus;

From 58e03672f3e857f6505dcae186994c160d0008aa Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:10:31 +0700
Subject: [PATCH 28/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=9C=20=EC=83=81=ED=83=9C=EB=93=A4?=
 =?UTF-8?q?=EC=9D=84=20task=20status=EC=97=90=EC=84=9C=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../entity/task/constant/TaskStatus.java         | 14 +++++++++-----
 .../application/Task/TaskBoardService.java       | 16 ++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

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
index 29972c3d..83a653f4 100644
--- 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
@@ -1,10 +1,11 @@
 package clap.server.adapter.outbound.persistense.entity.task.constant;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 @Getter
 @RequiredArgsConstructor
 public enum TaskStatus {
@@ -16,10 +17,6 @@ public enum TaskStatus {
 
     private final String description;
 
-    @JsonValue
-    public String getDescription() {
-        return description;
-    }
     @JsonCreator
     public static TaskStatus fromDescription(String description) {
         for (TaskStatus status : TaskStatus.values()) {
@@ -29,4 +26,11 @@ public static TaskStatus fromDescription(String description) {
         }
         throw new IllegalArgumentException("Unknown description: " + description);
     }
+
+    public static List<TaskStatus> getTaskBoardStatusList() {
+        return List.of(
+                TaskStatus.IN_PROGRESS,
+                TaskStatus.PENDING_COMPLETED,
+                TaskStatus.COMPLETED);
+    }
 }
diff --git a/src/main/java/clap/server/application/Task/TaskBoardService.java b/src/main/java/clap/server/application/Task/TaskBoardService.java
index 2e597453..57246e25 100644
--- a/src/main/java/clap/server/application/Task/TaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/TaskBoardService.java
@@ -4,9 +4,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.MemberService;
-import clap.server.application.port.inbound.domain.TaskService;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
-import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.task.Task;
@@ -22,23 +20,17 @@
 @ApplicationService
 @RequiredArgsConstructor
 class TaskBoardService implements TaskBoardUsecase {
-    private final static List<TaskStatus> VIEWABLE_STATUSES = List.of(
-            TaskStatus.IN_PROGRESS,
-            TaskStatus.PENDING_COMPLETED,
-            TaskStatus.COMPLETED
-    );
+    private final static List<TaskStatus> VIEWABLE_STATUSES = TaskStatus.getTaskBoardStatusList();
+
     private final MemberService memberService;
-    private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
-    private final CommandTaskPort commandTaskPort;
 
-    @Transactional(readOnly = true)
     @Override
+    @Transactional(readOnly = true)
     public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
         memberService.findById(processorId);
-        LocalDateTime untilDateTime = untilDate==null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
+        LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
         Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDateTime, pageable);
         return TaskMapper.toSliceTaskItemResponse(tasks);
     }
-
 }

From 13fc27d3f663bb16b36535feacdb1ffc78b29ca3 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:11:09 +0700
Subject: [PATCH 29/40] =?UTF-8?q?CLAP-155=20Feat:=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=EC=9D=98=20task=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20API=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../inbound/web/task/TaskBoardController.java | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index b2a5a6ea..4d763736 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -1,10 +1,15 @@
 package clap.server.adapter.inbound.web.task;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
@@ -12,10 +17,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
 
@@ -26,16 +28,30 @@
 @RequestMapping("/api/task-board")
 public class TaskBoardController {
     private final TaskBoardUsecase taskBoardUsecase;
+    private final MoveTaskBoardUsecase moveTaskBoardUsecase;
 
+    @Operation(summary = "작업 보드 조회 API")
     @GetMapping
     public ResponseEntity<TaskBoardResponse> getTaskBoard(@RequestParam(defaultValue = "0") int page,
                                                           @RequestParam(defaultValue = "20") int pageSize,
                                                           @Parameter(description = "yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
-                                                              @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
+                                                          @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
                                                           @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
         return ResponseEntity.ok(taskBoardUsecase.getTaskBoards(userInfo.getUserId(), untilDate, pageable));
     }
 
+    @Operation(summary = "작업 보드 순서 및 상태 변경 API")
+    @PatchMapping
+    public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태, 상태 전환이 아니라면 입력 X", schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
+                                @RequestParam(required = false) TaskStatus status,
+                                @RequestBody UpdateTaskOrderRequest request,
+                                @AuthenticationPrincipal SecurityUserDetails userInfo) {
+        if (status == null) {
+            moveTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
+        } else {
+            moveTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+        }
+    }
 
 }

From 1d22e46df73fea175192ce3ba17c375c24dedbff Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:17:30 +0700
Subject: [PATCH 30/40] =?UTF-8?q?CLAP-155=20Remove:=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../server/application/Task/MoveTaskBoardService.java  |  2 +-
 src/main/java/clap/server/domain/model/task/Task.java  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
index f8c407a8..135af77a 100644
--- a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
@@ -104,7 +104,7 @@ else if (request.nextTaskId() == 0) {
 
     private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
-        targetTask.changeTaskStatus(targetStatus);
+        targetTask.updateTaskStatus(targetStatus);
         commandTaskPort.save(targetTask);
     }
 
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index e161b7b6..0db9ee12 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -62,6 +62,9 @@ public void setInitialProcessorOrder() {
     }
 
     public void updateTaskStatus(TaskStatus status) {
+        if (status == null) {
+            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
+        }
         this.taskStatus = status;
     }
 
@@ -86,13 +89,6 @@ private static String toTaskCode(Category category) {
         return category.getMainCategory().getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
     }
 
-    public void changeTaskStatus(TaskStatus newStatus) {
-        if (newStatus == null) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-        this.taskStatus = newStatus;
-    }
-
     public void updateProcessorOrder(Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         if (!Objects.equals(processorId, this.processor.getMemberId())) {
             throw new DomainException(TaskErrorCode.NOT_A_PROCESSOR);

From 76a980f56cc505d460e637b570930070ab57f33b Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 11:30:36 +0700
Subject: [PATCH 31/40] =?UTF-8?q?CLAP-155=20Rename:=20=EB=84=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../adapter/inbound/web/task/TaskBoardController.java     | 8 ++++----
 ...eTaskBoardService.java => UpdateTaskBoardService.java} | 4 ++--
 ...eTaskBoardUsecase.java => UpdateTaskBoardUsecase.java} | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/clap/server/application/Task/{MoveTaskBoardService.java => UpdateTaskBoardService.java} (97%)
 rename src/main/java/clap/server/application/port/inbound/task/{MoveTaskBoardUsecase.java => UpdateTaskBoardUsecase.java} (90%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
index 4d763736..00e7b505 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java
@@ -4,7 +4,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.TaskBoardUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -28,7 +28,7 @@
 @RequestMapping("/api/task-board")
 public class TaskBoardController {
     private final TaskBoardUsecase taskBoardUsecase;
-    private final MoveTaskBoardUsecase moveTaskBoardUsecase;
+    private final UpdateTaskBoardUsecase updateTaskBoardUsecase;
 
     @Operation(summary = "작업 보드 조회 API")
     @GetMapping
@@ -48,9 +48,9 @@ public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태
                                 @RequestBody UpdateTaskOrderRequest request,
                                 @AuthenticationPrincipal SecurityUserDetails userInfo) {
         if (status == null) {
-            moveTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
+            updateTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
         } else {
-            moveTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+            updateTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
         }
     }
 
diff --git a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
similarity index 97%
rename from src/main/java/clap/server/application/Task/MoveTaskBoardService.java
rename to src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
index 135af77a..5f6129a6 100644
--- a/src/main/java/clap/server/application/Task/MoveTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
@@ -4,7 +4,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.domain.TaskService;
-import clap.server.application.port.inbound.task.MoveTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -19,7 +19,7 @@
 @Slf4j
 @ApplicationService
 @RequiredArgsConstructor
-class MoveTaskBoardService implements MoveTaskBoardUsecase {
+class UpdateTaskBoardService implements UpdateTaskBoardUsecase {
     private final MemberService memberService;
     private final TaskService taskService;
     private final LoadTaskPort loadTaskPort;
diff --git a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
similarity index 90%
rename from src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
rename to src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
index b89adb3c..3a7ebf9a 100644
--- a/src/main/java/clap/server/application/port/inbound/task/MoveTaskBoardUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskBoardUsecase.java
@@ -3,7 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
-public interface MoveTaskBoardUsecase {
+public interface UpdateTaskBoardUsecase {
     void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request);
     void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus status);
 }

From 0d59aa71c4747548e658510acf2b1f97774ed6ac Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:02:18 +0700
Subject: [PATCH 32/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C,=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=EA=B0=92=EA=B3=BC=20id=EB=A5=BC=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=B4=20=EC=97=94=ED=8B=B0=ED=8B=B0=EB=A5=BC=20=EC=B0=BE?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../outbound/persistense/TaskPersistenceAdapter.java        | 6 ++++++
 .../persistense/repository/task/TaskRepository.java         | 2 ++
 .../server/application/port/outbound/task/LoadTaskPort.java | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
index 662ec33b..1b72d24a 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -63,6 +63,12 @@ public Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> s
         return tasks.map(taskPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Task> findByIdAndStatus(Long id, TaskStatus status) {
+        Optional<TaskEntity> taskEntity = taskRepository.findByTaskIdAndTaskStatus(id, status);
+        return taskEntity.map(taskPersistenceMapper::toDomain);
+    }
+
     @Override
     public List<Task> findYesterdayTaskByDate(LocalDateTime now) {
         return taskRepository.findYesterdayTaskByUpdatedAtIsBetween(now.minusDays(1), now)
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
index 210f17ab..99099b28 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java
@@ -38,6 +38,8 @@ Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
             Pageable pageable
     );
 
+    Optional<TaskEntity> findByTaskIdAndTaskStatus(Long id, TaskStatus status);
+
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderLessThanOrderByProcessorOrderDesc(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderDesc(
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
index eb4dda87..c6e69572 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java
@@ -27,6 +27,8 @@ public interface LoadTaskPort {
 
     Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable);
 
+    Optional<Task> findByIdAndStatus(Long id, TaskStatus status);
+
     Optional<Task> findPrevOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);
 
     Optional<Task> findNextOrderTaskByProcessorIdAndStatus(Long processorId, TaskStatus taskStatus, Long processorOrder);

From 33a86924cf5c3899837c0e49135ea09d2c0c6b5d Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:03:00 +0700
Subject: [PATCH 33/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=88=9C=EC=84=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EA=B3=BC,=20=EC=A0=84/=ED=9B=84=EC=9D=98=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EB=A5=BC=20=EB=B9=84=EA=B5=90=20?=
 =?UTF-8?q?=EA=B2=80=EC=A6=9D=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../clap/server/domain/model/task/Task.java   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 0db9ee12..398fd510 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -117,25 +117,4 @@ else if (prevTaskOrder != null && nextTaskOrder != null) {
         this.processorOrder = newProcessorOrder;
     }
 
-
-
-    public static void checkTaskStatusIsSame(Task targetTask, Task prevTask, Task nextTask) {
-        if (targetTask.getTaskStatus() == null) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-        if (targetTask.getTaskStatus() != prevTask.getTaskStatus() ||
-                targetTask.getTaskStatus() != nextTask.getTaskStatus()) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-    }
-
-    public static void validateTaskStatusTransition(Task prevTask, Task nextTask, TaskStatus targetStatus) {
-        if (prevTask != null && prevTask.getTaskStatus() != targetStatus) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-        if (nextTask != null && nextTask.getTaskStatus() != targetStatus) {
-            throw new DomainException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
-        }
-    }
-
 }

From cf3d27bf9824aff1c2c7c4f43569ced2eb089423 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:03:23 +0700
Subject: [PATCH 34/40] =?UTF-8?q?CLAP-155=20Docs:=20=EC=A3=BC=EC=84=9D=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../Task/UpdateTaskBoardService.java          | 116 ++++++++++++++----
 1 file changed, 90 insertions(+), 26 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
index 5f6129a6..958fdaf2 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
@@ -25,9 +25,20 @@ class UpdateTaskBoardService implements UpdateTaskBoardUsecase {
     private final LoadTaskPort loadTaskPort;
     private final CommandTaskPort commandTaskPort;
 
+    private Task findByIdAndStatus(Long taskId, TaskStatus status) {
+        return loadTaskPort.findByIdAndStatus(taskId, status).orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
+    }
+
+    /**
+     * 작업(Task)의 순서를 업데이트하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param request 순서 변경 요청 객체
+     */
     @Override
     @Transactional
     public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
+        // 요청 유효성 검증
         validateRequest(request, null);
         Member processor = memberService.findActiveMember(processorId);
         Task targetTask = taskService.findById(request.targetTaskId());
@@ -40,86 +51,139 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {
         else if (request.nextTaskId() == 0) {
             moveToBottom(processorId, targetTask, request.prevTaskId());
         } else {
-            Task prevTask = taskService.findById(request.prevTaskId());
-            Task nextTask = taskService.findById(request.nextTaskId());
-            // 같은 상태에서의 순서 변경인지 검증
-            Task.checkTaskStatusIsSame(targetTask, prevTask, nextTask);
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
+
+            // 새로운 작업 순서 업데이트
             updateNewTaskOrder(processor.getMemberId(), targetTask, prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
         }
     }
 
+    /**
+     * 순서 변경 요청의 유효성을 검증하는 메서드
+     */
     private static void validateRequest(UpdateTaskOrderRequest request, TaskStatus targetStatus) {
-        if(request.prevTaskId()==0 && request.nextTaskId()==0){
+        // 이전 및 다음 작업 ID가 모두 0인 경우 예외 발생
+        if (request.prevTaskId() == 0 && request.nextTaskId() == 0) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
-        if(targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)){
+
+        // 타겟 상태가 유효한지 검증
+        if (targetStatus != null && !TaskStatus.getTaskBoardStatusList().contains(targetStatus)) {
             throw new ApplicationException(TaskErrorCode.INVALID_TASK_STATUS_TRANSITION);
         }
     }
 
+    /**
+     * 새로운 processorOrder를 계산하고 저장하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param prevTaskOrder 이전 작업의 processorOrder 값
+     * @param nextTaskOrder 다음 작업의 processorOrder 값
+     */
     private void updateNewTaskOrder(Long processorId, Task targetTask, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
         commandTaskPort.save(targetTask);
     }
 
+    /**
+     * 작업을 가장 상위로 이동시키는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param nextTaskId 다음 작업의 ID
+     */
     private void moveToTop(Long processorId, Task targetTask, Long nextTaskId) {
-        Task nextTask = taskService.findById(nextTaskId);
+        // 다음 작업 찾기
+        Task nextTask = findByIdAndStatus(nextTaskId, targetTask.getTaskStatus());
+
+        // 해당 상태에서 바로 앞에 있는 작업 찾기
         Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
-        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+
+        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+
         updateNewTaskOrder(processorId, targetTask, prevTaskOrder, nextTask.getProcessorOrder());
     }
 
+    /**
+     * 작업을 가장 하위로 이동시키는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param targetTask 순서를 변경할 대상 작업
+     * @param prevTaskId 이전 작업의 ID
+     */
     private void moveToBottom(Long processorId, Task targetTask, Long prevTaskId) {
-        Task prevTask = taskService.findById(prevTaskId);
+        // 이전 작업 찾기
+        Task prevTask = findByIdAndStatus(prevTaskId, targetTask.getTaskStatus());
+
+        // 해당 상태에서 바로 뒤에 있는 작업 찾기
         Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
-        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
-        log.info("바닥 전환 진입 {}: ", nextTaskOrder);
+
+        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
+
         updateNewTaskOrder(processorId, targetTask, prevTask.getProcessorOrder(), nextTaskOrder);
     }
 
-
+    /**
+     * 작업의 상태와 순서를 동시에 변경하는 메서드
+     *
+     * @param processorId 작업을 수행하는 멤버 ID
+     * @param request 순서 변경 요청 객체
+     * @param targetStatus 변경할 작업 상태
+     */
     @Override
     @Transactional
     public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest request, TaskStatus targetStatus) {
-        log.info("상태 전환 진입 {}: ", targetStatus);
         validateRequest(request, targetStatus);
+
         Member processor = memberService.findActiveMember(processorId);
+
         Task targetTask = taskService.findById(request.targetTaskId());
 
-        // 가장 상위로 이동
         if (request.prevTaskId() == 0) {
             moveToTopWithStatusChange(processorId, targetTask, request.nextTaskId(), targetStatus);
-        }
-        // 가장 하위로 이동
-        else if (request.nextTaskId() == 0) {
+        } else if (request.nextTaskId() == 0) {
             moveToBottomWithStatusChange(processorId, targetTask, request.prevTaskId(), targetStatus);
         } else {
-            Task prevTask = taskService.findById(request.prevTaskId());
-            Task nextTask = taskService.findById(request.nextTaskId());
-            // 다른 상태로의 상태 전환인지 검증
-            Task.validateTaskStatusTransition(prevTask, nextTask, targetStatus);
+            Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
+            Task nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
+
             updateNewTaskOrderAndStatus(targetStatus, targetTask, processor.getMemberId(), prevTask.getProcessorOrder(), nextTask.getProcessorOrder());
         }
     }
 
+    /**
+     * 작업의 상태와 순서를 업데이트하는 메서드
+     */
     private void updateNewTaskOrderAndStatus(TaskStatus targetStatus, Task targetTask, Long processorId, Long prevTaskOrder, Long nextTaskOrder) {
         targetTask.updateProcessorOrder(processorId, prevTaskOrder, nextTaskOrder);
         targetTask.updateTaskStatus(targetStatus);
         commandTaskPort.save(targetTask);
     }
 
+    /**
+     * 상태 변경을 포함하여 작업을 가장 상위로 이동하는 메서드
+     */
     private void moveToTopWithStatusChange(Long processorId, Task targetTask, Long nextTaskId, TaskStatus targetStatus) {
-        Task nextTask = taskService.findById(nextTaskId);
+        Task nextTask = findByIdAndStatus(nextTaskId, targetStatus);
         Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
-        Long prevTaskOrder = prevTask==null? null: prevTask.getTaskId();
+
+        Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
+
         updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTaskOrder, nextTask.getProcessorOrder());
     }
 
+    /**
+     * 상태 변경을 포함하여 작업을 가장 하위로 이동하는 메서드
+     */
     private void moveToBottomWithStatusChange(Long processorId, Task targetTask, Long prevTaskId, TaskStatus targetStatus) {
-        Task prevTask = taskService.findById(prevTaskId);
+        Task prevTask = findByIdAndStatus(prevTaskId, targetStatus);
         Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
-        Long nextTaskOrder = nextTask==null? null: nextTask.getProcessorOrder();
+
+        Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
+
         updateNewTaskOrderAndStatus(targetStatus, targetTask, processorId, prevTask.getProcessorOrder(), nextTaskOrder);
     }
-
 }
+

From 9579dfdd692ae106c38f507dc0e75fb2cf044239 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:26:59 +0700
Subject: [PATCH 35/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=8A=B9=EC=9D=B8?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9D=B4=20=EC=9E=88=EB=8A=94=20member?=
 =?UTF-8?q?=EC=9D=84=20=EB=B0=94=EB=A1=9C=20=EC=B0=BE=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../outbound/persistense/MemberPersistenceAdapter.java      | 6 ++++++
 .../persistense/repository/member/MemberRepository.java     | 2 ++
 .../application/port/inbound/domain/MemberService.java      | 6 ++++++
 .../application/port/outbound/member/LoadMemberPort.java    | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index 18a1f9a0..f07be47c 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -48,6 +48,12 @@ public List<Member> findReviewers() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public Optional<Member> findReviewerById(Long id) {
+        Optional<MemberEntity> memberEntity =  memberRepository.findByMemberIdAndIsReviewerTrue(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public void save(final Member member) {
         MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index 0bbec88e..e1bd0b45 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -21,5 +21,7 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
     Optional<MemberEntity> findByNickname(String nickname);
 
     List<MemberEntity> findByIsReviewerTrue();
+
+    Optional<MemberEntity> findByMemberIdAndIsReviewerTrue(Long memberId);
 }
 
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index ac2fb651..99e23229 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -24,6 +24,12 @@ public Member findActiveMember(Long memberId) {
                 () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
     }
 
+    public Member findReviewer(Long memberId) {
+        return loadMemberPort.findReviewerById(memberId).orElseThrow(
+                ()-> new ApplicationException(MemberErrorCode.NOT_A_REVIEWER)
+        );
+    }
+
     public List<Member> findReviewers() {
         return loadMemberPort.findReviewers();
     }
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index ab81c42d..70c04c75 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -14,4 +14,6 @@ public interface LoadMemberPort {
 
     List<Member> findReviewers();
 
+    Optional<Member> findReviewerById(Long id);
+
 }

From 43ad094149acb3bda49d4a17db322e0caaf75ba4 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:31:31 +0700
Subject: [PATCH 36/40] git rebase

---
 src/main/java/clap/server/domain/model/member/Member.java | 1 -
 src/main/java/clap/server/domain/model/task/Task.java     | 8 ++++++--
 .../java/clap/server/exception/code/TaskErrorCode.java    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
index f55b3fcc..c1e2f682 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -1,6 +1,5 @@
 package clap.server.domain.model.member;
 
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.domain.model.common.BaseTime;
 import lombok.*;
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 398fd510..4d4694de 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
 import clap.server.exception.DomainException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.AccessLevel;
@@ -45,8 +46,11 @@ public static Task createTask(Member member, Category category, String title, St
                 .build();
     }
 
-    public void updateTask(TaskStatus status, Category category, String title, String description) {
-        if (status != TaskStatus.REQUESTED) {
+    public void updateTask(Long requesterId, Category category, String title, String description) {
+        if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
+            throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
+        }
+        if (this.taskStatus != TaskStatus.REQUESTED) {
             throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
         }
         this.category = category;
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index f93fefa2..8c8a2cf7 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -12,9 +12,11 @@ public enum TaskErrorCode implements BaseErrorCode {
     TASK_STATUS_MISMATCH(HttpStatus.BAD_REQUEST, "TASK_003", "작업 상태가 일치하지 않습니다."),
     TASK_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_004", "첨부파일을 찾을 수 없습니다."),
     LABEL_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_005", "작업구분을 찾을 수 없습니다."),
-    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 수정 권한이 없습니다."),
+    NOT_A_PROCESSOR(HttpStatus.FORBIDDEN, "TASK_006", "작업 처리 및 수정 권한이 없습니다."),
     INVALID_TASK_ORDER(HttpStatus.INTERNAL_SERVER_ERROR, "TASK_007", "유효하지 않은 task order입니다."),
     INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
+    NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
+    NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_009", "작업 수정 권한이 없습니다."),
     ;
 
     private final HttpStatus httpStatus;

From 555075d10e5e72e5cf74aa964c88b9ba43e8043a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:46:28 +0700
Subject: [PATCH 37/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9A=94=EC=B2=AD=20=EC=83=81=ED=83=9C=EC=9D=B8?=
 =?UTF-8?q?=EC=A7=80=20=EA=B2=80=EC=A6=9D=ED=95=98=EB=8A=94=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../server/application/Task/ApprovalTaskService.java   |  9 ++-------
 src/main/java/clap/server/domain/model/task/Task.java  | 10 +++++++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/ApprovalTaskService.java b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
index 58b115c5..979ee2eb 100644
--- a/src/main/java/clap/server/application/Task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/Task/ApprovalTaskService.java
@@ -36,10 +36,7 @@ public class ApprovalTaskService implements ApprovalTaskUsecase {
     @Override
     @Transactional
     public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId, ApprovalTaskRequest approvalTaskRequest) {
-        Member reviewer = memberService.findActiveMember(reviewerId);
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+        Member reviewer = memberService.findReviewer(reviewerId);
         Task task = taskService.findById(taskId);
         Member processor = memberService.findById(approvalTaskRequest.processorId());
         Category category = categoryService.findById(approvalTaskRequest.categoryId());
@@ -54,9 +51,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId,
     public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
         memberService.findActiveMember(managerId);
         Task task = taskService.findById(taskId);
-        if (task.getTaskStatus() != TaskStatus.REQUESTED) {
-            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
+        task.validateTaskRequested();
         return TaskMapper.toFindApprovalFormResponse(task);
     }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java
index 4d4694de..efdfeba5 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -50,15 +50,19 @@ public void updateTask(Long requesterId, Category category, String title, String
         if(!Objects.equals(requesterId, this.requester.getMemberId() )) {
             throw new ApplicationException(TaskErrorCode.NOT_A_REQUESTER);
         }
-        if (this.taskStatus != TaskStatus.REQUESTED) {
-            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
+        validateTaskRequested();
         this.category = category;
         this.title = title;
         this.description = description;
         this.taskCode = toTaskCode(category);
     }
 
+    public void validateTaskRequested() {
+        if (this.taskStatus != TaskStatus.REQUESTED) {
+            throw new DomainException(TaskErrorCode.TASK_STATUS_MISMATCH);
+        }
+    }
+
     public void setInitialProcessorOrder() {
         if (this.processor == null) {
             this.processorOrder = this.taskId * DEFAULT_PROCESSOR_ORDER_GAP;

From 68f04b6bd32c932b0a061b29845d190f2694d1b3 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 15:47:36 +0700
Subject: [PATCH 38/40] =?UTF-8?q?CLAP-155=20Refactor:=20=EC=8A=B9=EC=9D=B8?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../port/inbound/label/FindLabelListUsecase.java         | 4 ++--
 .../application/service/label/FindLabelListService.java  | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
index fbfe94cb..e475b489 100644
--- a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java
@@ -8,6 +8,6 @@
 
 public interface FindLabelListUsecase {
 
-    SliceResponse<FindLabelListResponse> findLabelList(Long userId, Pageable pageable);
-    List<FindLabelListResponse> findLabelListAdmin(Long userId);
+    SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable);
+    List<FindLabelListResponse> findLabelListAdmin(Long memberId);
 }
diff --git a/src/main/java/clap/server/application/service/label/FindLabelListService.java b/src/main/java/clap/server/application/service/label/FindLabelListService.java
index 77f3bd26..57d23a49 100644
--- a/src/main/java/clap/server/application/service/label/FindLabelListService.java
+++ b/src/main/java/clap/server/application/service/label/FindLabelListService.java
@@ -25,13 +25,8 @@ public class FindLabelListService implements FindLabelListUsecase {
     private final MemberService memberService;
 
     @Override
-    public SliceResponse<FindLabelListResponse> findLabelList(Long userId, Pageable pageable) {
-        Member member = memberService.findActiveMember(userId);
-
-        // 담당자인데 검토자가 아닌 경우 Error 처리
-        if (!member.getMemberInfo().isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+    public SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable) {
+        Member member = memberService.findReviewer(memberId);
         return loadLabelPort.findLabelListBySlice(pageable);
     }
 

From 6499e855d283b0f26044ade3d571b835775775e1 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 21:15:06 +0700
Subject: [PATCH 39/40] merge conflict solve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../application/Task/UpdateTaskService.java   | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/Task/UpdateTaskService.java
index 4cb8a153..365f699b 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/Task/UpdateTaskService.java
@@ -1,15 +1,14 @@
 package clap.server.application.Task;
 
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest;
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse;
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.UpdateTaskProcessorRequest;
+import clap.server.adapter.inbound.web.dto.task.*;
 import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
 import clap.server.application.mapper.AttachmentMapper;
 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.UpdateTaskLabelUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskStatusUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskUsecase;
@@ -21,11 +20,10 @@
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Category;
 import clap.server.common.constants.FilePathConstants;
+import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
 
 import clap.server.exception.ApplicationException;
-import clap.server.exception.code.LabelErrorCode;
-import clap.server.exception.code.MemberErrorCode;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,19 +31,19 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Objects;
 
 
 @ApplicationService
 @RequiredArgsConstructor
 @Slf4j
-public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUsecase, UpdateTaskProcessorUsecase {
+public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUsecase, UpdateTaskProcessorUsecase, UpdateTaskLabelUsecase {
 
     private final MemberService memberService;
     private final CategoryService categoryService;
     private final TaskService taskService;
     private final CommandTaskPort commandTaskPort;
     private final LoadAttachmentPort loadAttachmentPort;
+    private final LabelService labelService;
     private final CommandAttachmentPort commandAttachmentPort;
     private final S3UploadAdapter s3UploadAdapter;
 
@@ -56,14 +54,10 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         Category category = categoryService.findById(updateTaskRequest.categoryId());
         Task task = taskService.findById(taskId);
 
-        if(!Objects.equals(requester.getMemberId(), task.getRequester().getMemberId())) {
-            throw new ApplicationException(TaskErrorCode.TASK_STATUS_MISMATCH);
-        }
-
-        task.updateTask(task.getTaskStatus(), category, updateTaskRequest.title(), updateTaskRequest.description());
+        task.updateTask(requesterId, category, updateTaskRequest.title(), updateTaskRequest.description());
         Task updatedTask = commandTaskPort.save(task);
 
-        if (!updateTaskRequest.attachmentsToDelete().isEmpty()){
+        if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
             updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
         }
         return TaskMapper.toUpdateTaskResponse(updatedTask);
@@ -84,11 +78,9 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
+        Member reviewer = memberService.findReviewer(userId);
         Member processor = memberService.findById(request.processorId());
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+
         Task task = taskService.findById(taskId);
         task.updateProcessor(processor);
         Task updateTask = commandTaskPort.save(task);
@@ -100,12 +92,9 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
     @Transactional
     @Override
     public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request) {
-        Member reviewer = memberService.findActiveMember(userId);
-        if (!reviewer.isReviewer()) {
-            throw new ApplicationException(MemberErrorCode.NOT_A_REVIEWER);
-        }
+        Member reviewer = memberService.findReviewer(userId);
         Task task = taskService.findById(taskId);
-        Label label = loadLabelPort.findById(request.labelId()).orElseThrow(() -> new ApplicationException(LabelErrorCode.LABEL_NOT_FOUND));
+        Label label = labelService.findById(request.labelId());
 
         task.updateLabel(label);
         Task updatetask = commandTaskPort.save(task);
@@ -116,14 +105,14 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
         List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task);
         attachmentsToDelete.forEach(Attachment::softDelete);
 
-        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePath.TASK_IMAGE, files);
+        List<String> fileUrls = s3UploadAdapter.uploadFiles(FilePathConstants.TASK_IMAGE, files);
         List<Attachment> attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls);
         commandAttachmentPort.saveAll(attachments);
     }
 
     private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task) {
         List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
-        if(attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
+        if (attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
             throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
         }
         return attachmentsOfTask;

From fe9eb4d8ef4d0f56ee32bbb0d639d2e356dc3e50 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Wed, 29 Jan 2025 21:19:20 +0700
Subject: [PATCH 40/40] merge conflict solve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #133
---
 .../{Task => service/task}/ApprovalTaskService.java         | 6 +-----
 .../{Task => service/task}/CreateTaskService.java           | 2 +-
 .../{Task => service/task}/FindTaskDetailsService.java      | 5 +++--
 .../{Task => service/task}/FindTaskListService.java         | 2 +-
 .../{Task => service/task}/TaskBoardService.java            | 2 +-
 .../{Task => service/task}/UpdateTaskBoardService.java      | 2 +-
 .../{Task => service/task}/UpdateTaskService.java           | 2 +-
 .../application/service/task/FindTaskListServiceTest.java   | 1 -
 8 files changed, 9 insertions(+), 13 deletions(-)
 rename src/main/java/clap/server/application/{Task => service/task}/ApprovalTaskService.java (89%)
 rename src/main/java/clap/server/application/{Task => service/task}/CreateTaskService.java (99%)
 rename src/main/java/clap/server/application/{Task => service/task}/FindTaskDetailsService.java (92%)
 rename src/main/java/clap/server/application/{Task => service/task}/FindTaskListService.java (97%)
 rename src/main/java/clap/server/application/{Task => service/task}/TaskBoardService.java (97%)
 rename src/main/java/clap/server/application/{Task => service/task}/UpdateTaskBoardService.java (99%)
 rename src/main/java/clap/server/application/{Task => service/task}/UpdateTaskService.java (99%)

diff --git a/src/main/java/clap/server/application/Task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
similarity index 89%
rename from src/main/java/clap/server/application/Task/ApprovalTaskService.java
rename to src/main/java/clap/server/application/service/task/ApprovalTaskService.java
index 979ee2eb..2c4d88b4 100644
--- a/src/main/java/clap/server/application/Task/ApprovalTaskService.java
+++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java
@@ -1,9 +1,8 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 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.TaskStatus;
 import clap.server.application.mapper.TaskMapper;
 import clap.server.application.port.inbound.domain.CategoryService;
 import clap.server.application.port.inbound.domain.LabelService;
@@ -16,9 +15,6 @@
 import clap.server.domain.model.task.Category;
 import clap.server.domain.model.task.Label;
 import clap.server.domain.model.task.Task;
-import clap.server.exception.ApplicationException;
-import clap.server.exception.code.MemberErrorCode;
-import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/service/task/CreateTaskService.java
similarity index 99%
rename from src/main/java/clap/server/application/Task/CreateTaskService.java
rename to src/main/java/clap/server/application/service/task/CreateTaskService.java
index 1e19c7ed..60e4ec18 100644
--- a/src/main/java/clap/server/application/Task/CreateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.notification.SseRequest;
 import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest;
diff --git a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java b/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java
similarity index 92%
rename from src/main/java/clap/server/application/Task/FindTaskDetailsService.java
rename to src/main/java/clap/server/application/service/task/FindTaskDetailsService.java
index 32194b72..174f9b1a 100644
--- a/src/main/java/clap/server/application/Task/FindTaskDetailsService.java
+++ b/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse;
 import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse;
@@ -13,6 +13,7 @@
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -20,7 +21,7 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
+@Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
 public class FindTaskDetailsService implements FindTaskDetailsUsecase {
     private final MemberService memberService;
     private final LoadTaskPort loadTaskPort;
diff --git a/src/main/java/clap/server/application/Task/FindTaskListService.java b/src/main/java/clap/server/application/service/task/FindTaskListService.java
similarity index 97%
rename from src/main/java/clap/server/application/Task/FindTaskListService.java
rename to src/main/java/clap/server/application/service/task/FindTaskListService.java
index 78420693..ae718941 100644
--- a/src/main/java/clap/server/application/Task/FindTaskListService.java
+++ b/src/main/java/clap/server/application/service/task/FindTaskListService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
diff --git a/src/main/java/clap/server/application/Task/TaskBoardService.java b/src/main/java/clap/server/application/service/task/TaskBoardService.java
similarity index 97%
rename from src/main/java/clap/server/application/Task/TaskBoardService.java
rename to src/main/java/clap/server/application/service/task/TaskBoardService.java
index 57246e25..e2332833 100644
--- a/src/main/java/clap/server/application/Task/TaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/TaskBoardService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
similarity index 99%
rename from src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
rename to src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
index 958fdaf2..25a45a6e 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
diff --git a/src/main/java/clap/server/application/Task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
similarity index 99%
rename from src/main/java/clap/server/application/Task/UpdateTaskService.java
rename to src/main/java/clap/server/application/service/task/UpdateTaskService.java
index 1301e9ce..b25e355f 100644
--- a/src/main/java/clap/server/application/Task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -1,4 +1,4 @@
-package clap.server.application.Task;
+package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.*;
 import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter;
diff --git a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
index fe4adb02..90142205 100644
--- a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
+++ b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java
@@ -3,7 +3,6 @@
 import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.OrderTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
-import clap.server.application.Task.FindTaskListService;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import org.junit.jupiter.api.BeforeEach;