From 5155ff7148b707f6e756df878c5fd7a712ec006f Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 17:21:03 +0900
Subject: [PATCH 01/56] =?UTF-8?q?CLAP-110=20Feature=20:=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EB=B3=84=20=EC=9E=91=EC=97=85=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EB=9F=89=20=EC=A1=B0=ED=9A=8C=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>
- 관련: #73
---
 .../elastic/TaskDocumentAdapter.java          | 24 +++++++++++++++++++
 .../statistics/ManagerTaskProcessUsecase.java |  7 ++++++
 .../statistics/ManagerTaskProcessService.java | 19 +++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
 create mode 100644 src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
index 85caa97e..9421afbe 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
@@ -69,6 +69,14 @@ public Map<String, Long> findManagerTaskProcessByPeriod(String period) {
         return getNonPeriodTaskResults(executeQuery(query), "manager_task");
     }
 
+    @Override
+    public Map<String, Long> findManagerTaskProcessByPeriod(String period) {
+        PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
+
+        NativeQuery query = buildManagerTaskProcessQuery(periodConfig);
+        return getManagerTaskResults(executeQuery(query));
+    }
+
     private NativeQuery buildPeriodTaskRequestQuery(PeriodConfig config) {
         return NativeQuery.builder()
                 .withQuery(q -> q
@@ -203,4 +211,20 @@ private Map<String, Long> getNonPeriodTaskResults(ElasticsearchAggregations aggr
                         ))
         );
     }
+
+    private Map<String, Long> getManagerTaskResults(ElasticsearchAggregations aggregations) {
+        return new TreeMap<>(
+                aggregations.get("manager_task")
+                        .aggregation()
+                        .getAggregate()
+                        .sterms()
+                        .buckets()
+                        .array()
+                        .stream()
+                        .collect(Collectors.toMap(
+                                bucket -> bucket.key().stringValue(),
+                                MultiBucketBase::docCount
+                        ))
+        );
+    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java b/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
new file mode 100644
index 00000000..68026e7a
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.statistics;
+
+import java.util.Map;
+
+public interface ManagerTaskProcessUsecase {
+    Map<String, Long> aggregateManagerTaskProcess(String period);
+}
diff --git a/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java b/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
new file mode 100644
index 00000000..c06141c0
--- /dev/null
+++ b/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
@@ -0,0 +1,19 @@
+package clap.server.application.statistics;
+
+import clap.server.application.port.inbound.statistics.ManagerTaskProcessUsecase;
+import clap.server.application.port.outbound.task.TaskDocumentPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class ManagerTaskProcessService implements ManagerTaskProcessUsecase {
+    private final TaskDocumentPort taskDocumentPort;
+
+    @Override
+    public Map<String, Long> aggregateManagerTaskProcess(String period) {
+        return taskDocumentPort.findManagerTaskProcessByPeriod(period);
+    }
+}

From b7f2c2a2c42ae4f8afa9c908c8f8f38f129b8ee7 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 02:18:35 +0900
Subject: [PATCH 02/56] =?UTF-8?q?CLAP-111=20Refactor=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=A1=B0=ED=9A=8C=20API=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81=20=EB=B0=8F=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #74
---
 .../elastic/TaskDocumentAdapter.java          | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
index 9421afbe..85caa97e 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java
@@ -69,14 +69,6 @@ public Map<String, Long> findManagerTaskProcessByPeriod(String period) {
         return getNonPeriodTaskResults(executeQuery(query), "manager_task");
     }
 
-    @Override
-    public Map<String, Long> findManagerTaskProcessByPeriod(String period) {
-        PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
-
-        NativeQuery query = buildManagerTaskProcessQuery(periodConfig);
-        return getManagerTaskResults(executeQuery(query));
-    }
-
     private NativeQuery buildPeriodTaskRequestQuery(PeriodConfig config) {
         return NativeQuery.builder()
                 .withQuery(q -> q
@@ -211,20 +203,4 @@ private Map<String, Long> getNonPeriodTaskResults(ElasticsearchAggregations aggr
                         ))
         );
     }
-
-    private Map<String, Long> getManagerTaskResults(ElasticsearchAggregations aggregations) {
-        return new TreeMap<>(
-                aggregations.get("manager_task")
-                        .aggregation()
-                        .getAggregate()
-                        .sterms()
-                        .buckets()
-                        .array()
-                        .stream()
-                        .collect(Collectors.toMap(
-                                bucket -> bucket.key().stringValue(),
-                                MultiBucketBase::docCount
-                        ))
-        );
-    }
 }

From 87d0fdb8396ed715d1b0d35fbe5e8edec8c00f12 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Fri, 24 Jan 2025 03:55:27 +0900
Subject: [PATCH 03/56] =?UTF-8?q?=EB=82=B4=20=EC=9E=91=EC=97=85=ED=95=9C?=
 =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=84=A4?=
 =?UTF-8?q?=EB=AA=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/data.sql       | 30 ++++++++++++++++++++++++++++++
 src/main/resources/env.properties | 31 +++++++++++++++++++++++++++++++
 src/main/resources/mysql.yml      |  2 +-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/data.sql
 create mode 100644 src/main/resources/env.properties

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
new file mode 100644
index 00000000..a1bfb236
--- /dev/null
+++ b/src/main/resources/data.sql
@@ -0,0 +1,30 @@
+-- 부서 추가
+INSERT INTO department (id, code, name, status) VALUES (1, 'DEPT001', 'IT Department', 'ACTIVE');
+
+-- 관리자 추가
+INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
+VALUES (1, 'Admin User', 'admin@example.com', 'Admin1', FALSE, 'ROLE_ADMIN', 'Admin', 'ACTIVE', 'admin123', 'http://example.com/admin.jpg', TRUE, 1);
+
+-- 카테고리 추가
+INSERT INTO category (id, code, name, description_example, is_deleted, admin_id)
+VALUES (1, 'CATEGORY001', 'Development', 'Development tasks category', FALSE, 1);
+
+-- 라벨 추가
+INSERT INTO label (id, label_type, admin_id, is_deleted)
+VALUES (1, 'EMERGENCY', 1, FALSE);
+
+-- 첫 번째 관리자 추가
+INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
+VALUES (2, 'Manager1', 'manager1@example.com', 'Manager1', TRUE, 'ROLE_MANAGER', 'Manager', 'ACTIVE', 'manager123', 'http://example.com/manager1.jpg', TRUE, 1);
+
+-- 두 번째 관리자 추가
+INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
+VALUES (3, 'Manager2', 'manager2@example.com', 'Manager2', TRUE, 'ROLE_MANAGER', 'Manager', 'ACTIVE', 'manager123', 'http://example.com/manager2.jpg', TRUE, 1);
+
+-- 일반 사용자 추가
+INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
+VALUES (4, 'User1', 'user1@example.com', 'User1', FALSE, 'ROLE_USER', 'User', 'ACTIVE', 'user123', 'http://example.com/user1.jpg', TRUE, 1);
+
+-- 태스크 추가
+INSERT INTO task (id, task_code, title, description, category_id, requester_id, task_status, processor_order, reviewer_id, processor_id, label_id, due_date, completed_at)
+VALUES (1, 'TASK001', 'Task Title', 'Task Description', 1, 1, 'PENDING_COMPLETED', 1, 1, 2, 1, '2025-01-31 23:59:59', NULL);
diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
new file mode 100644
index 00000000..c3456735
--- /dev/null
+++ b/src/main/resources/env.properties
@@ -0,0 +1,31 @@
+# application.properties
+
+spring.config.import=classpath:env.properties
+
+# MySQL Configuration
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${DB_USERNAME}
+spring.datasource.password=${DB_PASSWORD}
+
+# Application Profile
+APPLICATION_PORT=8080
+
+# Redis Configuration
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=
+
+# Swagger Configuration
+SWAGGER_SERVER_URL=http://localhost:8080
+
+# MySQL Configuration
+MYSQL_HOST=localhost
+MYSQL_PORT=3306
+MYSQL_USERNAME=root
+MYSQL_PASSWORD=km7971na
+MYSQL_DATABASE=taskflow2
+
+# Additional Environment-specific Configurations
+DB_URL=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}
+DB_USERNAME=${MYSQL_USERNAME}
+DB_PASSWORD=${MYSQL_PASSWORD}
diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml
index 3e095af1..ca49c97d 100644
--- a/src/main/resources/mysql.yml
+++ b/src/main/resources/mysql.yml
@@ -10,7 +10,7 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
+    url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow2}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
     username: ${DATABASE_USERNAME}
     password: ${DATABASE_PASSWORD}
     data-source-properties:

From 534aa24aa01cdbb870f75cc2e8166c2f48f952c0 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Fri, 24 Jan 2025 11:40:50 +0900
Subject: [PATCH 04/56] =?UTF-8?q?=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/data.sql | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/main/resources/data.sql

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
deleted file mode 100644
index a1bfb236..00000000
--- a/src/main/resources/data.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- 부서 추가
-INSERT INTO department (id, code, name, status) VALUES (1, 'DEPT001', 'IT Department', 'ACTIVE');
-
--- 관리자 추가
-INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
-VALUES (1, 'Admin User', 'admin@example.com', 'Admin1', FALSE, 'ROLE_ADMIN', 'Admin', 'ACTIVE', 'admin123', 'http://example.com/admin.jpg', TRUE, 1);
-
--- 카테고리 추가
-INSERT INTO category (id, code, name, description_example, is_deleted, admin_id)
-VALUES (1, 'CATEGORY001', 'Development', 'Development tasks category', FALSE, 1);
-
--- 라벨 추가
-INSERT INTO label (id, label_type, admin_id, is_deleted)
-VALUES (1, 'EMERGENCY', 1, FALSE);
-
--- 첫 번째 관리자 추가
-INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
-VALUES (2, 'Manager1', 'manager1@example.com', 'Manager1', TRUE, 'ROLE_MANAGER', 'Manager', 'ACTIVE', 'manager123', 'http://example.com/manager1.jpg', TRUE, 1);
-
--- 두 번째 관리자 추가
-INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
-VALUES (3, 'Manager2', 'manager2@example.com', 'Manager2', TRUE, 'ROLE_MANAGER', 'Manager', 'ACTIVE', 'manager123', 'http://example.com/manager2.jpg', TRUE, 1);
-
--- 일반 사용자 추가
-INSERT INTO member (id, name, email, nickname, is_reviewer, role, department_role, status, password, image_url, notification_enabled, department_id)
-VALUES (4, 'User1', 'user1@example.com', 'User1', FALSE, 'ROLE_USER', 'User', 'ACTIVE', 'user123', 'http://example.com/user1.jpg', TRUE, 1);
-
--- 태스크 추가
-INSERT INTO task (id, task_code, title, description, category_id, requester_id, task_status, processor_order, reviewer_id, processor_id, label_id, due_date, completed_at)
-VALUES (1, 'TASK001', 'Task Title', 'Task Description', 1, 1, 'PENDING_COMPLETED', 1, 1, 2, 1, '2025-01-31 23:59:59', NULL);

From 2b7f4481f6ed0876e7ef0f50c94eb633b5c71af9 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 16:03:51 +0900
Subject: [PATCH 05/56] =?UTF-8?q?CLAP-111=20Refactor=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=A1=B0=ED=9A=8C=20API=20=EC=A3=BC=EC=86=8C=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=A9,=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81,=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #74
---
 .../statistics/ManagerTaskProcessUsecase.java |  7 -------
 .../statistics/ManagerTaskProcessService.java | 19 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
 delete mode 100644 src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java

diff --git a/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java b/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
deleted file mode 100644
index 68026e7a..00000000
--- a/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package clap.server.application.port.inbound.statistics;
-
-import java.util.Map;
-
-public interface ManagerTaskProcessUsecase {
-    Map<String, Long> aggregateManagerTaskProcess(String period);
-}
diff --git a/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java b/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
deleted file mode 100644
index c06141c0..00000000
--- a/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package clap.server.application.statistics;
-
-import clap.server.application.port.inbound.statistics.ManagerTaskProcessUsecase;
-import clap.server.application.port.outbound.task.TaskDocumentPort;
-import clap.server.common.annotation.architecture.ApplicationService;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Map;
-
-@ApplicationService
-@RequiredArgsConstructor
-public class ManagerTaskProcessService implements ManagerTaskProcessUsecase {
-    private final TaskDocumentPort taskDocumentPort;
-
-    @Override
-    public Map<String, Long> aggregateManagerTaskProcess(String period) {
-        return taskDocumentPort.findManagerTaskProcessByPeriod(period);
-    }
-}

From 72a66e47734c579bc92561b12422770cdd57237e Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 21:13:31 +0900
Subject: [PATCH 06/56] =?UTF-8?q?Bug=20:=20=ED=94=84=EB=A1=9C=ED=8D=BC?=
 =?UTF-8?q?=ED=8B=B0=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mysql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml
index ca49c97d..3e095af1 100644
--- a/src/main/resources/mysql.yml
+++ b/src/main/resources/mysql.yml
@@ -10,7 +10,7 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow2}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
+    url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/${DATABASE_NAME:taskflow}?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&autoReconnect=true
     username: ${DATABASE_USERNAME}
     password: ${DATABASE_PASSWORD}
     data-source-properties:

From 8458cbd3aab0c5f10bf1caa8219816426d683f9a Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 26 Jan 2025 15:14:23 +0900
Subject: [PATCH 07/56] =?UTF-8?q?CLAP-104=20CI/CD=20:=20CI=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20s3.yml=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=ED=95=98=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

---
 src/main/resources/env.properties | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/main/resources/env.properties

diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
deleted file mode 100644
index c3456735..00000000
--- a/src/main/resources/env.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# application.properties
-
-spring.config.import=classpath:env.properties
-
-# MySQL Configuration
-spring.datasource.url=${DB_URL}
-spring.datasource.username=${DB_USERNAME}
-spring.datasource.password=${DB_PASSWORD}
-
-# Application Profile
-APPLICATION_PORT=8080
-
-# Redis Configuration
-REDIS_HOST=localhost
-REDIS_PORT=6379
-REDIS_PASSWORD=
-
-# Swagger Configuration
-SWAGGER_SERVER_URL=http://localhost:8080
-
-# MySQL Configuration
-MYSQL_HOST=localhost
-MYSQL_PORT=3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=km7971na
-MYSQL_DATABASE=taskflow2
-
-# Additional Environment-specific Configurations
-DB_URL=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}
-DB_USERNAME=${MYSQL_USERNAME}
-DB_PASSWORD=${MYSQL_PASSWORD}

From eb34ee8fe2bbb7294bbcd341684aa3c24b399439 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 26 Jan 2025 22:00:29 +0900
Subject: [PATCH 08/56] =?UTF-8?q?CLAP-146=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #118
---
 .../web/admin/AddCategoryController.java      |  4 +-
 .../web/admin/FindCategoryController.java     | 45 +++++++++++++++++++
 .../dto/admin/FindAllCategoryResponse.java    |  9 ++++
 .../dto/admin/FindMainCategoryResponse.java   |  8 ++++
 .../dto/admin/FindSubCategoryResponse.java    |  9 ++++
 .../CategoryPersistenceAdapter.java           | 25 +++++++++++
 .../repository/task/CategoryRepository.java   |  6 +++
 .../response/CategoryResponseMapper.java      | 25 +++++++++++
 .../inbound/admin/FindAllCategoryUsecase.java |  7 +++
 .../admin/FindMainCategoryUsecase.java        |  9 ++++
 .../inbound/admin/FindSubCategoryUsecase.java |  9 ++++
 .../port/outbound/task/LoadCategoryPort.java  |  5 +++
 .../service/admin/FindAllCategoryService.java | 35 +++++++++++++++
 .../admin/FindMainCategoryService.java        | 26 +++++++++++
 .../service/admin/FindSubCategoryService.java | 26 +++++++++++
 15 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java
 create mode 100644 src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
 create mode 100644 src/main/java/clap/server/application/service/admin/FindMainCategoryService.java
 create mode 100644 src/main/java/clap/server/application/service/admin/FindSubCategoryService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
index 1384546e..64582755 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -1,8 +1,8 @@
 package clap.server.adapter.inbound.web.admin;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest;
 import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
+import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest;
 import clap.server.application.port.inbound.admin.AddCategoryUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,7 +18,7 @@
 @Tag(name = "카테고리 추가")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/managements")
+@RequestMapping("/api")
 public class AddCategoryController {
     private final AddCategoryUsecase addCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
new file mode 100644
index 00000000..ea1d7725
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -0,0 +1,45 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+import clap.server.application.port.inbound.admin.FindAllCategoryUsecase;
+import clap.server.application.port.inbound.admin.FindMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.FindSubCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Tag(name = "카테고리 조회")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class FindCategoryController {
+    private final FindAllCategoryUsecase findAllCategoryUsecase;
+    private final FindMainCategoryUsecase findmainCategoryUsecase;
+    private final FindSubCategoryUsecase findsubCategoryUsecase;
+
+    @Operation(summary = "모든 카테고리 조회")
+    @GetMapping("/category")
+    public ResponseEntity<FindAllCategoryResponse> findAllCategory() {
+        return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());
+    }
+
+    @Operation(summary = "1차 카테고리 조회")
+    @GetMapping("/main-category")
+    public ResponseEntity<List<FindMainCategoryResponse>> findMainCategory() {
+        return ResponseEntity.ok(findmainCategoryUsecase.findMainCategory());
+    }
+
+    @Operation(summary = "2차 카테고리 조회")
+    @GetMapping("/sub-category")
+    public ResponseEntity<List<FindSubCategoryResponse>> findSubCategory() {
+        return ResponseEntity.ok(findsubCategoryUsecase.findSubCategory());
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
new file mode 100644
index 00000000..74dc547a
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
@@ -0,0 +1,9 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import java.util.List;
+
+public record FindAllCategoryResponse(
+        List<FindMainCategoryResponse> mainCategory,
+        List<FindSubCategoryResponse> subCategory
+) {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java
new file mode 100644
index 00000000..3920fe31
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java
@@ -0,0 +1,8 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+public record FindMainCategoryResponse(
+        Long id,
+        String name,
+        String code
+) {
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java
new file mode 100644
index 00000000..0372dd42
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java
@@ -0,0 +1,9 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+public record FindSubCategoryResponse(
+        Long id,
+        Long mainCategoryId,
+        String name,
+        String code
+) {
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
index 2caa61d4..5fa85209 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
@@ -9,6 +9,7 @@
 import clap.server.domain.model.task.Category;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
 import java.util.Optional;
 
 @PersistenceAdapter
@@ -24,6 +25,30 @@ public Optional<Category> findById(Long id) {
         return categoryEntity.map(categoryPersistenceMapper::toDomain);
     }
 
+    @Override
+    public List<Category> findAll() {
+        return categoryRepository.findByIsDeletedFalse()
+                .stream()
+                .map(categoryPersistenceMapper::toDomain)
+                .toList();
+    }
+
+    @Override
+    public List<Category> findMainCategory() {
+        return categoryRepository.findByIsDeletedFalseAndMainCategoryIsNull()
+                .stream()
+                .map(categoryPersistenceMapper::toDomain)
+                .toList();
+    }
+
+    @Override
+    public List<Category> findSubCategory() {
+        return categoryRepository.findByIsDeletedFalseAndMainCategoryIsNotNull()
+                .stream()
+                .map(categoryPersistenceMapper::toDomain)
+                .toList();
+    }
+
     @Override
     public void save(Category category) {
         categoryRepository.save(categoryPersistenceMapper.toEntity(category));
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
index dce2b14c..017e760e 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
@@ -3,6 +3,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface CategoryRepository extends JpaRepository<CategoryEntity, Long> {
+
+    List<CategoryEntity> findByIsDeletedFalse();
+    List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNull();
+    List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNotNull();
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
new file mode 100644
index 00000000..19b780fd
--- /dev/null
+++ b/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
@@ -0,0 +1,25 @@
+package clap.server.application.mapper.response;
+
+import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+import clap.server.domain.model.task.Category;
+
+import java.util.List;
+
+public class CategoryResponseMapper {
+
+    public static FindAllCategoryResponse toFindAllCategoryResponse(
+            List<FindMainCategoryResponse> mainCategoryResponses,
+            List<FindSubCategoryResponse> subCategoryResponses) {
+        return new FindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+    }
+
+    public static FindMainCategoryResponse toFindMainCategoryResponse(Category category) {
+        return new FindMainCategoryResponse(category.getCategoryId(), category.getName(), category.getCode());
+    }
+
+    public static FindSubCategoryResponse toFindSubCategoryResponse(Category category) {
+        return new FindSubCategoryResponse(category.getCategoryId(), category.getMainCategory().getCategoryId(), category.getName(), category.getCode());
+    }
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
new file mode 100644
index 00000000..e9c3c26d
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
+
+public interface FindAllCategoryUsecase {
+    FindAllCategoryResponse findAllCategory();
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java
new file mode 100644
index 00000000..42c654d6
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+
+import java.util.List;
+
+public interface FindMainCategoryUsecase {
+    List<FindMainCategoryResponse> findMainCategory();
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java
new file mode 100644
index 00000000..4922669b
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+
+import java.util.List;
+
+public interface FindSubCategoryUsecase {
+    List<FindSubCategoryResponse> findSubCategory();
+}
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
index ca0707d7..49cc6eeb 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
@@ -2,8 +2,13 @@
 
 import clap.server.domain.model.task.Category;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface LoadCategoryPort {
     Optional<Category> findById(Long id);
+
+    List<Category> findAll();
+    List<Category> findMainCategory();
+    List<Category> findSubCategory();
 }
diff --git a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
new file mode 100644
index 00000000..6fe93c55
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
@@ -0,0 +1,35 @@
+package clap.server.application.service.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+import clap.server.application.mapper.response.CategoryResponseMapper;
+import clap.server.application.port.inbound.admin.FindAllCategoryUsecase;
+import clap.server.application.port.outbound.task.LoadCategoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class FindAllCategoryService implements FindAllCategoryUsecase {
+    private final LoadCategoryPort loadCategoryPort;
+
+    @Override
+    @Transactional(readOnly = true)
+    public FindAllCategoryResponse findAllCategory() {
+        List<FindMainCategoryResponse> mainCategoryResponses = new ArrayList<>();
+        List<FindSubCategoryResponse> subCategoryResponses = new ArrayList<>();
+        loadCategoryPort.findAll().forEach(category -> {
+            if (category.getMainCategory() == null) {
+                mainCategoryResponses.add(CategoryResponseMapper.toFindMainCategoryResponse(category));
+            } else {
+                subCategoryResponses.add(CategoryResponseMapper.toFindSubCategoryResponse(category));
+            }
+        });
+        return CategoryResponseMapper.toFindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java
new file mode 100644
index 00000000..80947a51
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java
@@ -0,0 +1,26 @@
+package clap.server.application.service.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+import clap.server.application.mapper.response.CategoryResponseMapper;
+import clap.server.application.port.inbound.admin.FindMainCategoryUsecase;
+import clap.server.application.port.outbound.task.LoadCategoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class FindMainCategoryService implements FindMainCategoryUsecase {
+    private final LoadCategoryPort loadCategoryPort;
+
+    @Override
+    @Transactional
+    public List<FindMainCategoryResponse> findMainCategory() {
+        return loadCategoryPort.findMainCategory()
+                .stream()
+                .map(CategoryResponseMapper::toFindMainCategoryResponse)
+                .toList();
+    }
+}
diff --git a/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java
new file mode 100644
index 00000000..71ef4b21
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java
@@ -0,0 +1,26 @@
+package clap.server.application.service.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+import clap.server.application.mapper.response.CategoryResponseMapper;
+import clap.server.application.port.inbound.admin.FindSubCategoryUsecase;
+import clap.server.application.port.outbound.task.LoadCategoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class FindSubCategoryService implements FindSubCategoryUsecase {
+    private final LoadCategoryPort loadCategoryPort;
+
+    @Override
+    @Transactional
+    public List<FindSubCategoryResponse> findSubCategory() {
+        return loadCategoryPort.findSubCategory()
+                .stream()
+                .map(CategoryResponseMapper::toFindSubCategoryResponse)
+                .toList();
+    }
+}

From 8146776899d19d40c459653242fcbb556ff10c93 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 26 Jan 2025 23:26:20 +0900
Subject: [PATCH 09/56] =?UTF-8?q?CLAP-147=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95=20API=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>
- 관련: #119
---
 .../web/admin/UpdateCategoryController.java   | 28 ++++++++++++++++++
 .../web/dto/admin/UpdateCategoryRequest.java  | 16 ++++++++++
 .../inbound/admin/UpdateCategoryUsecase.java  |  5 ++++
 .../service/admin/UpdateCategoryService.java  | 29 +++++++++++++++++++
 .../server/domain/model/task/Category.java    |  6 ++--
 5 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/admin/UpdateCategoryService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
new file mode 100644
index 00000000..0315cadb
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -0,0 +1,28 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.admin.UpdateCategoryRequest;
+import clap.server.application.port.inbound.admin.UpdateCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "카테고리 수정")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class UpdateCategoryController {
+    private final UpdateCategoryUsecase updateCategoryUsecase;
+
+    @Operation(summary = "카테고리 수정")
+    @PatchMapping("/category")
+    @Secured("ROLE_ADMIN")
+    public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, UpdateCategoryRequest updateCategoryRequest) {
+        updateCategoryUsecase.updateCategory(userInfo.getUserId(), updateCategoryRequest.categoryId(), updateCategoryRequest.name(), updateCategoryRequest.code());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
new file mode 100644
index 00000000..2e40d1c8
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
@@ -0,0 +1,16 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import org.hibernate.validator.constraints.Length;
+
+public record UpdateCategoryRequest(
+        @Min(1)
+        Long categoryId,
+        @NotBlank @Length(max = 20)
+        String name,
+        @NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
+        String code
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java
new file mode 100644
index 00000000..a4c7b5f6
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface UpdateCategoryUsecase {
+    void updateCategory(Long adminId, Long categoryId, String name, String code);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
new file mode 100644
index 00000000..3c09e16f
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
@@ -0,0 +1,29 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.inbound.admin.UpdateCategoryUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.outbound.task.LoadCategoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
+import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class UpdateCategoryService implements UpdateCategoryUsecase {
+    private final LoadCategoryPort loadCategoryPort;
+    private final LoadMemberPort loadMemberPort;
+
+    @Override
+    @Transactional
+    public void updateCategory(Long adminId, Long categoryId, String name, String code) {
+        Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        loadCategoryPort.findById(categoryId)
+                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
+                .updateCategory(admin, name, code);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/domain/model/task/Category.java b/src/main/java/clap/server/domain/model/task/Category.java
index bd624b17..fd6018c5 100644
--- a/src/main/java/clap/server/domain/model/task/Category.java
+++ b/src/main/java/clap/server/domain/model/task/Category.java
@@ -40,8 +40,10 @@ public static Category createSubCategory(Member admin, Category mainCategory, St
                 .build();
     }
 
-    public void updateMainCategory(Category mainCategory){
-        this.mainCategory = mainCategory;
+    public void updateCategory(Member admin, String code, String name){
+        this.admin = admin;
+        this.code = code;
+        this.name = name;
     }
 }
 

From d24fdf8e0fe0207867011d3aecab1543554acf01 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 28 Jan 2025 15:15:24 +0900
Subject: [PATCH 10/56] =?UTF-8?q?CLAP-147=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80,=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20API=20=EB=A6=AC=EB=B7=B0=EB=B0=98=EC=98=81=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>
- 관련: #119
---
 .../inbound/web/admin/AddCategoryController.java       |  2 +-
 .../inbound/web/admin/UpdateCategoryController.java    | 10 ++++++----
 .../inbound/web/dto/admin/UpdateCategoryRequest.java   |  3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
index 64582755..da832d07 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -18,7 +18,7 @@
 @Tag(name = "카테고리 추가")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api")
+@RequestMapping("/api/management")
 public class AddCategoryController {
     private final AddCategoryUsecase addCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index 0315cadb..0a690b6f 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -10,19 +10,21 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Tag(name = "카테고리 수정")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api")
+@RequestMapping("/api/management")
 public class UpdateCategoryController {
     private final UpdateCategoryUsecase updateCategoryUsecase;
 
     @Operation(summary = "카테고리 수정")
-    @PatchMapping("/category")
+    @PatchMapping("/categories/categoryId")
     @Secured("ROLE_ADMIN")
-    public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, UpdateCategoryRequest updateCategoryRequest) {
-        updateCategoryUsecase.updateCategory(userInfo.getUserId(), updateCategoryRequest.categoryId(), updateCategoryRequest.name(), updateCategoryRequest.code());
+    public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, Long categoryId,
+                               @RequestBody UpdateCategoryRequest updateCategoryRequest) {
+        updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
index 2e40d1c8..fb9afd10 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java
@@ -1,13 +1,10 @@
 package clap.server.adapter.inbound.web.dto.admin;
 
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import org.hibernate.validator.constraints.Length;
 
 public record UpdateCategoryRequest(
-        @Min(1)
-        Long categoryId,
         @NotBlank @Length(max = 20)
         String name,
         @NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")

From a0ebd444a8ff140a0f3ea58a3de6c6803de05d97 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 28 Jan 2025 16:09:01 +0900
Subject: [PATCH 11/56] =?UTF-8?q?CLAP-148=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20API=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>
- 관련: #120
---
 .../web/admin/DeleteCategoryController.java   | 28 ++++++++++++++++++
 .../web/admin/UpdateCategoryController.java   |  5 ++--
 .../inbound/admin/DeleteCategoryUsecase.java  |  5 ++++
 .../service/admin/DeleteCategoryService.java  | 29 +++++++++++++++++++
 .../server/domain/model/task/Category.java    |  5 ++++
 5 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/DeleteCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/admin/DeleteCategoryService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
new file mode 100644
index 00000000..c4134065
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
@@ -0,0 +1,28 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "카테고리 삭제")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/management")
+public class DeleteCategoryController {
+    private final DeleteCategoryUsecase deleteCategoryUsecase;
+
+    @Operation(summary = "카테고리 삭제")
+    @PatchMapping("/categories/{categoryId}")
+    @Secured("ROLE_ADMIN")
+    public void deleteCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId) {
+        deleteCategoryUsecase.deleteCategory(userInfo.getUserId(), categoryId);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index 0a690b6f..e000b0e4 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -10,6 +10,7 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -21,9 +22,9 @@ public class UpdateCategoryController {
     private final UpdateCategoryUsecase updateCategoryUsecase;
 
     @Operation(summary = "카테고리 수정")
-    @PatchMapping("/categories/categoryId")
+    @PatchMapping("/categories/{categoryId}")
     @Secured("ROLE_ADMIN")
-    public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, Long categoryId,
+    public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId,
                                @RequestBody UpdateCategoryRequest updateCategoryRequest) {
         updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());
     }
diff --git a/src/main/java/clap/server/application/port/inbound/admin/DeleteCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/DeleteCategoryUsecase.java
new file mode 100644
index 00000000..da73fb80
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/DeleteCategoryUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface DeleteCategoryUsecase {
+    void deleteCategory(Long adminId, Long categoryId);
+}
diff --git a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
new file mode 100644
index 00000000..bbff33d4
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
@@ -0,0 +1,29 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.outbound.task.LoadCategoryPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
+import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class DeleteCategoryService implements DeleteCategoryUsecase {
+    private final LoadCategoryPort loadCategoryPort;
+    private final LoadMemberPort loadMemberPort;
+
+    @Override
+    @Transactional
+    public void deleteCategory(Long adminId, Long categoryId) {
+        Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        loadCategoryPort.findById(categoryId)
+                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
+                .deleteCategory(admin);
+    }
+}
diff --git a/src/main/java/clap/server/domain/model/task/Category.java b/src/main/java/clap/server/domain/model/task/Category.java
index fd6018c5..f2c046ba 100644
--- a/src/main/java/clap/server/domain/model/task/Category.java
+++ b/src/main/java/clap/server/domain/model/task/Category.java
@@ -45,5 +45,10 @@ public void updateCategory(Member admin, String code, String name){
         this.code = code;
         this.name = name;
     }
+
+    public void deleteCategory(Member admin) {
+        this.admin = admin;
+        this.isDeleted = true;
+    }
 }
 

From 0ff4b3b9fb2f3e11ef504cd75f70532e1c318cd1 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 28 Jan 2025 16:35:19 +0900
Subject: [PATCH 12/56] =?UTF-8?q?CLAP-148=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20API=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>
- 관련: #120
---
 .../adapter/inbound/web/admin/DeleteCategoryController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
index c4134065..5d1cec88 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
@@ -8,7 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -20,7 +20,7 @@ public class DeleteCategoryController {
     private final DeleteCategoryUsecase deleteCategoryUsecase;
 
     @Operation(summary = "카테고리 삭제")
-    @PatchMapping("/categories/{categoryId}")
+    @DeleteMapping("/categories/{categoryId}")
     @Secured("ROLE_ADMIN")
     public void deleteCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId) {
         deleteCategoryUsecase.deleteCategory(userInfo.getUserId(), categoryId);

From eefe6eefc242a908147fef3789c3b17637e0f09a Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 28 Jan 2025 16:56:19 +0900
Subject: [PATCH 13/56] =?UTF-8?q?CLAP-148=20Docs=20:=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20API=20=EC=8A=A4=EC=9B=A8=EA=B1=B0=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>
- 관련: #120
---
 .../adapter/inbound/web/admin/DeleteCategoryController.java     | 2 +-
 .../adapter/inbound/web/admin/UpdateCategoryController.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
index 5d1cec88..82126fff 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@Tag(name = "카테고리 삭제")
+@Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/management")
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index e000b0e4..9ccc7731 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@Tag(name = "카테고리 수정")
+@Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/management")

From b30cdde18467be16a876eef9f39e25da746cc78d Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 29 Jan 2025 20:36:31 +0900
Subject: [PATCH 14/56] =?UTF-8?q?CLAP-107=20Bug=20:=20CI=20test=20yml?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20key=20=EC=A4=91=EB=B3=B5=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #60
---
 .github/workflows/dev-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
index 66e94e52..22dd4a9f 100644
--- a/.github/workflows/dev-ci.yml
+++ b/.github/workflows/dev-ci.yml
@@ -21,7 +21,8 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin' # https://github.com/actions/setup-java
-      - run: echo "${{ secrets.S3_PROPERTIES }}" >> ./src/test/resources/application.yml
+      - run: touch ./src/test/resources/application.yml
+      - run: echo "${{ secrets.S3_PROPERTIES }}" > ./src/test/resources/application.yml
       
       # gradle caching - 빌드 시간 향상
       - name: Gradle Caching

From c3292fea7429b3498595f3fd37a64875cd3df0ed Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 30 Jan 2025 21:41:58 +0900
Subject: [PATCH 15/56] =?UTF-8?q?CLAP-148=20Feature=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20CUD=20=EB=A6=AC=EB=B7=B0=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81=20=EC=88=98=EC=A0=95,=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20=EB=B0=98=ED=99=98=20=EC=96=91=EC=8B=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #120
---
 .../web/admin/AddCategoryController.java      |  2 +-
 .../web/admin/DeleteCategoryController.java   |  2 +-
 .../web/admin/FindCategoryController.java     |  2 +-
 .../web/admin/UpdateCategoryController.java   |  2 +-
 .../dto/admin/FindAllCategoryResponse.java    |  4 ++-
 .../response/CategoryResponseMapper.java      |  6 ++--
 .../inbound/admin/FindAllCategoryUsecase.java |  4 ++-
 .../service/admin/DeleteCategoryService.java  |  7 ++--
 .../service/admin/FindAllCategoryService.java | 32 +++++++++++--------
 9 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
index e5b841fb..584726c4 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -18,7 +18,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class AddCategoryController {
     private final AddCategoryUsecase addCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
index 82126fff..e4c0c194 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java
@@ -15,7 +15,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class DeleteCategoryController {
     private final DeleteCategoryUsecase deleteCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
index ea1d7725..bc2ed571 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -27,7 +27,7 @@ public class FindCategoryController {
 
     @Operation(summary = "모든 카테고리 조회")
     @GetMapping("/category")
-    public ResponseEntity<FindAllCategoryResponse> findAllCategory() {
+    public ResponseEntity<List<FindAllCategoryResponse>> findAllCategory() {
         return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());
     }
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index 9ccc7731..9ec32397 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -17,7 +17,7 @@
 @Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
-@RequestMapping("/api/management")
+@RequestMapping("/api/managements")
 public class UpdateCategoryController {
     private final UpdateCategoryUsecase updateCategoryUsecase;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
index 74dc547a..46febb93 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java
@@ -3,7 +3,9 @@
 import java.util.List;
 
 public record FindAllCategoryResponse(
-        List<FindMainCategoryResponse> mainCategory,
+        Long id,
+        String name,
+        String code,
         List<FindSubCategoryResponse> subCategory
 ) {
 }
diff --git a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
index 19b780fd..663637b7 100644
--- a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java
@@ -10,9 +10,11 @@
 public class CategoryResponseMapper {
 
     public static FindAllCategoryResponse toFindAllCategoryResponse(
-            List<FindMainCategoryResponse> mainCategoryResponses,
+            Long id,
+            String name,
+            String code,
             List<FindSubCategoryResponse> subCategoryResponses) {
-        return new FindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+        return new FindAllCategoryResponse(id, name, code, subCategoryResponses);
     }
 
     public static FindMainCategoryResponse toFindMainCategoryResponse(Category category) {
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
index e9c3c26d..03968603 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java
@@ -2,6 +2,8 @@
 
 import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
 
+import java.util.List;
+
 public interface FindAllCategoryUsecase {
-    FindAllCategoryResponse findAllCategory();
+    List<FindAllCategoryResponse> findAllCategory();
 }
diff --git a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
index bbff33d4..f490bd5e 100644
--- a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
@@ -1,7 +1,7 @@
 package clap.server.application.service.admin;
 
 import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
-import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
@@ -9,19 +9,18 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
 import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
 
 @ApplicationService
 @RequiredArgsConstructor
 public class DeleteCategoryService implements DeleteCategoryUsecase {
     private final LoadCategoryPort loadCategoryPort;
-    private final LoadMemberPort loadMemberPort;
+    private final MemberService memberService;
 
     @Override
     @Transactional
     public void deleteCategory(Long adminId, Long categoryId) {
-        Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        Member admin = memberService.findActiveMember(adminId);
         loadCategoryPort.findById(categoryId)
                 .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
                 .deleteCategory(admin);
diff --git a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
index 6fe93c55..27fe7c76 100644
--- a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
@@ -1,16 +1,15 @@
 package clap.server.application.service.admin;
 
 import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
-import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
 import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
 import clap.server.application.mapper.response.CategoryResponseMapper;
 import clap.server.application.port.inbound.admin.FindAllCategoryUsecase;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Category;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @ApplicationService
@@ -20,16 +19,23 @@ public class FindAllCategoryService implements FindAllCategoryUsecase {
 
     @Override
     @Transactional(readOnly = true)
-    public FindAllCategoryResponse findAllCategory() {
-        List<FindMainCategoryResponse> mainCategoryResponses = new ArrayList<>();
-        List<FindSubCategoryResponse> subCategoryResponses = new ArrayList<>();
-        loadCategoryPort.findAll().forEach(category -> {
-            if (category.getMainCategory() == null) {
-                mainCategoryResponses.add(CategoryResponseMapper.toFindMainCategoryResponse(category));
-            } else {
-                subCategoryResponses.add(CategoryResponseMapper.toFindSubCategoryResponse(category));
-            }
-        });
-        return CategoryResponseMapper.toFindAllCategoryResponse(mainCategoryResponses, subCategoryResponses);
+    public List<FindAllCategoryResponse> findAllCategory() {
+        List<Category> categories = loadCategoryPort.findAll();
+        return categories.stream().filter(category -> category.getMainCategory() == null)
+                .map(parent -> CategoryResponseMapper.toFindAllCategoryResponse(
+                        parent.getCategoryId(),
+                        parent.getName(),
+                        parent.getCode(),
+                        getSubCategories(categories, parent) // 2차 카테고리 리스트 변환
+                ))
+                .toList();
+    }
+
+    private List<FindSubCategoryResponse> getSubCategories(List<Category> categories, Category parent) {
+        return categories.stream()
+                .filter(category -> category.getMainCategory() != null &&
+                                    category.getMainCategory().getCategoryId().equals(parent.getCategoryId())) // 부모가 같은 것들 필터링
+                .map(CategoryResponseMapper::toFindSubCategoryResponse)
+                .toList();
     }
 }
\ No newline at end of file

From 915e6f926f76b7cd410649830e92d84de2d46ea0 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 14:46:05 +0900
Subject: [PATCH 16/56] =?UTF-8?q?CLAP-214=20Cleanup=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84,=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=AF=B8?=
 =?UTF-8?q?=ED=9D=A1=ED=95=9C=EB=B6=80=EB=B6=84=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>
- 관련: #216
---
 .../inbound/web/admin/AddCategoryController.java       | 10 ++++++----
 .../inbound/web/admin/FindCategoryController.java      |  2 +-
 .../inbound/web/admin/UpdateCategoryController.java    |  3 ++-
 .../web/statistics/FindStatisticsController.java       |  8 ++++++--
 .../port/inbound/admin/AddMainCategoryUsecase.java     |  5 +++++
 ...CategoryUsecase.java => AddSubCategoryUsecase.java} |  5 ++---
 .../application/service/admin/AddCategoryService.java  |  5 +++--
 7 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
 rename src/main/java/clap/server/application/port/inbound/admin/{AddCategoryUsecase.java => AddSubCategoryUsecase.java} (56%)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
index 584726c4..d1ad5fd5 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
 import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest;
-import clap.server.application.port.inbound.admin.AddCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddSubCategoryUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,20 +21,21 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/managements")
 public class AddCategoryController {
-    private final AddCategoryUsecase addCategoryUsecase;
+    private final AddMainCategoryUsecase addMainCategoryUsecase;
+    private final AddSubCategoryUsecase addSubCategoryUsecase;
 
     @Operation(summary = "1차 카테고리 추가")
     @PostMapping("/main-category")
     @Secured("ROLE_ADMIN")
     public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddMainCategoryRequest addMainCategoryRequest) {
-        addCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
+        addMainCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
     }
 
     @Operation(summary = "2차 카테고리 추가")
     @PostMapping("/sub-category")
     @Secured("ROLE_ADMIN")
     public void addSubCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddSubCategoryRequest addCategoryRequest) {
-        addCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
+        addSubCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
index bc2ed571..16b74c08 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -16,7 +16,7 @@
 
 import java.util.List;
 
-@Tag(name = "카테고리 조회")
+@Tag(name = "02. Task [카테고리]", description = "카테고리 조회 API")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api")
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
index 9ec32397..0f3d877a 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -6,6 +6,7 @@
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -25,7 +26,7 @@ public class UpdateCategoryController {
     @PatchMapping("/categories/{categoryId}")
     @Secured("ROLE_ADMIN")
     public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId,
-                               @RequestBody UpdateCategoryRequest updateCategoryRequest) {
+                               @Valid @RequestBody UpdateCategoryRequest updateCategoryRequest) {
         updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index e84c0c75..dfa2b023 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -3,7 +3,8 @@
 import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
 import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
 import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
-import clap.server.application.port.inbound.statistics.*;
+import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase;
+import clap.server.application.port.inbound.statistics.FindTaskProcessUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import clap.server.exception.StatisticsException;
 import io.swagger.v3.oas.annotations.Operation;
@@ -11,6 +12,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,7 +22,7 @@
 import static clap.server.exception.code.StatisticsErrorCode.STATISTICS_BAD_REQUEST;
 import static io.swagger.v3.oas.annotations.enums.ParameterIn.QUERY;
 
-@Tag(name = "02. Task [담당자]", description = "작업 통계 API")
+@Tag(name = "02. Task [통계]", description = "작업 통계 API")
 @WebAdapter
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks/statistics")
@@ -33,6 +35,7 @@ public class FindStatisticsController {
     @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
     @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true, in = QUERY)
     @GetMapping
+    @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
         switch (statisticsType) {
             case REQUEST_BY_PERIOD ->
@@ -51,6 +54,7 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
     @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
     @Parameter(name = "mainCategory", description = "1차 카테고리 이름", required = true, in = QUERY)
     @GetMapping("/subcategory")
+    @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam PeriodType periodType, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
                 .aggregateSubCategoryTaskRequest(periodType.getType(), mainCategory));
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
new file mode 100644
index 00000000..382c7f57
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/AddMainCategoryUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface AddMainCategoryUsecase {
+    void addMainCategory(Long adminId, String code, String name);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
similarity index 56%
rename from src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java
rename to src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
index b49bc41b..26df3d7b 100644
--- a/src/main/java/clap/server/application/port/inbound/admin/AddCategoryUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
@@ -1,6 +1,5 @@
 package clap.server.application.port.inbound.admin;
 
-public interface AddCategoryUsecase {
-    void addMainCategory(Long adminId, String code, String name);
+public interface AddSubCategoryUsecase {
     void addSubCategory(Long adminId, Long mainCategoryId, String code, String name);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
index e759577e..cd401450 100644
--- a/src/main/java/clap/server/application/service/admin/AddCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -1,6 +1,7 @@
 package clap.server.application.service.admin;
 
-import clap.server.application.port.inbound.admin.AddCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.AddSubCategoryUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.application.port.outbound.task.CommandCategoryPort;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
@@ -17,7 +18,7 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-public class AddCategoryService implements AddCategoryUsecase {
+public class AddCategoryService implements AddMainCategoryUsecase, AddSubCategoryUsecase {
     private final CommandCategoryPort commandCategoryPort;
     private final LoadCategoryPort loadCategoryPort;
     private final LoadMemberPort loadMemberPort;

From 68c9f08754f30399c5c8ea74be892ec30939246a Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 18:39:24 +0900
Subject: [PATCH 17/56] =?UTF-8?q?CLAP-214=20Fix=20:=20=ED=86=B5=EA=B3=84?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0?=
 =?UTF-8?q?=20=EB=B0=94=EC=9D=B8=EB=94=A9=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../utils/StringToPeriodTypeConverter.java    | 13 +++++++++++
 .../StringToStatisticsTypeConverter.java      | 13 +++++++++++
 .../clap/server/config/web/WebConfig.java     | 23 +++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
 create mode 100644 src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
 create mode 100644 src/main/java/clap/server/config/web/WebConfig.java

diff --git a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
new file mode 100644
index 00000000..ae462adf
--- /dev/null
+++ b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
@@ -0,0 +1,13 @@
+package clap.server.common.utils;
+
+import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToPeriodTypeConverter implements Converter<String, PeriodType> {
+    @Override
+    public PeriodType convert(String source) {
+        return PeriodType.from(source);
+    }
+}
diff --git a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
new file mode 100644
index 00000000..6828d711
--- /dev/null
+++ b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
@@ -0,0 +1,13 @@
+package clap.server.common.utils;
+
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToStatisticsTypeConverter implements Converter<String, StatisticsType> {
+    @Override
+    public StatisticsType convert(String source) {
+        return StatisticsType.from(source);
+    }
+}
diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
new file mode 100644
index 00000000..ac2294c6
--- /dev/null
+++ b/src/main/java/clap/server/config/web/WebConfig.java
@@ -0,0 +1,23 @@
+package clap.server.config.web;
+
+import clap.server.common.utils.StringToPeriodTypeConverter;
+import clap.server.common.utils.StringToStatisticsTypeConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Set;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Bean
+    public ConversionServiceFactoryBean conversionService() {
+        ConversionServiceFactoryBean conversionService = new ConversionServiceFactoryBean();
+        conversionService.setConverters(Set.of(
+                new StringToStatisticsTypeConverter(),
+                new StringToPeriodTypeConverter()
+        ));
+        return conversionService;
+    }
+}

From 4f338adf73c571e1bbb597f9830bbc4591b90f9f Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 18:44:40 +0900
Subject: [PATCH 18/56] =?UTF-8?q?CLAP-214=20Fix=20:=20addConverter=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>
- 관련: #216
---
 .../java/clap/server/config/web/WebConfig.java  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
index ac2294c6..07947005 100644
--- a/src/main/java/clap/server/config/web/WebConfig.java
+++ b/src/main/java/clap/server/config/web/WebConfig.java
@@ -2,22 +2,17 @@
 
 import clap.server.common.utils.StringToPeriodTypeConverter;
 import clap.server.common.utils.StringToStatisticsTypeConverter;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.Set;
 
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
-    @Bean
-    public ConversionServiceFactoryBean conversionService() {
-        ConversionServiceFactoryBean conversionService = new ConversionServiceFactoryBean();
-        conversionService.setConverters(Set.of(
-                new StringToStatisticsTypeConverter(),
-                new StringToPeriodTypeConverter()
-        ));
-        return conversionService;
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StringToStatisticsTypeConverter());
+        registry.addConverter(new StringToPeriodTypeConverter());
     }
 }

From 67fc6675045ebb23ea4c208983518c9595183e69 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 19:05:14 +0900
Subject: [PATCH 19/56] =?UTF-8?q?CLAP-214=20Hotfix=20:=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=ED=95=9C=20=ED=8C=8C=EC=9D=BC=EB=93=A4=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../statistics/FindStatisticsController.java   |  4 ++--
 .../utils/StringToPeriodTypeConverter.java     | 13 -------------
 .../utils/StringToStatisticsTypeConverter.java | 13 -------------
 .../java/clap/server/config/web/WebConfig.java | 18 ------------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
 delete mode 100644 src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
 delete mode 100644 src/main/java/clap/server/config/web/WebConfig.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index dfa2b023..f0164060 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -32,8 +32,8 @@ public class FindStatisticsController {
 
 
     @Operation(summary = "기본 통계 API")
-    @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
-    @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true, in = QUERY)
+    @Parameter(name = "periodType", required = true, in = QUERY)
+    @Parameter(name = "statisticsType", required = true, in = QUERY)
     @GetMapping
     @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
diff --git a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java b/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
deleted file mode 100644
index ae462adf..00000000
--- a/src/main/java/clap/server/common/utils/StringToPeriodTypeConverter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.utils;
-
-import clap.server.adapter.inbound.web.dto.statistics.PeriodType;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
-
-@Component
-public class StringToPeriodTypeConverter implements Converter<String, PeriodType> {
-    @Override
-    public PeriodType convert(String source) {
-        return PeriodType.from(source);
-    }
-}
diff --git a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java b/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
deleted file mode 100644
index 6828d711..00000000
--- a/src/main/java/clap/server/common/utils/StringToStatisticsTypeConverter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.utils;
-
-import clap.server.adapter.inbound.web.dto.statistics.StatisticsType;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
-
-@Component
-public class StringToStatisticsTypeConverter implements Converter<String, StatisticsType> {
-    @Override
-    public StatisticsType convert(String source) {
-        return StatisticsType.from(source);
-    }
-}
diff --git a/src/main/java/clap/server/config/web/WebConfig.java b/src/main/java/clap/server/config/web/WebConfig.java
deleted file mode 100644
index 07947005..00000000
--- a/src/main/java/clap/server/config/web/WebConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package clap.server.config.web;
-
-import clap.server.common.utils.StringToPeriodTypeConverter;
-import clap.server.common.utils.StringToStatisticsTypeConverter;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-@Configuration
-public class WebConfig implements WebMvcConfigurer {
-
-    @Override
-    public void addFormatters(FormatterRegistry registry) {
-        registry.addConverter(new StringToStatisticsTypeConverter());
-        registry.addConverter(new StringToPeriodTypeConverter());
-    }
-}

From e4dc477f8a95dc58c768d5caaee496131cf4df2a Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 19:31:19 +0900
Subject: [PATCH 20/56] =?UTF-8?q?CLAP-214=20Hotfix=20:=20FindStatisticsCon?=
 =?UTF-8?q?troller=20=EC=8A=A4=EC=9C=84=EC=B9=98=EB=AC=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../inbound/web/statistics/FindStatisticsController.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index f0164060..de72d30b 100644
--- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
@@ -37,7 +37,9 @@ public class FindStatisticsController {
     @GetMapping
     @Secured("ROLE_MANAGER")
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
-        switch (statisticsType) {
+        System.out.println("periodType = " + periodType);
+        System.out.println("statisticsType = " + statisticsType);
+        return switch (statisticsType) {
             case REQUEST_BY_PERIOD ->
                     ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType()));
             case PROCESS_BY_PERIOD -> ResponseEntity.ok(findTaskProcessUsecase
@@ -46,8 +48,8 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
                     ResponseEntity.ok(findTaskProcessUsecase.aggregateCategoryTaskRequest(periodType.getType()));
             case PROCESS_BY_MANAGER -> ResponseEntity.ok(findTaskProcessUsecase
                     .aggregateManagerTaskProcess(periodType.getType()));
-        }
-        throw new StatisticsException(STATISTICS_BAD_REQUEST);
+            default -> throw new StatisticsException(STATISTICS_BAD_REQUEST);
+        };
     }
 
     @Operation(summary = "1차 카테고리 하위 2차 카테고리별 통계 API")

From 4875e321ea18914f7865150168dfd1f9ab3fc981 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 2 Feb 2025 20:41:03 +0900
Subject: [PATCH 21/56] =?UTF-8?q?CLAP-214=20Hotfix=20:=20AddCategoryServic?=
 =?UTF-8?q?e=20=EC=A7=80=EC=97=B0=EB=A1=9C=EB=94=A9=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../server/application/service/admin/AddCategoryService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
index cd401450..61f656ca 100644
--- a/src/main/java/clap/server/application/service/admin/AddCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -10,6 +10,7 @@
 import clap.server.domain.model.task.Category;
 import clap.server.exception.ApplicationException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -24,6 +25,7 @@ public class AddCategoryService implements AddMainCategoryUsecase, AddSubCategor
     private final LoadMemberPort loadMemberPort;
 
     @Override
+    @Transactional
     public void addMainCategory(Long adminId, String code, String name) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
         Category mainCategory = Category.createMainCategory(
@@ -33,6 +35,7 @@ public void addMainCategory(Long adminId, String code, String name) {
     }
 
     @Override
+    @Transactional
     public void addSubCategory(Long adminId, Long mainCategoryId, String code, String name) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
         Optional<Category> mainCategory = loadCategoryPort.findById(mainCategoryId);

From ebd4bcd85d352067aee98cfaf6c062078e04de1b Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Mon, 3 Feb 2025 11:56:20 +0900
Subject: [PATCH 22/56] =?UTF-8?q?CLAP-214=20Hotfix=20:=20DeleteCategorySer?=
 =?UTF-8?q?vice=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../service/admin/DeleteCategoryService.java           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
index f490bd5e..f4ad09a3 100644
--- a/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/DeleteCategoryService.java
@@ -2,9 +2,11 @@
 
 import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.outbound.task.CommandCategoryPort;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Category;
 import clap.server.exception.ApplicationException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,13 +18,15 @@
 public class DeleteCategoryService implements DeleteCategoryUsecase {
     private final LoadCategoryPort loadCategoryPort;
     private final MemberService memberService;
+    private final CommandCategoryPort commandCategoryPort;
 
     @Override
     @Transactional
     public void deleteCategory(Long adminId, Long categoryId) {
         Member admin = memberService.findActiveMember(adminId);
-        loadCategoryPort.findById(categoryId)
-                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
-                .deleteCategory(admin);
+        Category category = loadCategoryPort.findById(categoryId)
+                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND));
+        category.deleteCategory(admin);
+        commandCategoryPort.save(category);
     }
 }

From a2292c8c1768ef5e733171ee361c312f1ff27125 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Mon, 3 Feb 2025 22:49:21 +0900
Subject: [PATCH 23/56] =?UTF-8?q?CLAP-249=20Refactor=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=A1=B0=ED=9A=8C=20=EC=84=9C=EB=B9=84=EC=8A=A4=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>
- 관련: #265
---
 .../application/service/statistics/FindTaskProcessService.java  | 2 +-
 .../clap/server/domain/policy/task/TaskStatisticsPolicy.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java b/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java
index ef1364f2..8707ec3b 100644
--- a/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java
+++ b/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java
@@ -14,7 +14,7 @@
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
-class FindTaskProcessService implements FindTaskProcessUsecase {
+public class FindTaskProcessService implements FindTaskProcessUsecase {
     private final TaskDocumentPort taskDocumentPort;
     private final TaskStatisticsPolicy taskStatisticsPolicy;
 
diff --git a/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java
index 67106ccb..57b6a427 100644
--- a/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java
+++ b/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java
@@ -12,7 +12,7 @@
 
 @Policy
 public class TaskStatisticsPolicy {
-    private static final String DISPLAY_FORMAT = "MM월 dd일";
+    private static final String DISPLAY_FORMAT = "M월 d일";
 
     public Map<String, Long> filterAndFormatWeekdayStatistics(Map<String, Long> statistics) {
         return statistics.entrySet().stream()

From 93531b51065bcbe7b0f33313277ef125e3988404 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Mon, 3 Feb 2025 22:52:43 +0900
Subject: [PATCH 24/56] =?UTF-8?q?CLAP-250=20Test=20:=20=ED=86=B5=EA=B3=84?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #266
---
 .../FindTaskProcessServiceTest.java           | 128 ++++++++++++++++++
 .../policy/task/TaskStatisticsPolicyTest.java |  31 +++++
 2 files changed, 159 insertions(+)
 create mode 100644 src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java
 create mode 100644 src/test/java/clap/server/domain/policy/task/TaskStatisticsPolicyTest.java

diff --git a/src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java b/src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java
new file mode 100644
index 00000000..0212a3db
--- /dev/null
+++ b/src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java
@@ -0,0 +1,128 @@
+package clap.server.application.statistics;
+
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
+import clap.server.application.port.outbound.task.TaskDocumentPort;
+import clap.server.application.service.statistics.FindTaskProcessService;
+import clap.server.domain.policy.task.TaskStatisticsPolicy;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class FindTaskProcessServiceTest {
+    @Mock
+    private TaskDocumentPort taskDocumentPort;
+    @Mock
+    private TaskStatisticsPolicy taskStatisticsPolicy;
+    @InjectMocks
+    private FindTaskProcessService findTaskProcessService;
+
+    @Test
+    @DisplayName("카테고리별 요청량")
+    void aggregateCategoryTaskRequest() {
+        //given
+        Map<String, Long> statistics = new TreeMap<>();
+        statistics.put("VM", 6L);
+        statistics.put("KS", 7L);
+        statistics.put("DN", 8L);
+
+        when(taskDocumentPort.findCategoryTaskRequestByPeriod(eq("week"))).thenReturn(statistics);
+
+        //when
+        List<StatisticsResponse> week = findTaskProcessService.aggregateCategoryTaskRequest("week");
+
+        //then
+        assertThat(week.get(0).key()).isEqualTo("DN");
+        assertThat(week.get(0).count()).isEqualTo(8L);
+        assertThat(week.get(1).key()).isEqualTo("KS");
+        assertThat(week.get(1).count()).isEqualTo(7L);
+        assertThat(week.get(2).key()).isEqualTo("VM");
+        assertThat(week.get(2).count()).isEqualTo(6L);
+    }
+
+    @Test
+    @DisplayName("담당자별 처리량")
+    void aggregateManagerTaskProcess() {
+        //given
+        Map<String, Long> statistics = new TreeMap<>();
+        statistics.put("log.d", 6L);
+        statistics.put("tony.tsx", 7L);
+        statistics.put("moya.moya", 8L);
+
+        when(taskDocumentPort.findManagerTaskProcessByPeriod(eq("week"))).thenReturn(statistics);
+
+        //when
+        List<StatisticsResponse> week = findTaskProcessService.aggregateManagerTaskProcess("week");
+
+        //then
+        assertThat(week.get(0).key()).isEqualTo("log.d");
+        assertThat(week.get(0).count()).isEqualTo(6L);
+        assertThat(week.get(1).key()).isEqualTo("moya.moya");
+        assertThat(week.get(1).count()).isEqualTo(8L);
+        assertThat(week.get(2).key()).isEqualTo("tony.tsx");
+        assertThat(week.get(2).count()).isEqualTo(7L);
+    }
+
+    @Test
+    @DisplayName("기간별 처리량")
+    void aggregatePeriodTaskProcess() {
+        //given
+        Map<String, Long> statistics = new TreeMap<>();
+        statistics.put("2025-02-01", 8L);
+        statistics.put("2025-01-30", 7L);
+        statistics.put("2025-01-31", 6L);
+
+        when(taskDocumentPort.findPeriodTaskProcessByPeriod(eq("week"))).thenReturn(statistics);
+
+        Map<String, Long> formattedStatistics = new TreeMap<>();
+        formattedStatistics.put("1월 30일", 7L);
+        formattedStatistics.put("1월 31일", 6L);
+        when(taskStatisticsPolicy.filterAndFormatWeekdayStatistics(statistics)).thenReturn(formattedStatistics);
+
+        //when
+        List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskProcess("week");
+
+        //then
+        assertThat(week.get(0).key()).isEqualTo("1월 30일");
+        assertThat(week.get(0).count()).isEqualTo(7L);
+        assertThat(week.get(1).key()).isEqualTo("1월 31일");
+        assertThat(week.get(1).count()).isEqualTo(6L);
+    }
+
+    @Test
+    @DisplayName("기간별 요청량")
+    void aggregatePeriodTaskRequest() {
+        //given
+        Map<String, Long> statistics = new TreeMap<>();
+        statistics.put("2025-02-01", 8L);
+        statistics.put("2025-01-30", 7L);
+        statistics.put("2025-01-31", 6L);
+
+        when(taskDocumentPort.findPeriodTaskRequestByPeriod(eq("week"))).thenReturn(statistics);
+
+        Map<String, Long> formattedStatistics = new TreeMap<>();
+        formattedStatistics.put("1월 30일", 7L);
+        formattedStatistics.put("1월 31일", 6L);
+        when(taskStatisticsPolicy.filterAndFormatWeekdayStatistics(statistics)).thenReturn(formattedStatistics);
+
+        //when
+        List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskRequest("week");
+
+        //then
+        assertThat(week.get(0).key()).isEqualTo("1월 30일");
+        assertThat(week.get(0).count()).isEqualTo(7L);
+        assertThat(week.get(1).key()).isEqualTo("1월 31일");
+        assertThat(week.get(1).count()).isEqualTo(6L);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/clap/server/domain/policy/task/TaskStatisticsPolicyTest.java b/src/test/java/clap/server/domain/policy/task/TaskStatisticsPolicyTest.java
new file mode 100644
index 00000000..0b6e1694
--- /dev/null
+++ b/src/test/java/clap/server/domain/policy/task/TaskStatisticsPolicyTest.java
@@ -0,0 +1,31 @@
+package clap.server.domain.policy.task;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TaskStatisticsPolicyTest {
+    private final TaskStatisticsPolicy taskStatisticsPolicy = new TaskStatisticsPolicy();
+
+    @Test
+    void filterAndFormatWeekdayStatistics() {
+        //given
+        Map<String, Long> statistics = new TreeMap<>();
+        statistics.put("2025-02-01", 8L);
+        statistics.put("2025-01-30", 7L);
+        statistics.put("2025-01-31", 6L);
+
+        Map<String, Long> formattedStatistics = new TreeMap<>();
+        formattedStatistics.put("1월 30일", 7L);
+        formattedStatistics.put("1월 31일", 6L);
+
+        //when
+        Map<String, Long> weekdayStatistics = taskStatisticsPolicy.filterAndFormatWeekdayStatistics(statistics);
+
+        //then
+        assertThat(weekdayStatistics).isEqualTo(formattedStatistics);
+    }
+}
\ No newline at end of file

From 280d930764ff55b52f1f109d56177fc286dd0a2b Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 4 Feb 2025 14:43:51 +0900
Subject: [PATCH 25/56] =?UTF-8?q?CLAP-214=20Hotifx=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../service/admin/UpdateCategoryService.java           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
index 3c09e16f..23e44ba5 100644
--- a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
@@ -2,9 +2,11 @@
 
 import clap.server.application.port.inbound.admin.UpdateCategoryUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.outbound.task.CommandCategoryPort;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Category;
 import clap.server.exception.ApplicationException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,13 +19,15 @@
 public class UpdateCategoryService implements UpdateCategoryUsecase {
     private final LoadCategoryPort loadCategoryPort;
     private final LoadMemberPort loadMemberPort;
+    private final CommandCategoryPort commandCategoryPort;
 
     @Override
     @Transactional
     public void updateCategory(Long adminId, Long categoryId, String name, String code) {
         Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
-        loadCategoryPort.findById(categoryId)
-                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND))
-                .updateCategory(admin, name, code);
+        Category category = loadCategoryPort.findById(categoryId)
+                .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND));
+        category.updateCategory(admin, name, code);
+        commandCategoryPort.save(category);
     }
 }
\ No newline at end of file

From 7be324a67d48b0e09174fac9a10e90844458918e Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 4 Feb 2025 17:31:30 +0900
Subject: [PATCH 26/56] =?UTF-8?q?CLAP-214=20Hotifx=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 src/main/java/clap/server/domain/model/task/Category.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/domain/model/task/Category.java b/src/main/java/clap/server/domain/model/task/Category.java
index f2c046ba..c544a79e 100644
--- a/src/main/java/clap/server/domain/model/task/Category.java
+++ b/src/main/java/clap/server/domain/model/task/Category.java
@@ -40,10 +40,10 @@ public static Category createSubCategory(Member admin, Category mainCategory, St
                 .build();
     }
 
-    public void updateCategory(Member admin, String code, String name){
+    public void updateCategory(Member admin, String name, String code){
         this.admin = admin;
-        this.code = code;
         this.name = name;
+        this.code = code;
     }
 
     public void deleteCategory(Member admin) {

From 2381888f2af86036cdceb01be539522f5c6c4ea9 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Tue, 4 Feb 2025 23:33:04 +0900
Subject: [PATCH 27/56] =?UTF-8?q?CLAP-256=20fix:=20=EC=8A=A4=EC=9B=A8?=
 =?UTF-8?q?=EA=B1=B0=20=EB=AA=85=EC=84=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/adapter/inbound/web/task/TeamStatusController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
index 71477182..9608f066 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -5,6 +5,7 @@
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
 import clap.server.application.service.task.TeamStatusService;
 import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -14,12 +15,11 @@
 @RestController
 @RequestMapping("/api/team-status")
 @RequiredArgsConstructor
-@Tag(name = "팀 현황 조회 API")
 @WebAdapter
 public class TeamStatusController {
 
     private final TeamStatusService teamStatusService;
-
+    @Operation(summary = "팀 현황 필터링 조회 API")
     @GetMapping("/filter")
     public ResponseEntity<TeamStatusResponse> filterTeamStatus(@Validated @ModelAttribute FilterTeamStatusRequest filter) {
         TeamStatusResponse response = teamStatusService.filterTeamStatus(filter);

From efaaee38bafcf864bdd2c88c777e7e21269f57c9 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 5 Feb 2025 09:52:31 +0900
Subject: [PATCH 28/56] =?UTF-8?q?CLAP-214=20Hotifx=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A0=80=EC=9E=A5=20=ED=8A=B8?=
 =?UTF-8?q?=EB=9E=9C=EC=9E=AD=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../service/statistics/StatisticsIndexingService.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
index d5bbec1b..eedb29e7 100644
--- a/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
+++ b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
@@ -5,6 +5,7 @@
 import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -14,7 +15,8 @@ public class StatisticsIndexingService {
     private final LoadTaskPort loadTaskPort;
     private final TaskDocumentPort taskDocumentPort;
 
-    @Scheduled(cron = "0 0 0 * * *")
+    @Scheduled(cron = "30 43 09 * * *")
+    @Transactional
     public void IndexStatistics() {
         taskDocumentPort.saveStatistics(
                 loadTaskPort.findYesterdayTaskByDate(LocalDateTime.now().withNano(0))

From 0e10e865403b74e8ee329bbedff20bdc51a6e813 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 5 Feb 2025 10:39:01 +0900
Subject: [PATCH 29/56] =?UTF-8?q?CLAP-214=20Hotifx=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A0=80=EC=9E=A5=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../service/statistics/StatisticsIndexingService.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
index eedb29e7..50366739 100644
--- a/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
+++ b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java
@@ -15,7 +15,7 @@ public class StatisticsIndexingService {
     private final LoadTaskPort loadTaskPort;
     private final TaskDocumentPort taskDocumentPort;
 
-    @Scheduled(cron = "30 43 09 * * *")
+    @Scheduled(cron = "0 0 0 * * *")
     @Transactional
     public void IndexStatistics() {
         taskDocumentPort.saveStatistics(

From 40bc6146c42e7f69a3b7218dfa1470774b14712e Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 5 Feb 2025 14:42:50 +0900
Subject: [PATCH 30/56] =?UTF-8?q?CLAP-285=20Hotifx=20:=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=A0=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #331
---
 .../web/admin/FindDepartmentController.java   | 32 +++++++++++++++++++
 .../response/FindAllDepartmentsResponse.java  |  6 ++++
 .../mapper/DepartmentResponseMapper.java      | 10 ++++++
 .../admin/FindAllDepartmentsUsecase.java      |  9 ++++++
 .../admin/FindAllDepartmentsService.java      | 21 ++++++++++++
 5 files changed, 78 insertions(+)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/admin/FindDepartmentController.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllDepartmentsResponse.java
 create mode 100644 src/main/java/clap/server/application/mapper/DepartmentResponseMapper.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/admin/FindAllDepartmentsUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/admin/FindAllDepartmentsService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindDepartmentController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindDepartmentController.java
new file mode 100644
index 00000000..cf6b6fab
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindDepartmentController.java
@@ -0,0 +1,32 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.response.FindAllDepartmentsResponse;
+import clap.server.application.mapper.DepartmentResponseMapper;
+import clap.server.application.port.inbound.admin.FindAllDepartmentsUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Tag(name = "05. Admin")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/managements")
+public class FindDepartmentController {
+    private final FindAllDepartmentsUsecase findAllDepartmentsUsecase;
+
+    @Operation(summary = "부서 조회 API")
+    @Secured("ROLE_ADMIN")
+    @GetMapping("/departments")
+    public List<FindAllDepartmentsResponse> findAllDepartments() {
+        return findAllDepartmentsUsecase.findAllDepartments()
+                .stream()
+                .map(DepartmentResponseMapper::toFindAllDepartmentsResponse)
+                .toList();
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllDepartmentsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllDepartmentsResponse.java
new file mode 100644
index 00000000..c9afe042
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllDepartmentsResponse.java
@@ -0,0 +1,6 @@
+package clap.server.adapter.inbound.web.dto.admin.response;
+
+public record FindAllDepartmentsResponse(
+        Long departmentId,
+        String name) {
+}
diff --git a/src/main/java/clap/server/application/mapper/DepartmentResponseMapper.java b/src/main/java/clap/server/application/mapper/DepartmentResponseMapper.java
new file mode 100644
index 00000000..d52a0a60
--- /dev/null
+++ b/src/main/java/clap/server/application/mapper/DepartmentResponseMapper.java
@@ -0,0 +1,10 @@
+package clap.server.application.mapper;
+
+import clap.server.adapter.inbound.web.dto.admin.response.FindAllDepartmentsResponse;
+import clap.server.domain.model.member.Department;
+
+public class DepartmentResponseMapper {
+    public static FindAllDepartmentsResponse toFindAllDepartmentsResponse(Department department) {
+        return new FindAllDepartmentsResponse(department.getDepartmentId(), department.getName());
+    }
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllDepartmentsUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllDepartmentsUsecase.java
new file mode 100644
index 00000000..f425c8d6
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/admin/FindAllDepartmentsUsecase.java
@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.domain.model.member.Department;
+
+import java.util.List;
+
+public interface FindAllDepartmentsUsecase {
+    List<Department> findAllDepartments();
+}
diff --git a/src/main/java/clap/server/application/service/admin/FindAllDepartmentsService.java b/src/main/java/clap/server/application/service/admin/FindAllDepartmentsService.java
new file mode 100644
index 00000000..b30faba4
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/FindAllDepartmentsService.java
@@ -0,0 +1,21 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.inbound.admin.FindAllDepartmentsUsecase;
+import clap.server.application.port.outbound.member.LoadDepartmentPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Department;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class FindAllDepartmentsService implements FindAllDepartmentsUsecase {
+    private final LoadDepartmentPort loadDepartmentPort;
+
+    @Override
+    public List<Department> findAllDepartments() {
+        return loadDepartmentPort.findActiveDepartments();
+    }
+
+}

From 14db2036c6aff559bcbbcb7a15b37f5354e033e3 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Wed, 5 Feb 2025 19:42:51 +0900
Subject: [PATCH 31/56] =?UTF-8?q?CLAP-214=20Hotifx=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A1=B0=ED=9A=8C=20Secured=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #216
---
 .../adapter/inbound/web/admin/FindCategoryController.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
index 00cfd3e4..bb9e97ec 100644
--- a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java
@@ -11,6 +11,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -27,18 +28,21 @@ public class FindCategoryController {
 
     @Operation(summary = "모든 카테고리 조회")
     @GetMapping("/category")
+    @Secured({"ROLE_USER", "ROLE_MANAGER", "ROLE_ADMIN"})
     public ResponseEntity<List<FindAllCategoryResponse>> findAllCategory() {
         return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());
     }
 
     @Operation(summary = "1차 카테고리 조회")
     @GetMapping("/main-category")
+    @Secured({"ROLE_USER", "ROLE_MANAGER", "ROLE_ADMIN"})
     public ResponseEntity<List<FindMainCategoryResponse>> findMainCategory() {
         return ResponseEntity.ok(findmainCategoryUsecase.findMainCategory());
     }
 
     @Operation(summary = "2차 카테고리 조회")
     @GetMapping("/sub-category")
+    @Secured({"ROLE_USER", "ROLE_MANAGER", "ROLE_ADMIN"})
     public ResponseEntity<List<FindSubCategoryResponse>> findSubCategory() {
         return ResponseEntity.ok(findsubCategoryUsecase.findSubCategory());
     }

From d87498c0c35c5cd77920204cba04aad77de07a21 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 04:06:23 +0900
Subject: [PATCH 32/56] =?UTF-8?q?CLAP-256=20fix:=20convert=20=EB=8F=99?=
 =?UTF-8?q?=EC=9E=91=20mapper=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/request/FilterTeamStatusRequest.java |  1 +
 .../dto/task/response/TeamStatusResponse.java |  5 +-
 .../inbound/web/task/ManagerController.java   |  6 ++
 .../web/task/TeamStatusController.java        |  8 ++-
 .../persistense/TaskPersistenceAdapter.java   |  3 +-
 .../task/TaskCustomRepositoryImpl.java        | 52 +++++++++-------
 .../mapper/TaskResponseMapper.java            | 59 +++++++++++++++++++
 .../service/task/TeamStatusService.java       |  6 ++
 src/main/resources/env.properties             | 31 ----------
 9 files changed, 111 insertions(+), 60 deletions(-)
 delete mode 100644 src/main/resources/env.properties

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
index ba517760..6202642e 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.dto.task.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
index 95e9be15..88e8c45a 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java
@@ -8,7 +8,7 @@ public record TeamStatusResponse(
         int totalPendingTaskCount,
         int totalTaskCount
 ) {
-    // 기존 생성자 (3개 파라미터)
+
     public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalPendingTaskCount) {
         this(
                 (members == null) ? List.of() : members,
@@ -18,8 +18,7 @@ public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTas
         );
     }
 
-    // 추가된 생성자 (List만 받음)
     public TeamStatusResponse(List<TeamTaskResponse> members) {
-        this(members, 0, 0); // 기본값을 사용하여 생성
+        this(members != null ? members : List.of(), 0, 0); // 기본값을 사용하여 생성
     }
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java
index f0c387e9..108ed27d 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java
@@ -3,18 +3,24 @@
 import clap.server.application.port.inbound.task.FindManagersUsecase;
 import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse;
 import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
+
+@Tag(name = "02. Task [조회]")
 @WebAdapter
 @RequestMapping("/api/managers")
 @RequiredArgsConstructor
 public class ManagerController {
     private final FindManagersUsecase findManagersUsecase;
 
+    @Operation(summary = "담당자 조회 API")
     @GetMapping
     public ResponseEntity<List<FindManagersResponse>> findManagers() {
         return ResponseEntity.ok(findManagersUsecase.findManagers());
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
index 9608f066..7781eff2 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -12,6 +12,9 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
+@Tag(name = "02. Task [담당자]")
 @RestController
 @RequestMapping("/api/team-status")
 @RequiredArgsConstructor
@@ -21,8 +24,9 @@ public class TeamStatusController {
     private final TeamStatusService teamStatusService;
     @Operation(summary = "팀 현황 필터링 조회 API")
     @GetMapping("/filter")
-    public ResponseEntity<TeamStatusResponse> filterTeamStatus(@Validated @ModelAttribute FilterTeamStatusRequest filter) {
+    public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute FilterTeamStatusRequest filter) {
         TeamStatusResponse response = teamStatusService.filterTeamStatus(filter);
-        return ResponseEntity.ok(response);
+        return ResponseEntity.ok(response != null ? response : new TeamStatusResponse(List.of(), 0, 0, 0));
     }
+
 }
\ No newline at end of file
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 ca989a80..6af2a11e 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -1,7 +1,7 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
+import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
@@ -18,7 +18,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;
-import org.springframework.http.ResponseEntity;
 
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index 48e6af25..93d54d6f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -5,8 +5,6 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
@@ -23,6 +21,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.Optional;
 
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
 import static com.querydsl.core.types.Order.ASC;
@@ -58,44 +57,44 @@ public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pa
 
     @Override
     public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
-        // filter가 null인 경우에도 기본적으로 모든 데이터를 조회하도록 처리
+        // BooleanBuilder로 동적 필터링 적용
         BooleanBuilder builder = new BooleanBuilder();
 
-        // 필터가 null인 경우, 기본적으로 모든 데이터 조회
         if (filter != null) {
-            // 진행 중 또는 완료 대기 상태 필터링
             builder.and(taskEntity.taskStatus.in(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED));
 
-            // 담당자 ID 필터링
             if (memberId != null) {
                 builder.and(taskEntity.processor.memberId.eq(memberId));
             }
 
-            // 작업 타이틀 필터링
             if (filter.taskTitle() != null && !filter.taskTitle().isEmpty()) {
                 builder.and(taskEntity.title.containsIgnoreCase(filter.taskTitle()));
             }
 
-            // 1차 카테고리 필터링 (빈 배열인 경우, 필터링하지 않음)
             if (filter.mainCategoryIds() != null && !filter.mainCategoryIds().isEmpty()) {
                 builder.and(taskEntity.category.mainCategory.categoryId.in(filter.mainCategoryIds()));
             }
 
-            // 2차 카테고리 필터링 (빈 배열인 경우, 필터링하지 않음)
             if (filter.categoryIds() != null && !filter.categoryIds().isEmpty()) {
                 builder.and(taskEntity.category.categoryId.in(filter.categoryIds()));
             }
         }
 
         // 정렬 조건 적용
-        OrderSpecifier<?> orderBy = "기여도순".equals(filter != null ? filter.sortBy() : "")
-                ? new CaseBuilder()
-                .when(taskEntity.taskStatus.eq(TaskStatus.IN_PROGRESS)
-                        .or(taskEntity.taskStatus.eq(TaskStatus.PENDING_COMPLETED)))
-                .then(1)
-                .otherwise(0)
-                .desc()
-                : taskEntity.processor.nickname.asc();
+        String sortBy = Optional.ofNullable(filter).map(FilterTeamStatusRequest::sortBy).orElse(""); // Null-safe 처리
+
+        OrderSpecifier<?> orderBy;
+        if ("기여도순".equals(sortBy)) {
+            // 진행 중 + 완료 대기 상태의 개수를 기준으로 내림차순 정렬
+            orderBy = new CaseBuilder()
+                    .when(taskEntity.taskStatus.eq(TaskStatus.IN_PROGRESS)
+                            .or(taskEntity.taskStatus.eq(TaskStatus.PENDING_COMPLETED)))
+                    .then(taskEntity.count()) // 개수 기준으로 정렬
+                    .otherwise(0L)
+                    .desc();
+        } else {
+            orderBy = taskEntity.processor.nickname.asc(); // 기본 정렬 (담당자 이름 오름차순)
+        }
 
         // 쿼리 실행
         List<TaskEntity> taskEntities = queryFactory
@@ -104,6 +103,11 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
                 .orderBy(orderBy)
                 .fetch();
 
+        // null 또는 빈 리스트 처리
+        if (taskEntities == null || taskEntities.isEmpty()) {
+            return List.of(); // 빈 리스트 반환
+        }
+
         return taskEntities.stream()
                 .collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId()))
                 .entrySet().stream()
@@ -128,8 +132,12 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
                                     taskEntity.getCreatedAt()
                             )).collect(Collectors.toList());
 
-                    int inProgressTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count();
-                    int pendingTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count();
+                    int inProgressTaskCount = (int) entry.getValue().stream()
+                            .filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS)
+                            .count();
+                    int pendingTaskCount = (int) entry.getValue().stream()
+                            .filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED)
+                            .count();
                     int totalTaskCount = inProgressTaskCount + pendingTaskCount;
 
                     return new TeamTaskResponse(
@@ -137,17 +145,17 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
                             entry.getValue().get(0).getProcessor().getNickname(),
                             entry.getValue().get(0).getProcessor().getImageUrl(),
                             entry.getValue().get(0).getProcessor().getDepartment().getName(),
-                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(),
-                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count(),
+                            inProgressTaskCount,
+                            pendingTaskCount,
                             entry.getValue().size(),
                             taskResponses
                     );
                 }).collect(Collectors.toList());
-
     }
 
 
 
+
     private boolean isValidTitle(FilterTeamStatusRequest filter) {
         return filter.taskTitle() != null && !filter.taskTitle().isEmpty();
     }
diff --git a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
index f68a80ef..1158c0ff 100644
--- a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
@@ -2,6 +2,8 @@
 
 
 import clap.server.adapter.inbound.web.dto.task.response.*;
+import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
@@ -193,4 +195,61 @@ public static FindManagersResponse toFindManagersResponse(Member manager, int re
                 remainingTasks
         );
     }
+
+    public static TeamStatusResponse toTeamStatusResponse(List<TaskEntity> taskEntities) {
+        // 담당자별로 그룹화
+        Map<Long, List<TaskEntity>> tasksByProcessor = taskEntities.stream()
+                .collect(Collectors.groupingBy(taskEntity -> taskEntity.getProcessor().getMemberId()));
+
+        List<TeamTaskResponse> memberResponses = tasksByProcessor.entrySet().stream()
+                .map(entry -> {
+                    List<TeamTaskItemResponse> teamtaskItemResponses = entry.getValue().stream()
+                            .map(TaskResponseMapper::toTeamTaskItemResponse)
+                            .collect(Collectors.toList());
+
+                    return new TeamTaskResponse(
+                            entry.getKey(),
+                            entry.getValue().get(0).getProcessor().getNickname(),
+                            entry.getValue().get(0).getProcessor().getImageUrl(),
+                            entry.getValue().get(0).getProcessor().getDepartment().getName(),
+                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(),
+                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count(),
+                            entry.getValue().size(),
+                            teamtaskItemResponses
+                    );
+                })
+                .collect(Collectors.toList());
+
+        return new TeamStatusResponse(memberResponses);
+    }
+
+    public static TeamTaskItemResponse toTeamTaskItemResponse(TaskEntity taskEntity) {
+        return new TeamTaskItemResponse(
+                taskEntity.getTaskId(),
+                taskEntity.getTaskCode(),
+                taskEntity.getTitle(),
+                taskEntity.getCategory().getMainCategory().getName(),
+                taskEntity.getCategory().getName(),
+                taskEntity.getLabel() != null ? toLabelInfo(taskEntity.getLabel()) : null,
+                taskEntity.getRequester().getNickname(),
+                taskEntity.getRequester().getImageUrl(),
+                taskEntity.getRequester().getDepartment().getName(),
+                taskEntity.getProcessorOrder(),
+                taskEntity.getTaskStatus(),
+                taskEntity.getCreatedAt()
+        );
+    }
+
+    public static TeamTaskItemResponse.LabelInfo toLabelInfo(LabelEntity label) { // Label → LabelEntity로 변경
+        return new TeamTaskItemResponse.LabelInfo(
+                label.getLabelName(),
+                label.getLabelColor()
+        );
+    }
+
+
+
+
+
+
 }
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 5b6e5ac8..f87f8f93 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -22,12 +22,18 @@ public TeamStatusService(LoadTaskPort loadTaskPort) {
     @Override
     public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(memberId, filter);
+        if (members == null) {
+            members = List.of();
+        }
         return new TeamStatusResponse(members);
     }
 
     @Override
     public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
+        if (members == null) {
+            members = List.of();
+        }
         return new TeamStatusResponse(members);
     }
 
diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
deleted file mode 100644
index 3b653581..00000000
--- a/src/main/resources/env.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DATABASE_HOST=localhost
-DATABASE_PORT=3306
-DATABASE_NAME=taskflow
-DATABASE_USERNAME=root
-DATABASE_PASSWORD=km7971na
-
-KAKAO_REGION=kr-central-2
-KAKAO_OBJECT_STORAGE_ENDPOINT=https://objectstorage.kr-central-2.kakaocloud.com
-KAKAO_OBJECT_STORAGE_ACCESS_KEY=253474a41cb447f4ad3c38e0ed9963c4
-KAKAO_OBJECT_STORAGE_SECRET_KEY=74861656e46845488ec4357f155fa3ed
-KAKAO_OBJECT_STORAGE_BUCKET_NAME=taskflow
-KAKAO_PROJECT_ID=34481374c1ee4bbb8745df43e4c13fff
-
-
-TASKFLOW_SERVICE_SERVER=210.109.59.9:9090
-
-SWAGGER_SERVER_URL=http://210.109.59.9:9090
-
-
-KAKAOWORK_WEBHOOK_URL=https://api.kakaowork.com/v1/messages.send_by_email
-KAKAOWORK_WEBHOOK_AUTH=Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
-AGIT_WEBHOOK_URL=https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
-MAIL_USERNAME=leegd120@gmail.com
-MAIL_PASSWORD=znlictzarqurxlla
-
-JIRA_BASE_URL=https://gachon-clap.atlassian.net/
-JIRA_API_KEY=ATATT3xFfGF0Y1TU8ydsORKL7aKLur-FQ4xppSEWLlhMyZE4Jx1zGA-2kvcxDj-A1ahlFVrZ6fVTsqesUT7QZhEoaiyFiq48oQ-hGVoXe-oZxg3civZcxJ4JNDDOgv26IjBAP39VsX3CjF7gfptNGX-iHz5f5_AXs4vlLT4SaQY5XB-Yk66DH0A=11BEF509
-JIRA_USER_EMAIL=joowojr@gmail.com
-PAT_TOKEN=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
-

From 844b838500ef7d0caee586f768edc6122f313db0 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 09:12:02 +0900
Subject: [PATCH 33/56] =?UTF-8?q?CLAP-256=20fix:=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/task/constant/TaskStatus.java      |   2 +-
 .../task/TeamStatusControllerTest.java        | 414 ++++++++++++++++++
 2 files changed, 415 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java

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 297909a7..33900952 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
@@ -8,7 +8,7 @@
 public enum TaskStatus {
     REQUESTED("요청"),
     IN_PROGRESS("진행 중"),
-    IN_REVIEWING("완료 대기"),
+    IN_REVIEWING("검토중"),
     COMPLETED("완료"),
     TERMINATED("종료");
 
diff --git a/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java b/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java
new file mode 100644
index 00000000..ffb8a95c
--- /dev/null
+++ b/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java
@@ -0,0 +1,414 @@
+package clap.server.application.service.task;
+
+import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
+import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
+import clap.server.adapter.inbound.web.task.TeamStatusController;
+import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
+import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
+import clap.server.application.mapper.TaskResponseMapper;
+import clap.server.application.port.outbound.task.LoadTaskPort;
+import clap.server.domain.model.task.Task;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@Testcontainers
+@TestPropertySource(properties = "spring.flyway.enabled=false")
+@AutoConfigureMockMvc
+@ExtendWith(MockitoExtension.class)
+class TeamStatusControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private TeamStatusController teamStatusController;
+
+    @MockBean
+    private TeamStatusService teamStatusService;
+
+    @Mock
+    private LoadTaskPort loadTaskPort;
+
+    @Autowired
+    private TaskPersistenceMapper taskPersistenceMapper;
+
+
+    @Container
+    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer(DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:7.17.5"))
+            .withReuse(true);
+
+    @DynamicPropertySource
+    static void elasticProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.elasticsearch.uris", ES_CONTAINER::getHttpHostAddress);
+    }
+
+    @Test
+    void filterTeamStatus_validRequest_shouldReturnValidResponse() {
+        // Mock 응답 설정
+        TeamStatusResponse mockResponse = new TeamStatusResponse(List.of(
+                new TeamTaskResponse(
+                        1L, "사용자1", "imageUrl1", "부서1", 2, 1, 3,
+                        List.of(new TeamTaskItemResponse(
+                                1L, "taskCode1", "타이틀1", "카테고리1", "카테고리2",
+                                new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
+                                "요청자1", "imageUrl1", "부서1", 1, TaskStatus.IN_PROGRESS,
+                                LocalDateTime.now()
+                        ))
+                )
+        ));
+
+        // MockBean 동작 설정
+        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
+                .thenReturn(mockResponse);
+
+        // 필터 객체 생성
+        FilterTeamStatusRequest filter = new FilterTeamStatusRequest(
+                "기여도순", List.of(1L, 2L), List.of(1L, 2L), "타이틀1"
+        );
+
+        // 컨트롤러 메서드 호출
+        ResponseEntity<TeamStatusResponse> responseEntity = teamStatusController.filterTeamStatus(filter);
+
+        // 응답 값 검증
+        assertThat(responseEntity.getStatusCodeValue()).isEqualTo(200);
+        assertThat(responseEntity.getBody()).isNotNull();
+        assertThat(responseEntity.getBody().members()).isNotEmpty();
+    }
+
+
+    @Test
+    void filterTeamStatus_invalidRequest_shouldReturnValidResponse() {
+        // 잘못된 필터 객체 생성 (빈 리스트 혹은 null 값)
+        FilterTeamStatusRequest filter = new FilterTeamStatusRequest(
+                "", // 잘못된 정렬 기준
+                null, // 잘못된 1차 카테고리 ID 목록
+                null, // 잘못된 2차 카테고리 ID 목록
+                "" // 잘못된 작업 타이틀
+        );
+
+        // 컨트롤러 메서드 호출
+        ResponseEntity<TeamStatusResponse> responseEntity = teamStatusController.filterTeamStatus(filter);
+
+        // 200 OK를 확인
+        assertThat(responseEntity.getStatusCodeValue()).isEqualTo(200);
+    }
+
+
+    @Test
+    public void testFilterTeamStatus_validRequest_shouldReturnFilteredResults() throws Exception {
+        // mock 응답 설정: 예상되는 데이터
+        List<TeamTaskResponse> mockResponseData = List.of(
+                new TeamTaskResponse(
+                        1L,
+                        "사용자1",
+                        "imageUrl1",
+                        "부서1",
+                        2,
+                        1,
+                        3,
+                        List.of(
+                                new TeamTaskItemResponse(
+                                        1L,
+                                        "taskCode1",
+                                        "타이틀1",
+                                        "카테고리1",
+                                        "카테고리2",
+                                        new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
+                                        "요청자1",
+                                        "imageUrl1",
+                                        "부서1",
+                                        1,
+                                        TaskStatus.IN_PROGRESS,
+                                        LocalDateTime.now())
+                        )
+                )
+        );
+
+        // mock 동작 설정: filterTeamStatus 메소드를 호출
+        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
+                .thenReturn(new TeamStatusResponse(mockResponseData));
+
+        // mockMvc 요청 수행: 필터링된 결과 확인
+        mockMvc.perform(get("/api/team-status/filter")
+                        .param("sortBy", "기여도순")  // 정렬 기준
+                        .param("mainCategoryIds", "1")  // 1차 카테고리 ID 목록
+                        .param("categoryIds", "2")  // 2차 카테고리 ID 목록
+                        .param("taskTitle", "타이틀1"))  // 작업 타이틀
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.members").exists())  // members가 존재하는지 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].title").value("타이틀1"))  // 첫 번째 작업의 타이틀 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].taskStatus").value("IN_PROGRESS"))  // 작업 상태 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].requesterNickname").value("요청자1"))  // 요청자 닉네임 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].requesterImageUrl").value("imageUrl1"))  // 요청자 이미지 URL 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].requesterDepartment").value("부서1"))  // 요청자 부서 확인
+                .andDo(print());
+    }
+
+
+
+    @Test
+    public void testFilterTeamStatus_emptyResponse_shouldReturnEmpty() throws Exception {
+        // mock 응답 설정: 빈 리스트 반환 (조건에 맞는 작업이 없는 경우)
+        List<TeamTaskResponse> mockResponseData = List.of();
+
+        /// mock 동작 설정: filterTeamStatus 메소드를 호출
+        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
+                .thenReturn(new TeamStatusResponse(mockResponseData));
+
+        // mockMvc 요청 수행: 필터링된 결과가 없을 경우
+        mockMvc.perform(get("/api/team-status/filter")
+                        .param("sortBy", "기여도순")  // 정렬 기준
+                        .param("mainCategoryIds", "1")  // 1차 카테고리 ID 목록
+                        .param("categoryIds", "2")  // 2차 카테고리 ID 목록
+                        .param("taskTitle", "타이틀1"))  // 작업 타이틀
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.members").isEmpty());  // members가 비어 있는지 확인
+    }
+
+    @Test
+    public void testFilterTeamStatus_noFilters_shouldReturnDefaultResults() throws Exception {
+        // mock 응답 설정: 기본 정렬된 데이터
+        List<TeamTaskResponse> mockResponseData = List.of(
+                new TeamTaskResponse(
+                        2L, "사용자A", "imageUrlA", "부서A", 1, 0, 1,
+                        List.of(new TeamTaskItemResponse(
+                                2L, "taskCode2", "타이틀2", "카테고리1", "카테고리2",
+                                new TeamTaskItemResponse.LabelInfo("라벨2", LabelColor.BLUE),
+                                "요청자A", "imageUrlA", "부서A", 2, TaskStatus.IN_REVIEWING,
+                                LocalDateTime.now()
+                        ))
+                ),
+                new TeamTaskResponse(
+                        1L, "사용자B", "imageUrlB", "부서B", 2, 1, 3,
+                        List.of(new TeamTaskItemResponse(
+                                1L, "taskCode1", "타이틀1", "카테고리1", "카테고리2",
+                                new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
+                                "요청자B", "imageUrlB", "부서B", 1, TaskStatus.IN_PROGRESS,
+                                LocalDateTime.now()
+                        ))
+                )
+        );
+
+        // mock 동작 설정: filterTeamStatus 메소드를 호출하면 기본 정렬된 데이터를 반환
+        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
+                .thenReturn(new TeamStatusResponse(mockResponseData));
+
+        // mockMvc 요청 수행: 필터 없이 요청
+        mockMvc.perform(get("/api/team-status/filter"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.members").exists())  // members 리스트가 존재하는지 확인
+                .andExpect(jsonPath("$.members.length()").value(2))  // 예상 데이터 개수 확인
+                .andExpect(jsonPath("$.members[0].nickname").value("사용자A"))  // 기본 정렬(이름 오름차순) 확인
+                .andExpect(jsonPath("$.members[1].nickname").value("사용자B"))
+                .andDo(print());
+    }
+    @Test
+    public void testEmptyValues() {
+        // Given: empty values for parameters
+        FilterTeamStatusRequest request = new FilterTeamStatusRequest(
+                "",   // sortBy
+                List.of(),   // mainCategoryIds
+                List.of(),   // categoryIds
+                ""    // taskTitle
+        );
+
+        // Then: the default values should be applied for null-like values
+        Assertions.assertEquals("기본", request.sortBy());
+        Assertions.assertEquals(List.of(), request.mainCategoryIds());
+        Assertions.assertEquals(List.of(), request.categoryIds());
+        Assertions.assertEquals("", request.taskTitle());
+    }
+    @Test
+    void testFilterTeamStatusRequest_DefaultValues() {
+        // 모든 값이 null로 들어오는 경우
+        FilterTeamStatusRequest request = new FilterTeamStatusRequest(null, null, null, null);
+
+        Assertions.assertEquals("기본", request.sortBy()); // 기본값 적용 확인
+        Assertions.assertEquals(List.of(), request.mainCategoryIds()); // 빈 리스트로 변환 확인
+        Assertions.assertEquals(List.of(), request.categoryIds()); // 빈 리스트로 변환 확인
+        Assertions.assertEquals("", request.taskTitle()); // 빈 문자열 변환 확인
+    }
+
+    @Test
+    void testFilterTeamStatusRequest_WithValues() {
+        // 특정 값이 들어온 경우
+        FilterTeamStatusRequest request = new FilterTeamStatusRequest("기여도순", List.of(1L, 2L), List.of(3L), "테스트");
+
+        assertEquals("기여도순", request.sortBy());
+        assertEquals(List.of(1L, 2L), request.mainCategoryIds());
+        assertEquals(List.of(3L), request.categoryIds());
+        assertEquals("테스트", request.taskTitle());
+    }
+    @Test
+    void testFilterTeamStatus_DefaultValues() throws Exception {
+        mockMvc.perform(get("/api/team-status/filter"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.members").isArray()) // 빈 배열인지 확인
+                .andExpect(jsonPath("$.totalInProgressTaskCount").value(0))
+                .andExpect(jsonPath("$.totalPendingTaskCount").value(0))
+                .andExpect(jsonPath("$.totalTaskCount").value(0));
+    }
+
+    @Test
+    void testFilterTeamStatus_WithValues() throws Exception {
+        mockMvc.perform(get("/api/team-status/filter")
+                        .param("sortBy", "기여도순")
+                        .param("mainCategoryIds", "10,20")
+                        .param("categoryIds", "1,2")
+                        .param("taskTitle", "테스트"))
+                .andExpect(status().isOk());
+    }
+
+
+
+    @Test
+    void givenTaskEntity_whenMappedToDomain_thenShouldConvertCorrectly() {
+        // Given
+        TaskEntity taskEntity = createSampleTaskEntity();
+
+        // When
+        Task task = taskPersistenceMapper.toDomain(taskEntity);
+
+        // Then
+        assertNotNull(task);
+        assertEquals(taskEntity.getTaskId(), task.getTaskId());
+        assertEquals(taskEntity.getTitle(), task.getTitle());
+        assertEquals(taskEntity.getTaskStatus(), task.getTaskStatus());
+        assertEquals(taskEntity.getProcessor().getNickname(), task.getProcessor().getNickname());
+    }
+
+    @Test
+    void givenTaskEntities_whenMappedToTeamTaskResponse_thenShouldConvertCorrectly() {
+        // Given
+        List<TaskEntity> taskEntities = List.of(createSampleTaskEntity(), createSampleTaskEntity());
+
+        // When
+        TeamStatusResponse response = TaskResponseMapper.toTeamStatusResponse(taskEntities);
+
+        // Then
+        assertNotNull(response);
+        assertFalse(response.members().isEmpty());
+        assertEquals(2, response.members().get(0).totalTaskCount());
+    }
+
+    private TaskEntity createSampleTaskEntity() {
+        MemberEntity processor = MemberEntity.builder()
+                .memberId(1L)
+                .nickname("닉네임")
+                .imageUrl("이미지 URL")
+                .department(DepartmentEntity.builder().name("개발팀").build()) // Builder 사용
+                .build();
+
+        MemberEntity requester = MemberEntity.builder()
+                .memberId(2L)
+                .nickname("요청자 닉네임")
+                .imageUrl("요청자 이미지 URL")
+                .department(DepartmentEntity.builder().name("운영팀").build()) // Builder 사용
+                .build();
+
+        CategoryEntity category = CategoryEntity.builder()
+                .categoryId(10L)
+                .name("기본 카테고리")
+                .mainCategory(CategoryEntity.builder().categoryId(1L).name("메인 카테고리").build())
+                .build();
+
+        LabelEntity label = LabelEntity.builder()
+                .labelName("긴급")
+                .labelColor(LabelColor.RED)
+                .build();
+
+        return TaskEntity.builder()
+                .taskId(100L)
+                .taskCode("TASK-001")
+                .title("테스트 작업")
+                .category(category)
+                .label(label)
+                .requester(requester)
+                .processor(processor)
+                .processorOrder(1L)
+                .taskStatus(TaskStatus.IN_PROGRESS)
+                .createdAt(LocalDateTime.now())
+                .build();
+    }
+    @Test
+    public void testFilterTeamStatusss() throws Exception {
+        // Given
+        String sortBy = "기여도순";
+        String mainCategoryIds = "1,3";
+        String categoryIds = "4,5";
+        String taskTitle = "hi";
+
+        // Create mock TeamTaskItemResponse
+        TeamTaskItemResponse item1 = new TeamTaskItemResponse(
+                1L, "T001", "Task 1", "MainCategory1", "Category1", null, "Requester1", "url1", "Dept1", 1, TaskStatus.IN_PROGRESS, null);
+
+        TeamTaskItemResponse item2 = new TeamTaskItemResponse(
+                2L, "T002", "Task 2", "MainCategory2", "Category2", null, "Requester2", "url2", "Dept2", 2, TaskStatus.IN_REVIEWING, null);
+
+        // Create mock TeamTaskResponse
+        TeamTaskResponse mockResponse = new TeamTaskResponse(
+                1L, "Processor1", "url1", "Dept1", 1, 1, 2, List.of(item1, item2)
+        );
+
+        // Mock the service response
+        when(teamStatusService.filterTeamStatus(new FilterTeamStatusRequest(sortBy, List.of(1L, 3L), List.of(4L, 5L), taskTitle)))
+                .thenReturn(new TeamStatusResponse(List.of(mockResponse)));
+
+        // When + Then
+        mockMvc.perform(get("/api/team-status/filter")
+                        .param("sortBy", sortBy)
+                        .param("mainCategoryIds", mainCategoryIds)
+                        .param("categoryIds", categoryIds)
+                        .param("taskTitle", taskTitle)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.members").isArray())  // JSON 응답에서 'members'가 배열인지를 확인
+                .andExpect(jsonPath("$.members.length()").value(1))  // 'members' 배열의 길이가 1인지 확인
+                .andExpect(jsonPath("$.members[0].tasks.length()").value(2))  // tasks 배열 길이 확인
+                .andExpect(jsonPath("$.members[0].tasks[0].taskId").value(1))  // 첫 번째 Task ID 확인
+                .andExpect(jsonPath("$.members[0].tasks[1].taskId").value(2));  // 두 번째 Task ID 확인
+    }
+
+}
+
+

From 893715e1e85cb2d566e829f4a74bf27a9332da95 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 09:13:02 +0900
Subject: [PATCH 34/56] =?UTF-8?q?CLAP-256=20fix:=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/TeamStatusControllerTest.java        | 414 ------------------
 1 file changed, 414 deletions(-)
 delete mode 100644 src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java

diff --git a/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java b/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java
deleted file mode 100644
index ffb8a95c..00000000
--- a/src/test/java/clap/server/application/service/task/TeamStatusControllerTest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package clap.server.application.service.task;
-
-import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
-import clap.server.adapter.inbound.web.task.TeamStatusController;
-import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
-import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
-import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
-import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
-import clap.server.application.mapper.TaskResponseMapper;
-import clap.server.application.port.outbound.task.LoadTaskPort;
-import clap.server.domain.model.task.Task;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-import org.springframework.test.web.servlet.MockMvc;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@SpringBootTest
-@Testcontainers
-@TestPropertySource(properties = "spring.flyway.enabled=false")
-@AutoConfigureMockMvc
-@ExtendWith(MockitoExtension.class)
-class TeamStatusControllerTest {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Autowired
-    private TeamStatusController teamStatusController;
-
-    @MockBean
-    private TeamStatusService teamStatusService;
-
-    @Mock
-    private LoadTaskPort loadTaskPort;
-
-    @Autowired
-    private TaskPersistenceMapper taskPersistenceMapper;
-
-
-    @Container
-    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer(DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:7.17.5"))
-            .withReuse(true);
-
-    @DynamicPropertySource
-    static void elasticProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.elasticsearch.uris", ES_CONTAINER::getHttpHostAddress);
-    }
-
-    @Test
-    void filterTeamStatus_validRequest_shouldReturnValidResponse() {
-        // Mock 응답 설정
-        TeamStatusResponse mockResponse = new TeamStatusResponse(List.of(
-                new TeamTaskResponse(
-                        1L, "사용자1", "imageUrl1", "부서1", 2, 1, 3,
-                        List.of(new TeamTaskItemResponse(
-                                1L, "taskCode1", "타이틀1", "카테고리1", "카테고리2",
-                                new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
-                                "요청자1", "imageUrl1", "부서1", 1, TaskStatus.IN_PROGRESS,
-                                LocalDateTime.now()
-                        ))
-                )
-        ));
-
-        // MockBean 동작 설정
-        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
-                .thenReturn(mockResponse);
-
-        // 필터 객체 생성
-        FilterTeamStatusRequest filter = new FilterTeamStatusRequest(
-                "기여도순", List.of(1L, 2L), List.of(1L, 2L), "타이틀1"
-        );
-
-        // 컨트롤러 메서드 호출
-        ResponseEntity<TeamStatusResponse> responseEntity = teamStatusController.filterTeamStatus(filter);
-
-        // 응답 값 검증
-        assertThat(responseEntity.getStatusCodeValue()).isEqualTo(200);
-        assertThat(responseEntity.getBody()).isNotNull();
-        assertThat(responseEntity.getBody().members()).isNotEmpty();
-    }
-
-
-    @Test
-    void filterTeamStatus_invalidRequest_shouldReturnValidResponse() {
-        // 잘못된 필터 객체 생성 (빈 리스트 혹은 null 값)
-        FilterTeamStatusRequest filter = new FilterTeamStatusRequest(
-                "", // 잘못된 정렬 기준
-                null, // 잘못된 1차 카테고리 ID 목록
-                null, // 잘못된 2차 카테고리 ID 목록
-                "" // 잘못된 작업 타이틀
-        );
-
-        // 컨트롤러 메서드 호출
-        ResponseEntity<TeamStatusResponse> responseEntity = teamStatusController.filterTeamStatus(filter);
-
-        // 200 OK를 확인
-        assertThat(responseEntity.getStatusCodeValue()).isEqualTo(200);
-    }
-
-
-    @Test
-    public void testFilterTeamStatus_validRequest_shouldReturnFilteredResults() throws Exception {
-        // mock 응답 설정: 예상되는 데이터
-        List<TeamTaskResponse> mockResponseData = List.of(
-                new TeamTaskResponse(
-                        1L,
-                        "사용자1",
-                        "imageUrl1",
-                        "부서1",
-                        2,
-                        1,
-                        3,
-                        List.of(
-                                new TeamTaskItemResponse(
-                                        1L,
-                                        "taskCode1",
-                                        "타이틀1",
-                                        "카테고리1",
-                                        "카테고리2",
-                                        new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
-                                        "요청자1",
-                                        "imageUrl1",
-                                        "부서1",
-                                        1,
-                                        TaskStatus.IN_PROGRESS,
-                                        LocalDateTime.now())
-                        )
-                )
-        );
-
-        // mock 동작 설정: filterTeamStatus 메소드를 호출
-        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
-                .thenReturn(new TeamStatusResponse(mockResponseData));
-
-        // mockMvc 요청 수행: 필터링된 결과 확인
-        mockMvc.perform(get("/api/team-status/filter")
-                        .param("sortBy", "기여도순")  // 정렬 기준
-                        .param("mainCategoryIds", "1")  // 1차 카테고리 ID 목록
-                        .param("categoryIds", "2")  // 2차 카테고리 ID 목록
-                        .param("taskTitle", "타이틀1"))  // 작업 타이틀
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.members").exists())  // members가 존재하는지 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].title").value("타이틀1"))  // 첫 번째 작업의 타이틀 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].taskStatus").value("IN_PROGRESS"))  // 작업 상태 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].requesterNickname").value("요청자1"))  // 요청자 닉네임 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].requesterImageUrl").value("imageUrl1"))  // 요청자 이미지 URL 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].requesterDepartment").value("부서1"))  // 요청자 부서 확인
-                .andDo(print());
-    }
-
-
-
-    @Test
-    public void testFilterTeamStatus_emptyResponse_shouldReturnEmpty() throws Exception {
-        // mock 응답 설정: 빈 리스트 반환 (조건에 맞는 작업이 없는 경우)
-        List<TeamTaskResponse> mockResponseData = List.of();
-
-        /// mock 동작 설정: filterTeamStatus 메소드를 호출
-        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
-                .thenReturn(new TeamStatusResponse(mockResponseData));
-
-        // mockMvc 요청 수행: 필터링된 결과가 없을 경우
-        mockMvc.perform(get("/api/team-status/filter")
-                        .param("sortBy", "기여도순")  // 정렬 기준
-                        .param("mainCategoryIds", "1")  // 1차 카테고리 ID 목록
-                        .param("categoryIds", "2")  // 2차 카테고리 ID 목록
-                        .param("taskTitle", "타이틀1"))  // 작업 타이틀
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.members").isEmpty());  // members가 비어 있는지 확인
-    }
-
-    @Test
-    public void testFilterTeamStatus_noFilters_shouldReturnDefaultResults() throws Exception {
-        // mock 응답 설정: 기본 정렬된 데이터
-        List<TeamTaskResponse> mockResponseData = List.of(
-                new TeamTaskResponse(
-                        2L, "사용자A", "imageUrlA", "부서A", 1, 0, 1,
-                        List.of(new TeamTaskItemResponse(
-                                2L, "taskCode2", "타이틀2", "카테고리1", "카테고리2",
-                                new TeamTaskItemResponse.LabelInfo("라벨2", LabelColor.BLUE),
-                                "요청자A", "imageUrlA", "부서A", 2, TaskStatus.IN_REVIEWING,
-                                LocalDateTime.now()
-                        ))
-                ),
-                new TeamTaskResponse(
-                        1L, "사용자B", "imageUrlB", "부서B", 2, 1, 3,
-                        List.of(new TeamTaskItemResponse(
-                                1L, "taskCode1", "타이틀1", "카테고리1", "카테고리2",
-                                new TeamTaskItemResponse.LabelInfo("라벨1", LabelColor.RED),
-                                "요청자B", "imageUrlB", "부서B", 1, TaskStatus.IN_PROGRESS,
-                                LocalDateTime.now()
-                        ))
-                )
-        );
-
-        // mock 동작 설정: filterTeamStatus 메소드를 호출하면 기본 정렬된 데이터를 반환
-        when(teamStatusService.filterTeamStatus(any(FilterTeamStatusRequest.class)))
-                .thenReturn(new TeamStatusResponse(mockResponseData));
-
-        // mockMvc 요청 수행: 필터 없이 요청
-        mockMvc.perform(get("/api/team-status/filter"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.members").exists())  // members 리스트가 존재하는지 확인
-                .andExpect(jsonPath("$.members.length()").value(2))  // 예상 데이터 개수 확인
-                .andExpect(jsonPath("$.members[0].nickname").value("사용자A"))  // 기본 정렬(이름 오름차순) 확인
-                .andExpect(jsonPath("$.members[1].nickname").value("사용자B"))
-                .andDo(print());
-    }
-    @Test
-    public void testEmptyValues() {
-        // Given: empty values for parameters
-        FilterTeamStatusRequest request = new FilterTeamStatusRequest(
-                "",   // sortBy
-                List.of(),   // mainCategoryIds
-                List.of(),   // categoryIds
-                ""    // taskTitle
-        );
-
-        // Then: the default values should be applied for null-like values
-        Assertions.assertEquals("기본", request.sortBy());
-        Assertions.assertEquals(List.of(), request.mainCategoryIds());
-        Assertions.assertEquals(List.of(), request.categoryIds());
-        Assertions.assertEquals("", request.taskTitle());
-    }
-    @Test
-    void testFilterTeamStatusRequest_DefaultValues() {
-        // 모든 값이 null로 들어오는 경우
-        FilterTeamStatusRequest request = new FilterTeamStatusRequest(null, null, null, null);
-
-        Assertions.assertEquals("기본", request.sortBy()); // 기본값 적용 확인
-        Assertions.assertEquals(List.of(), request.mainCategoryIds()); // 빈 리스트로 변환 확인
-        Assertions.assertEquals(List.of(), request.categoryIds()); // 빈 리스트로 변환 확인
-        Assertions.assertEquals("", request.taskTitle()); // 빈 문자열 변환 확인
-    }
-
-    @Test
-    void testFilterTeamStatusRequest_WithValues() {
-        // 특정 값이 들어온 경우
-        FilterTeamStatusRequest request = new FilterTeamStatusRequest("기여도순", List.of(1L, 2L), List.of(3L), "테스트");
-
-        assertEquals("기여도순", request.sortBy());
-        assertEquals(List.of(1L, 2L), request.mainCategoryIds());
-        assertEquals(List.of(3L), request.categoryIds());
-        assertEquals("테스트", request.taskTitle());
-    }
-    @Test
-    void testFilterTeamStatus_DefaultValues() throws Exception {
-        mockMvc.perform(get("/api/team-status/filter"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.members").isArray()) // 빈 배열인지 확인
-                .andExpect(jsonPath("$.totalInProgressTaskCount").value(0))
-                .andExpect(jsonPath("$.totalPendingTaskCount").value(0))
-                .andExpect(jsonPath("$.totalTaskCount").value(0));
-    }
-
-    @Test
-    void testFilterTeamStatus_WithValues() throws Exception {
-        mockMvc.perform(get("/api/team-status/filter")
-                        .param("sortBy", "기여도순")
-                        .param("mainCategoryIds", "10,20")
-                        .param("categoryIds", "1,2")
-                        .param("taskTitle", "테스트"))
-                .andExpect(status().isOk());
-    }
-
-
-
-    @Test
-    void givenTaskEntity_whenMappedToDomain_thenShouldConvertCorrectly() {
-        // Given
-        TaskEntity taskEntity = createSampleTaskEntity();
-
-        // When
-        Task task = taskPersistenceMapper.toDomain(taskEntity);
-
-        // Then
-        assertNotNull(task);
-        assertEquals(taskEntity.getTaskId(), task.getTaskId());
-        assertEquals(taskEntity.getTitle(), task.getTitle());
-        assertEquals(taskEntity.getTaskStatus(), task.getTaskStatus());
-        assertEquals(taskEntity.getProcessor().getNickname(), task.getProcessor().getNickname());
-    }
-
-    @Test
-    void givenTaskEntities_whenMappedToTeamTaskResponse_thenShouldConvertCorrectly() {
-        // Given
-        List<TaskEntity> taskEntities = List.of(createSampleTaskEntity(), createSampleTaskEntity());
-
-        // When
-        TeamStatusResponse response = TaskResponseMapper.toTeamStatusResponse(taskEntities);
-
-        // Then
-        assertNotNull(response);
-        assertFalse(response.members().isEmpty());
-        assertEquals(2, response.members().get(0).totalTaskCount());
-    }
-
-    private TaskEntity createSampleTaskEntity() {
-        MemberEntity processor = MemberEntity.builder()
-                .memberId(1L)
-                .nickname("닉네임")
-                .imageUrl("이미지 URL")
-                .department(DepartmentEntity.builder().name("개발팀").build()) // Builder 사용
-                .build();
-
-        MemberEntity requester = MemberEntity.builder()
-                .memberId(2L)
-                .nickname("요청자 닉네임")
-                .imageUrl("요청자 이미지 URL")
-                .department(DepartmentEntity.builder().name("운영팀").build()) // Builder 사용
-                .build();
-
-        CategoryEntity category = CategoryEntity.builder()
-                .categoryId(10L)
-                .name("기본 카테고리")
-                .mainCategory(CategoryEntity.builder().categoryId(1L).name("메인 카테고리").build())
-                .build();
-
-        LabelEntity label = LabelEntity.builder()
-                .labelName("긴급")
-                .labelColor(LabelColor.RED)
-                .build();
-
-        return TaskEntity.builder()
-                .taskId(100L)
-                .taskCode("TASK-001")
-                .title("테스트 작업")
-                .category(category)
-                .label(label)
-                .requester(requester)
-                .processor(processor)
-                .processorOrder(1L)
-                .taskStatus(TaskStatus.IN_PROGRESS)
-                .createdAt(LocalDateTime.now())
-                .build();
-    }
-    @Test
-    public void testFilterTeamStatusss() throws Exception {
-        // Given
-        String sortBy = "기여도순";
-        String mainCategoryIds = "1,3";
-        String categoryIds = "4,5";
-        String taskTitle = "hi";
-
-        // Create mock TeamTaskItemResponse
-        TeamTaskItemResponse item1 = new TeamTaskItemResponse(
-                1L, "T001", "Task 1", "MainCategory1", "Category1", null, "Requester1", "url1", "Dept1", 1, TaskStatus.IN_PROGRESS, null);
-
-        TeamTaskItemResponse item2 = new TeamTaskItemResponse(
-                2L, "T002", "Task 2", "MainCategory2", "Category2", null, "Requester2", "url2", "Dept2", 2, TaskStatus.IN_REVIEWING, null);
-
-        // Create mock TeamTaskResponse
-        TeamTaskResponse mockResponse = new TeamTaskResponse(
-                1L, "Processor1", "url1", "Dept1", 1, 1, 2, List.of(item1, item2)
-        );
-
-        // Mock the service response
-        when(teamStatusService.filterTeamStatus(new FilterTeamStatusRequest(sortBy, List.of(1L, 3L), List.of(4L, 5L), taskTitle)))
-                .thenReturn(new TeamStatusResponse(List.of(mockResponse)));
-
-        // When + Then
-        mockMvc.perform(get("/api/team-status/filter")
-                        .param("sortBy", sortBy)
-                        .param("mainCategoryIds", mainCategoryIds)
-                        .param("categoryIds", categoryIds)
-                        .param("taskTitle", taskTitle)
-                        .accept(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.members").isArray())  // JSON 응답에서 'members'가 배열인지를 확인
-                .andExpect(jsonPath("$.members.length()").value(1))  // 'members' 배열의 길이가 1인지 확인
-                .andExpect(jsonPath("$.members[0].tasks.length()").value(2))  // tasks 배열 길이 확인
-                .andExpect(jsonPath("$.members[0].tasks[0].taskId").value(1))  // 첫 번째 Task ID 확인
-                .andExpect(jsonPath("$.members[0].tasks[1].taskId").value(2));  // 두 번째 Task ID 확인
-    }
-
-}
-
-

From 0e4b6d77e557a23718ab1b2620a18170c6bdcd5c Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 09:42:18 +0900
Subject: [PATCH 35/56] =?UTF-8?q?CLAP-256=20fix:=20mapper=20statuslabel=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

---
 .../java/clap/server/application/mapper/TaskResponseMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
index ccba5b57..1d3effdb 100644
--- a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
+++ b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java
@@ -213,7 +213,7 @@ public static TeamStatusResponse toTeamStatusResponse(List<TaskEntity> taskEntit
                             entry.getValue().get(0).getProcessor().getImageUrl(),
                             entry.getValue().get(0).getProcessor().getDepartment().getName(),
                             (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(),
-                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count(),
+                            (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_REVIEWING).count(),
                             entry.getValue().size(),
                             teamtaskItemResponses
                     );

From edca9093de5c9e7fd5a4f7c1e86c1a4af8b8656d Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 12:43:46 +0900
Subject: [PATCH 36/56] =?UTF-8?q?CLAP-256=20Fix=20:=20=ED=8C=80=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=20=ED=98=84=ED=99=A9=20=ED=95=84=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #281
---
 .../outbound/persistense/repository/task/TaskRepository.java | 5 +----
 .../server/application/service/task/TeamStatusService.java   | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

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 c1df73a3..39e3bdab 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
@@ -6,15 +6,12 @@
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import io.lettuce.core.dynamic.annotation.Param;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.Collection;
-
 import java.util.List;
 import java.util.Optional;
 
@@ -52,7 +49,7 @@ List<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndProcessorOrderAfterOrderByProcessorOrderAsc(
             Long processorId, TaskStatus taskStatus, Long processorOrder);
 
-    @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
+//    @Query("SELECT t FROM TaskEntity t JOIN FETCH t.processor p WHERE (:memberId IS NULL OR p.memberId = :memberId) ")
     List<TeamTaskResponse> findTeamStatus(@Param("memberId") Long memberId, FilterTeamStatusRequest filter);
 
     Optional<TaskEntity> findTopByProcessor_MemberIdAndTaskStatusAndTaskIdLessThanOrderByTaskIdDesc(Long processorId, TaskStatus taskStatus, Long taskId);
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index f87f8f93..6fc2be25 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -1,12 +1,13 @@
 package clap.server.application.service.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.application.port.inbound.task.FilterTeamStatusUsecase;
 import clap.server.application.port.inbound.task.LoadTeamStatusUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -29,6 +30,7 @@ public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest f
     }
 
     @Override
+    @Transactional(readOnly = true)
     public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
         if (members == null) {

From b6929d68ab3a44bcf8f6da6830b35404048e25d3 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 14:16:22 +0900
Subject: [PATCH 37/56] =?UTF-8?q?CLAP-299=20Feature=20:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=9E=91=EC=97=85=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #352
---
 .../web/task/CancelTaskController.java        | 26 +++++++++++++++++++
 .../port/inbound/task/CancelTaskUsecase.java  |  5 ++++
 .../service/task/CancelTaskService.java       | 21 +++++++++++++++
 .../clap/server/domain/model/task/Task.java   |  5 ++++
 4 files changed, 57 insertions(+)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java
 create mode 100644 src/main/java/clap/server/application/service/task/CancelTaskService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
new file mode 100644
index 00000000..74d476ca
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
@@ -0,0 +1,26 @@
+package clap.server.adapter.inbound.web.task;
+
+import clap.server.application.port.inbound.task.CancelTaskUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "02. Task [거부 & 종료]")
+@RequestMapping("/api/tasks")
+@RequiredArgsConstructor
+@WebAdapter
+public class CancelTaskController {
+    private final CancelTaskUsecase cancelTaskUsecase;
+
+    @Operation(summary = "작업 취소")
+    @Secured("ROLE_USER")
+    @PatchMapping("/{taskId}/cancle")
+    public void cancelTask(@PathVariable Long taskId) {
+        cancelTaskUsecase.cancleTask(taskId);
+    }
+}
diff --git a/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java
new file mode 100644
index 00000000..de1597b1
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/task/CancelTaskUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.task;
+
+public interface CancelTaskUsecase {
+    void cancleTask(Long taskId);
+}
diff --git a/src/main/java/clap/server/application/service/task/CancelTaskService.java b/src/main/java/clap/server/application/service/task/CancelTaskService.java
new file mode 100644
index 00000000..9fefe764
--- /dev/null
+++ b/src/main/java/clap/server/application/service/task/CancelTaskService.java
@@ -0,0 +1,21 @@
+package clap.server.application.service.task;
+
+import clap.server.application.port.inbound.domain.TaskService;
+import clap.server.application.port.inbound.task.CancelTaskUsecase;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Task;
+import lombok.RequiredArgsConstructor;
+
+
+@ApplicationService
+@RequiredArgsConstructor
+public class CancelTaskService implements CancelTaskUsecase {
+    private final TaskService taskService;
+
+    @Override
+    public void cancleTask(Long taskId) {
+        Task task = taskService.findById(taskId);
+        task.cancelTask();
+        taskService.upsert(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 62b44f68..1a8985b3 100644
--- a/src/main/java/clap/server/domain/model/task/Task.java
+++ b/src/main/java/clap/server/domain/model/task/Task.java
@@ -102,4 +102,9 @@ private static String toTaskCode(Category category) {
     public void updateProcessorOrder(long newProcessorOrder) {
         this.processorOrder = newProcessorOrder;
     }
+
+    public void cancelTask() {
+        this.taskStatus = TaskStatus.TERMINATED;
+        this.finishedAt = LocalDateTime.now();
+    }
 }

From 3beb7c6cf0a4ce03706f34ed0f6421833767ec6e Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 14:20:00 +0900
Subject: [PATCH 38/56] =?UTF-8?q?CLAP-299=20Fix:=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=20=EC=9E=91=EC=97=85=20=EC=B7=A8=EC=86=8C=20api=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #352
---
 .../server/adapter/inbound/web/task/CancelTaskController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
index 74d476ca..5504860b 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/CancelTaskController.java
@@ -19,7 +19,7 @@ public class CancelTaskController {
 
     @Operation(summary = "작업 취소")
     @Secured("ROLE_USER")
-    @PatchMapping("/{taskId}/cancle")
+    @PatchMapping("/{taskId}/cancel")
     public void cancelTask(@PathVariable Long taskId) {
         cancelTaskUsecase.cancleTask(taskId);
     }

From 2bcb8f0b3cc9f0a34c5806fcd71ecfa81c61b2e0 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 15:09:48 +0900
Subject: [PATCH 39/56] =?UTF-8?q?CLAP-256=20=EC=A0=84=EC=B2=B4=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EC=88=98=20=EA=B3=84=EC=82=B0=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/task/TeamStatusService.java       |  9 +++++-
 src/main/resources/env.properties             | 31 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/env.properties

diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 6fc2be25..58a31fec 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -33,10 +33,17 @@ public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest f
     @Transactional(readOnly = true)
     public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
         List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
+
         if (members == null) {
             members = List.of();
         }
-        return new TeamStatusResponse(members);
+
+        // 전체 팀의 진행 중 & 검토 중 작업 수 계산
+        int totalInProgressTaskCount = members.stream().mapToInt(TeamTaskResponse::inProgressTaskCount).sum();
+        int totalInReviewingTaskCount = members.stream().mapToInt(TeamTaskResponse::inReviewingTaskCount).sum();
+
+        return new TeamStatusResponse(members, totalInProgressTaskCount, totalInReviewingTaskCount);
     }
 
+
 }
diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
new file mode 100644
index 00000000..3b653581
--- /dev/null
+++ b/src/main/resources/env.properties
@@ -0,0 +1,31 @@
+
+DATABASE_HOST=localhost
+DATABASE_PORT=3306
+DATABASE_NAME=taskflow
+DATABASE_USERNAME=root
+DATABASE_PASSWORD=km7971na
+
+KAKAO_REGION=kr-central-2
+KAKAO_OBJECT_STORAGE_ENDPOINT=https://objectstorage.kr-central-2.kakaocloud.com
+KAKAO_OBJECT_STORAGE_ACCESS_KEY=253474a41cb447f4ad3c38e0ed9963c4
+KAKAO_OBJECT_STORAGE_SECRET_KEY=74861656e46845488ec4357f155fa3ed
+KAKAO_OBJECT_STORAGE_BUCKET_NAME=taskflow
+KAKAO_PROJECT_ID=34481374c1ee4bbb8745df43e4c13fff
+
+
+TASKFLOW_SERVICE_SERVER=210.109.59.9:9090
+
+SWAGGER_SERVER_URL=http://210.109.59.9:9090
+
+
+KAKAOWORK_WEBHOOK_URL=https://api.kakaowork.com/v1/messages.send_by_email
+KAKAOWORK_WEBHOOK_AUTH=Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
+AGIT_WEBHOOK_URL=https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
+MAIL_USERNAME=leegd120@gmail.com
+MAIL_PASSWORD=znlictzarqurxlla
+
+JIRA_BASE_URL=https://gachon-clap.atlassian.net/
+JIRA_API_KEY=ATATT3xFfGF0Y1TU8ydsORKL7aKLur-FQ4xppSEWLlhMyZE4Jx1zGA-2kvcxDj-A1ahlFVrZ6fVTsqesUT7QZhEoaiyFiq48oQ-hGVoXe-oZxg3civZcxJ4JNDDOgv26IjBAP39VsX3CjF7gfptNGX-iHz5f5_AXs4vlLT4SaQY5XB-Yk66DH0A=11BEF509
+JIRA_USER_EMAIL=joowojr@gmail.com
+PAT_TOKEN=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
+

From 016b7cb4a76e5ea317564d4295f950844a0c09bd Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 15:12:21 +0900
Subject: [PATCH 40/56] =?UTF-8?q?fix:=20env=20=ED=8C=8C=EC=9D=BC=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

---
 src/main/resources/env.properties | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/main/resources/env.properties

diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
deleted file mode 100644
index 3b653581..00000000
--- a/src/main/resources/env.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DATABASE_HOST=localhost
-DATABASE_PORT=3306
-DATABASE_NAME=taskflow
-DATABASE_USERNAME=root
-DATABASE_PASSWORD=km7971na
-
-KAKAO_REGION=kr-central-2
-KAKAO_OBJECT_STORAGE_ENDPOINT=https://objectstorage.kr-central-2.kakaocloud.com
-KAKAO_OBJECT_STORAGE_ACCESS_KEY=253474a41cb447f4ad3c38e0ed9963c4
-KAKAO_OBJECT_STORAGE_SECRET_KEY=74861656e46845488ec4357f155fa3ed
-KAKAO_OBJECT_STORAGE_BUCKET_NAME=taskflow
-KAKAO_PROJECT_ID=34481374c1ee4bbb8745df43e4c13fff
-
-
-TASKFLOW_SERVICE_SERVER=210.109.59.9:9090
-
-SWAGGER_SERVER_URL=http://210.109.59.9:9090
-
-
-KAKAOWORK_WEBHOOK_URL=https://api.kakaowork.com/v1/messages.send_by_email
-KAKAOWORK_WEBHOOK_AUTH=Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
-AGIT_WEBHOOK_URL=https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
-MAIL_USERNAME=leegd120@gmail.com
-MAIL_PASSWORD=znlictzarqurxlla
-
-JIRA_BASE_URL=https://gachon-clap.atlassian.net/
-JIRA_API_KEY=ATATT3xFfGF0Y1TU8ydsORKL7aKLur-FQ4xppSEWLlhMyZE4Jx1zGA-2kvcxDj-A1ahlFVrZ6fVTsqesUT7QZhEoaiyFiq48oQ-hGVoXe-oZxg3civZcxJ4JNDDOgv26IjBAP39VsX3CjF7gfptNGX-iHz5f5_AXs4vlLT4SaQY5XB-Yk66DH0A=11BEF509
-JIRA_USER_EMAIL=joowojr@gmail.com
-PAT_TOKEN=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
-

From 0ddbf8e17141db9a19c1eb5609b9cdabae3f87df Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 15:15:54 +0900
Subject: [PATCH 41/56] =?UTF-8?q?fix:=20=EC=96=B4=EB=85=B8=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/adapter/inbound/web/task/TeamStatusController.java  | 1 -
 .../server/application/service/task/TeamStatusService.java     | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
index 7781eff2..1296af47 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 @Tag(name = "02. Task [담당자]")
-@RestController
 @RequestMapping("/api/team-status")
 @RequiredArgsConstructor
 @WebAdapter
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 58a31fec..20621813 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -6,12 +6,13 @@
 import clap.server.application.port.inbound.task.FilterTeamStatusUsecase;
 import clap.server.application.port.inbound.task.LoadTeamStatusUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
+import clap.server.common.annotation.architecture.ApplicationService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-@Service
+@ApplicationService
 public class TeamStatusService implements LoadTeamStatusUsecase, FilterTeamStatusUsecase {
 
     private final LoadTaskPort loadTaskPort;

From 0a35db027ee4971952daf13846550b867da12f53 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 15:19:24 +0900
Subject: [PATCH 42/56] =?UTF-8?q?fix:=20@RestController=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/adapter/inbound/web/task/TeamStatusController.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
index 7781eff2..0c32b0da 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 @Tag(name = "02. Task [담당자]")
-@RestController
 @RequestMapping("/api/team-status")
 @RequiredArgsConstructor
 @WebAdapter
@@ -29,4 +28,4 @@ public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute Filte
         return ResponseEntity.ok(response != null ? response : new TeamStatusResponse(List.of(), 0, 0, 0));
     }
 
-}
\ No newline at end of file
+}

From 9605488c8c2360eb3bd12929e526c731a5ccb323 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 15:20:18 +0900
Subject: [PATCH 43/56] =?UTF-8?q?fix:=20@ApplicationService=EB=A1=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

---
 .../clap/server/application/service/task/TeamStatusService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 58a31fec..f5f4e7b0 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -11,7 +11,7 @@
 
 import java.util.List;
 
-@Service
+@ApplicationService
 public class TeamStatusService implements LoadTeamStatusUsecase, FilterTeamStatusUsecase {
 
     private final LoadTaskPort loadTaskPort;

From 9a887972352bc093fe31bb5f99224239408fce46 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 15:30:05 +0900
Subject: [PATCH 44/56] =?UTF-8?q?CLAP-256=20Fix=20:=20TeamStatusService=20?=
 =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20import=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #281
---
 .../clap/server/application/service/task/TeamStatusService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index f5f4e7b0..28c2b4d2 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -6,7 +6,7 @@
 import clap.server.application.port.inbound.task.FilterTeamStatusUsecase;
 import clap.server.application.port.inbound.task.LoadTeamStatusUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
-import org.springframework.stereotype.Service;
+import clap.server.common.annotation.architecture.ApplicationService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

From 8aa18d207db6630201ad6a148402b44495f9167d Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 15:47:04 +0900
Subject: [PATCH 45/56] =?UTF-8?q?CLAP-256=20Fix=20:=20TeamStatusService=20?=
 =?UTF-8?q?Secured=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #281
---
 .../adapter/inbound/web/task/TeamStatusController.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
index 1296af47..e307c88e 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java
@@ -1,7 +1,6 @@
 package clap.server.adapter.inbound.web.task;
 
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
-
 import clap.server.adapter.inbound.web.dto.task.response.TeamStatusResponse;
 import clap.server.application.service.task.TeamStatusService;
 import clap.server.common.annotation.architecture.WebAdapter;
@@ -9,8 +8,10 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 
@@ -23,6 +24,7 @@ public class TeamStatusController {
     private final TeamStatusService teamStatusService;
     @Operation(summary = "팀 현황 필터링 조회 API")
     @GetMapping("/filter")
+    @Secured("ROLE_MANAGER")
     public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute FilterTeamStatusRequest filter) {
         TeamStatusResponse response = teamStatusService.filterTeamStatus(filter);
         return ResponseEntity.ok(response != null ? response : new TeamStatusResponse(List.of(), 0, 0, 0));

From 97ea235c0b48c702b07286126c2110da1d35aeed Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 16:54:29 +0900
Subject: [PATCH 46/56] =?UTF-8?q?fix:=20=ED=8C=80=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=ED=95=84=ED=84=B0=EB=A7=81=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=A0=95=EB=A0=AC?=
 =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/request/FilterTeamStatusRequest.java |  8 +++---
 .../inbound/web/dto/task/request/SortBy.java  | 17 +++++++++++++
 .../task/TaskCustomRepositoryImpl.java        | 25 +++++++++++++------
 .../service/task/TeamStatusService.java       |  1 +
 4 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/SortBy.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
index 6202642e..b4f315cf 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java
@@ -2,12 +2,11 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.List;
 
 public record FilterTeamStatusRequest(
         @Schema(description = "정렬 기준 (기여도순, 기본)", example = "기여도순")
-        String sortBy,
+        SortBy sortBy,  // Enum 타입으로 수정
 
         @Schema(description = "1차 카테고리 ID 목록", example = "[10, 20, 30]")
         List<Long> mainCategoryIds,
@@ -19,10 +18,11 @@ public record FilterTeamStatusRequest(
         String taskTitle
 ) {
         public FilterTeamStatusRequest {
-                sortBy = (sortBy == null || sortBy.isEmpty()) ? "기본" : sortBy;
+                // 기본값 설정
+                sortBy = (sortBy == null) ? SortBy.DEFAULT : sortBy;  // 기본값을 DEFAULT로 설정
                 mainCategoryIds = mainCategoryIds == null ? List.of() : mainCategoryIds;
                 categoryIds = categoryIds == null ? List.of() : categoryIds;
                 taskTitle = taskTitle == null ? "" : taskTitle;
         }
-
 }
+
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/SortBy.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/SortBy.java
new file mode 100644
index 00000000..eccc2231
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/SortBy.java
@@ -0,0 +1,17 @@
+package clap.server.adapter.inbound.web.dto.task.request;
+
+public enum SortBy {
+        DEFAULT("기본순"),
+        CONTRIBUTE("기여도순");
+
+        private final String value;
+
+        SortBy(String value) {
+                this.value = value;
+        }
+
+        public String getValue() {
+                return value;
+        }
+}
+
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index b14c3079..6c15c0f8 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
+import clap.server.adapter.inbound.web.dto.task.request.SortBy;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
@@ -87,14 +88,22 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
         }
 
         // 정렬 조건 적용
-        OrderSpecifier<?> orderBy = "기여도순".equals(filter != null ? filter.sortBy() : "")
-                ? new CaseBuilder()
-                .when(taskEntity.taskStatus.eq(TaskStatus.IN_PROGRESS)
-                        .or(taskEntity.taskStatus.eq(TaskStatus.IN_REVIEWING)))
-                .then(1)
-                .otherwise(0)
-                .desc()
-                : taskEntity.processor.nickname.asc();
+        SortBy sortBy = (filter != null && filter.sortBy() != null) ? filter.sortBy() : SortBy.DEFAULT;
+
+        assert filter != null;
+        OrderSpecifier<?> orderBy;
+        if (sortBy == SortBy.CONTRIBUTE) {
+            // 기여도순 (진행 중 + 검토 중 작업 개수 합 기준 내림차순)
+            orderBy = new CaseBuilder()
+                    .when(taskEntity.taskStatus.eq(TaskStatus.IN_PROGRESS)
+                            .or(taskEntity.taskStatus.eq(TaskStatus.IN_REVIEWING)))
+                    .then(1)
+                    .otherwise(0)
+                    .desc();
+        } else {
+            // 기본순 (닉네임 오름차순)
+            orderBy = taskEntity.processor.nickname.asc();
+        }
 
         // 쿼리 실행
         List<TaskEntity> taskEntities = queryFactory
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 20621813..c4ebe167 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -47,4 +47,5 @@ public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
     }
 
 
+
 }

From 21635ed37cd9ee836c0118827db69f26becdee54 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:02:00 +0900
Subject: [PATCH 47/56] Delete src/main/resources/env.properties

---
 src/main/resources/env.properties | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 src/main/resources/env.properties

diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties
deleted file mode 100644
index 01766b42..00000000
--- a/src/main/resources/env.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-
-DATABASE_HOST=localhost
-DATABASE_PORT=3306
-DATABASE_NAME=taskflow
-DATABASE_USERNAME=root
-DATABASE_PASSWORD=km7971na
-
-KAKAO_REGION=kr-central-2
-KAKAO_OBJECT_STORAGE_ENDPOINT=https://objectstorage.kr-central-2.kakaocloud.com
-KAKAO_OBJECT_STORAGE_ACCESS_KEY=253474a41cb447f4ad3c38e0ed9963c4
-KAKAO_OBJECT_STORAGE_SECRET_KEY=74861656e46845488ec4357f155fa3ed
-KAKAO_OBJECT_STORAGE_BUCKET_NAME=taskflow
-KAKAO_PROJECT_ID=34481374c1ee4bbb8745df43e4c13fff
-
-TASKFLOW_SERVICE_SERVER=210.109.59.9:9090
-
-SWAGGER_SERVER_URL=http://210.109.59.9:9090
-
-KAKAOWORK_WEBHOOK_URL=https://api.kakaowork.com/v1/messages.send_by_email
-KAKAOWORK_WEBHOOK_AUTH=Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
-AGIT_WEBHOOK_URL=https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
-MAIL_USERNAME=leegd120@gmail.com
-MAIL_PASSWORD=znlictzarqurxlla
-
-JIRA_BASE_URL=https://gachon-clap.atlassian.net/
-JIRA_API_KEY=ATATT3xFfGF0Y1TU8ydsORKL7aKLur-FQ4xppSEWLlhMyZE4Jx1zGA-2kvcxDj-A1ahlFVrZ6fVTsqesUT7QZhEoaiyFiq48oQ-hGVoXe-oZxg3civZcxJ4JNDDOgv26IjBAP39VsX3CjF7gfptNGX-iHz5f5_AXs4vlLT4SaQY5XB-Yk66DH0A=11BEF509
-JIRA_USER_EMAIL=joowojr@gmail.com
-PAT_TOKEN=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
-

From a1e9bebfa5835961541eb72f12bc0247e7657aad Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:02:46 +0900
Subject: [PATCH 48/56] Delete src/test/resources/application.yml

---
 src/test/resources/application.yml | 82 ------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 src/test/resources/application.yml

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
deleted file mode 100644
index 1a06da76..00000000
--- a/src/test/resources/application.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-spring:
-  # H2 설정 정보 (H2 Console에 접속하기 위한 설정)
-  h2:
-    console:
-      enabled: false  # H2 Console을 사용할지 여부 (H2 Console은 H2 Database를 UI로 제공해주는 기능)
-      path: /h2  # H2 Console의 Path
-  # Database 설정 정보 (H2 연동 정보)
-  datasource:
-    driver-class-name: org.h2.Driver  # H2 Database 사용
-    url: jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false  # H2 접속 정보
-    username: taskflow  # H2 접속 시 입력할 username 정보
-    password:  # H2 접속 시 입력할 password 정보
-  jpa:
-    hibernate:
-      ddl-auto: create
-  flyway:
-    enabled: false
-
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: leegd120@gmail.com
-    password: znlictzarqurxlla
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-
-  testcontainers:
-    beans:
-      startup: parallel
-server:
-  domain:
-    local: 127.0.0.1:8080
-    service: 127.0.0.1:8080
-
-web:
-  domain:
-    local: 127.0.0.1:3O00
-    service: 127.0.0.1:3000
-
-swagger:
-  server:
-    url: http://localhost:8080
-
-jwt:
-  secret-key:
-    access-token: exampleSecretKeyForTFSystemAccessSecretKeyTestForPadding
-    temporary-token: exampleSecretKeyForTFSystemTemporarySecretKeyTestForPadding
-    refresh-token: exampleSecretKeyTFSystemRefreshSecretKeyTestForPadding
-  expiration-time:
-    access-token: 43200000 # 1000 * 60 * 60 * 12 = 43200000 (12 hours)
-    temporary-token: 300000
-    refresh-token: 1209600000 # 1000 * 60 * 60 * 24 * 14 = 1209600000 (14 days)
-
-password:
-  policy:
-    length: 12
-    characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
-
-cloud:
-  kakao:
-    project-id: 34481374c1ee4bbb8745df43e4c13fff
-    region: kr-central-2
-    object-storage:
-      endpoint: https://objectstorage.kr-central-2.kakaocloud.com
-      access-key: 253474a41cb447f4ad3c38e0ed9963c4
-      secret-key: 74861656e46845488ec4357f155fa3ed
-      bucketName: taskflow
-
-webhook:
-  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
-
-mail:
-  username: leegd120@gmail.com
-  password: znlictzarqurxlla

From 4ae0752c5c71a843c78cda59b625dce6dd7a0975 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:08:44 +0900
Subject: [PATCH 49/56] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0:?=
 =?UTF-8?q?=20develop=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=99=80=20=EB=B3=91?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/resources/application.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 1a06da76..14c4f530 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -59,24 +59,3 @@ password:
   policy:
     length: 12
     characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
-
-cloud:
-  kakao:
-    project-id: 34481374c1ee4bbb8745df43e4c13fff
-    region: kr-central-2
-    object-storage:
-      endpoint: https://objectstorage.kr-central-2.kakaocloud.com
-      access-key: 253474a41cb447f4ad3c38e0ed9963c4
-      secret-key: 74861656e46845488ec4357f155fa3ed
-      bucketName: taskflow
-
-webhook:
-  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
-
-mail:
-  username: leegd120@gmail.com
-  password: znlictzarqurxlla

From 21a1a26b33868a58241447ec306845ba8a9f96e1 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:09:21 +0900
Subject: [PATCH 50/56] Update application.yml

---
 src/main/resources/application.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7890f9a9..d8331c82 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,7 +7,6 @@ spring:
       - swagger.yml
       - redis.yml
       - auth.yml
-      - env.properties
       - elasticsearch.yml
       - s3.yml
       - notifications.yml
@@ -61,4 +60,4 @@ logging:
 spring.config.activate.on-profile: prod
 logging:
   level:
-    root: INFO
\ No newline at end of file
+    root: INFO

From 2be6e45ef7f31dd95789a35cd2d72b1b4a27fabf Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:11:29 +0900
Subject: [PATCH 51/56] Revert application.yml files to match develop branch

---
 src/main/resources/application.yml | 1 -
 src/test/resources/application.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7890f9a9..c9efe054 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,7 +7,6 @@ spring:
       - swagger.yml
       - redis.yml
       - auth.yml
-      - env.properties
       - elasticsearch.yml
       - s3.yml
       - notifications.yml
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 14c4f530..a6acd661 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -58,4 +58,4 @@ jwt:
 password:
   policy:
     length: 12
-    characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
+    characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
\ No newline at end of file

From e72b634720abf7742f38d698a10a9c9d54a96b10 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:24:18 +0900
Subject: [PATCH 52/56] CLAP-256 fix: Update application.yml

---
 src/main/resources/application.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d8331c82..a9e49079 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -61,3 +61,20 @@ spring.config.activate.on-profile: prod
 logging:
   level:
     root: INFO
+
+cloud:
+  kakao:
+    project-id: 34481374c1ee4bbb8745df43e4c13fff
+    region: kr-central-2
+    object-storage:
+      endpoint: https://objectstorage.kr-central-2.kakaocloud.com
+      access-key: 253474a41cb447f4ad3c38e0ed9963c4
+      secret-key: 74861656e46845488ec4357f155fa3ed
+      bucket-name: taskflow
+
+webhook:
+  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 b8bd148679e8e03926782f4fd580590b6ef39356 Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Thu, 6 Feb 2025 17:25:53 +0900
Subject: [PATCH 53/56] CLAP-256 fix: Update application.yml

---
 src/main/resources/application.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a9e49079..d8331c82 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -61,20 +61,3 @@ spring.config.activate.on-profile: prod
 logging:
   level:
     root: INFO
-
-cloud:
-  kakao:
-    project-id: 34481374c1ee4bbb8745df43e4c13fff
-    region: kr-central-2
-    object-storage:
-      endpoint: https://objectstorage.kr-central-2.kakaocloud.com
-      access-key: 253474a41cb447f4ad3c38e0ed9963c4
-      secret-key: 74861656e46845488ec4357f155fa3ed
-      bucket-name: taskflow
-
-webhook:
-  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 473387adfcb6e5af0b4a14c4a7ee35e4b2a069c2 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 19:10:05 +0900
Subject: [PATCH 54/56] =?UTF-8?q?CLAP-256=20Fix=20:=20=ED=8C=80=20?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=ED=95=84=ED=84=B0=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EA=B8=B0=EC=97=AC=EB=8F=84=EC=88=9C=20=EC=A0=95=EB=A0=AC=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>
- 관련: #281
---
 .../repository/task/TaskCustomRepositoryImpl.java           | 6 +++---
 .../server/application/service/task/TeamStatusService.java  | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index 6c15c0f8..abc2daff 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -4,8 +4,8 @@
 import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.request.SortBy;
-import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse;
+import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import com.querydsl.core.BooleanBuilder;
@@ -20,9 +20,9 @@
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.Optional;
 
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
 import static com.querydsl.core.types.Order.ASC;
@@ -118,7 +118,7 @@ public List<TeamTaskResponse> findTeamStatus(Long memberId, FilterTeamStatusRequ
         }
 
         return taskEntities.stream()
-                .collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId()))
+                .collect(Collectors.groupingBy(t -> t.getProcessor().getMemberId(), LinkedHashMap::new, Collectors.toList()))
                 .entrySet().stream()
                 .map(entry -> {
                     List<TeamTaskItemResponse> taskResponses = entry.getValue().stream()
diff --git a/src/main/java/clap/server/application/service/task/TeamStatusService.java b/src/main/java/clap/server/application/service/task/TeamStatusService.java
index 28c2b4d2..2bc9b055 100644
--- a/src/main/java/clap/server/application/service/task/TeamStatusService.java
+++ b/src/main/java/clap/server/application/service/task/TeamStatusService.java
@@ -11,6 +11,8 @@
 
 import java.util.List;
 
+import static clap.server.adapter.inbound.web.dto.task.request.SortBy.CONTRIBUTE;
+
 @ApplicationService
 public class TeamStatusService implements LoadTeamStatusUsecase, FilterTeamStatusUsecase {
 
@@ -41,6 +43,7 @@ public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
         // 전체 팀의 진행 중 & 검토 중 작업 수 계산
         int totalInProgressTaskCount = members.stream().mapToInt(TeamTaskResponse::inProgressTaskCount).sum();
         int totalInReviewingTaskCount = members.stream().mapToInt(TeamTaskResponse::inReviewingTaskCount).sum();
+        if (filter.sortBy().equals(CONTRIBUTE)) members.sort((a, b) -> b.totalTaskCount() - a.totalTaskCount());
 
         return new TeamStatusResponse(members, totalInProgressTaskCount, totalInReviewingTaskCount);
     }

From 7f4649b6532585fe4ec43ec403b15d2fda16f6c8 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 6 Feb 2025 23:08:36 +0900
Subject: [PATCH 55/56] =?UTF-8?q?CLAP-309=20Fix=20:=20=EC=97=98=EB=9D=BC?=
 =?UTF-8?q?=EC=8A=A4=ED=8B=B1=EC=84=9C=EC=B9=98=EC=97=90=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=ED=95=A0=20=EC=9E=91=EC=97=85=20=EC=A0=95=EB=B3=B4=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>
- 관련: #378
---
 .../infrastructure/elastic/document/TaskDocument.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java
index bd59fec3..bc9b2747 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java
@@ -7,7 +7,7 @@
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.Mapping;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Document(indexName = "task")
 @Mapping(mappingPath = "elastic/task-mapping.json")
@@ -26,7 +26,7 @@ public class TaskDocument {
     @Field(name="processor")
     private String processor;
     @Field(name="created_at")
-    private LocalDate createdAt;
+    private LocalDateTime createdAt;
 
     public TaskDocument(Task taskEntity) {
         this.id = taskEntity.getTaskId();
@@ -35,6 +35,6 @@ public TaskDocument(Task taskEntity) {
         this.subCategory = taskEntity.getCategory().getName();
         this.status = taskEntity.getTaskStatus().name().toLowerCase();
         this.processor = taskEntity.getProcessor().getMemberInfo().getNickname();
-        this.createdAt = taskEntity.getCreatedAt().toLocalDate();
+        this.createdAt = taskEntity.getCreatedAt();
     }
 }

From 173aa9b14151ec2087cd7724292afbd23df9e15a Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 7 Feb 2025 01:41:53 +0900
Subject: [PATCH 56/56] =?UTF-8?q?CLAP-309=20Fix=20:=20=EC=97=98=EB=9D=BC?=
 =?UTF-8?q?=EC=8A=A4=ED=8B=B1=EC=84=9C=EC=B9=98=EC=97=90=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EB=88=84=EB=9D=BD=EB=90=98=EB=8A=94=EA=B2=83=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>
- 관련: #378
---
 .../outbound/persistense/repository/task/TaskRepository.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 39e3bdab..cf2c4ab5 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
@@ -18,7 +18,7 @@
 @Repository
 public interface TaskRepository extends JpaRepository<TaskEntity, Long>, TaskCustomRepository {
 
-    @Query("select t from TaskEntity t join fetch t.processor p" +
+    @Query("select t from TaskEntity t left join fetch t.processor p" +
             " where t.updatedAt between :updatedAtAfter and :updatedAtBefore")
     List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
             @Param("updatedAtAfter") LocalDateTime updatedAtAfter,