From 19bff02c670d55855cc663d118c25afa6bc80ac8 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 13:38:45 +0900
Subject: [PATCH 01/11] =?UTF-8?q?CLAP-104=20CI/CD=20:=20dev=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=20cd=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20checkou?=
 =?UTF-8?q?t=20=EB=B2=84=EC=A0=84=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index ae4b9d6e..49387471 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -16,7 +16,7 @@ jobs:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Set up jdk'
         uses: actions/setup-java@v3
         with:

From c97d37c86edbbc8f7007ac4795388afd13569ba2 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 17:21:03 +0900
Subject: [PATCH 02/11] =?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
---
 .github/workflows/dev-cd.yml                  |  2 +-
 .../statistics/FindStatisticsController.java  | 14 ++++---
 .../elastic/TaskDocumentAdapter.java          | 38 +++++++++++++++++++
 .../statistics/ManagerTaskProcessUsecase.java |  7 ++++
 .../port/outbound/task/TaskDocumentPort.java  |  2 +
 .../statistics/ManagerTaskProcessService.java | 19 ++++++++++
 6 files changed, 75 insertions(+), 7 deletions(-)
 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/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index 99e31017..ae3495c3 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -62,4 +62,4 @@ jobs:
           script: |
             docker rm -f taskflow
             docker image rm ${{ secrets.DOCKER_REPO }} -f
-            docker run --name taskflow --network host -d -p 9090:9090 ${{ secrets.DOCKER_REPO }} --restart on-failure
+            docker run --name taskflow -d -p 9090:9090 ${{ secrets.DOCKER_REPO }} --restart on-failure
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 ecdfda02..6be9e4c7 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
@@ -1,9 +1,6 @@
 package clap.server.adapter.inbound.web.statistics;
 
-import clap.server.application.port.inbound.statistics.FindCategoryTaskRequestUsecase;
-import clap.server.application.port.inbound.statistics.FindPeriodTaskProcessUsecase;
-import clap.server.application.port.inbound.statistics.FindPeriodTaskRequestUsecase;
-import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase;
+import clap.server.application.port.inbound.statistics.*;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +20,7 @@ public class FindStatisticsController {
     private final FindPeriodTaskProcessUsecase findPeriodTaskProcessUsecase;
     private final FindCategoryTaskRequestUsecase findCategoryTaskRequestUsecase;
     private final FindSubCategoryTaskRequestUsecase findSubCategoryTaskRequestUsecase;
-//    private final ManagerTaskProcessUsecase managerTaskProcessUsecase;
+    private final ManagerTaskProcessUsecase managerTaskProcessUsecase;
 
     @GetMapping(value = "/task-requests-by-period")
     public ResponseEntity<Map<String, Long>> aggregatePeriodTaskRequest(@RequestParam String period) {
@@ -34,6 +31,7 @@ public ResponseEntity<Map<String, Long>> aggregatePeriodTaskRequest(@RequestPara
     public ResponseEntity<Map<String, Long>> aggregatePeriodTaskProcess(@RequestParam String period) {
         return ResponseEntity.ok(findPeriodTaskProcessUsecase.aggregatePeriodTaskProcess(period));
     }
+
     @GetMapping("/task-requests-by-category")
     public ResponseEntity<Map<String, Long>> aggregateCategoryTaskRequest(@RequestParam String period) {
         return ResponseEntity.ok(findCategoryTaskRequestUsecase.aggregateCategoryTaskRequest(period));
@@ -43,5 +41,9 @@ public ResponseEntity<Map<String, Long>> aggregateCategoryTaskRequest(@RequestPa
     public ResponseEntity<Map<String, Long>> aggregateSubCategoryTaskRequest(@RequestParam String period, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase.aggregateSubCategoryTaskRequest(period, mainCategory));
     }
-//    @GetMapping("/task/statistics/tasks-processed-by-manager")
+
+    @GetMapping("/tasks-processed-by-manager")
+    public ResponseEntity<Map<String, Long>> aggregateSubCategoryTaskRequest(@RequestParam String period) {
+        return ResponseEntity.ok(managerTaskProcessUsecase.aggregateManagerTaskProcess(period));
+    }
 }
\ No newline at end of file
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 ffa6ab74..7d68bf31 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
@@ -61,6 +61,14 @@ public Map<String, Long> findSubCategoryTaskRequestByPeriod(String period, Strin
         return getCategoryTaskResults(executeQuery(query));
     }
 
+    @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
@@ -141,6 +149,20 @@ private NativeQuery buildSubCategoryTaskRequestQuery(PeriodConfig config, String
                 .build();
     }
 
+    private NativeQuery buildManagerTaskProcessQuery(PeriodConfig config) {
+        return NativeQuery.builder()
+                .withQuery(q -> q
+                        .range(r -> r
+                                .date(d -> d
+                                        .field("created_at")
+                                        .gte(String.valueOf(LocalDate.now().minusDays(config.getDaysToSubtract()))))))
+                .withAggregation("manager_task", AggregationBuilders.terms()
+                        .field("processor")
+                        .build()._toAggregation())
+                .withMaxResults(0)
+                .build();
+    }
+
     private ElasticsearchAggregations executeQuery(NativeQuery query) {
         return (ElasticsearchAggregations) elasticsearchOperations
                 .search(query, TaskDocument.class)
@@ -181,4 +203,20 @@ private Map<String, Long> getCategoryTaskResults(ElasticsearchAggregations aggre
                         ))
         );
     }
+
+    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/port/outbound/task/TaskDocumentPort.java b/src/main/java/clap/server/application/port/outbound/task/TaskDocumentPort.java
index bf30f1cf..282ed090 100644
--- a/src/main/java/clap/server/application/port/outbound/task/TaskDocumentPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/TaskDocumentPort.java
@@ -15,4 +15,6 @@ public interface TaskDocumentPort {
     Map<String, Long> findCategoryTaskRequestByPeriod(String period);
 
     Map<String, Long> findSubCategoryTaskRequestByPeriod(String period, String mainCategory);
+
+    Map<String, Long> findManagerTaskProcessByPeriod(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 73bd762c533e0ebd5f737d161189d543427b1576 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 02:18:35 +0900
Subject: [PATCH 03/11] =?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
---
 .../infrastructure/elastic/PeriodConfig.java  | 16 ++++++++--
 .../elastic/TaskDocumentAdapter.java          | 26 +++-------------
 .../FindPeriodTaskProcessService.java         |  4 +++
 .../FindPeriodTaskRequestService.java         |  4 +++
 .../server/domain/statistics/Statistics.java  | 31 +++++++++++++++++++
 5 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/clap/server/domain/statistics/Statistics.java

diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
index 1d1b9bf7..2c5b16e7 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
@@ -4,15 +4,27 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+
 @Getter
 @RequiredArgsConstructor
 public enum PeriodConfig {
-    DAY(1, CalendarInterval.Hour, 11, 19),
-    WEEK(14, CalendarInterval.Day, 0, 10);
+    DAY(1, CalendarInterval.Hour, 11, 16),
+    WEEK(7, CalendarInterval.Day, 0, 10),
+    MONTH(-1, CalendarInterval.Day, 0, 10);
 
     private final long daysToSubtract;
     private final CalendarInterval calendarInterval;
     private final int substringStart;
     private final int substringEnd;
 
+    // MONTH에 대해 동적으로 daysToSubtract를 계산하는 메서드
+    public long getDaysToSubtract() {
+        if (this == MONTH) {
+            return ChronoUnit.DAYS.between(LocalDate.now().minusMonths(1), LocalDate.now());
+        }
+        return daysToSubtract;
+    }
+
 }
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 7d68bf31..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
@@ -50,7 +50,7 @@ public Map<String, Long> findCategoryTaskRequestByPeriod(String period) {
         PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildCategoryTaskRequestQuery(periodConfig);
-        return getCategoryTaskResults(executeQuery(query));
+        return getNonPeriodTaskResults(executeQuery(query), "category_task");
     }
 
     @Override
@@ -58,7 +58,7 @@ public Map<String, Long> findSubCategoryTaskRequestByPeriod(String period, Strin
         PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildSubCategoryTaskRequestQuery(periodConfig, mainCategory);
-        return getCategoryTaskResults(executeQuery(query));
+        return getNonPeriodTaskResults(executeQuery(query), "category_task");
     }
 
     @Override
@@ -66,7 +66,7 @@ public Map<String, Long> findManagerTaskProcessByPeriod(String period) {
         PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildManagerTaskProcessQuery(periodConfig);
-        return getManagerTaskResults(executeQuery(query));
+        return getNonPeriodTaskResults(executeQuery(query), "manager_task");
     }
 
     private NativeQuery buildPeriodTaskRequestQuery(PeriodConfig config) {
@@ -188,25 +188,9 @@ private Map<String, Long> getPeriodTaskResults(ElasticsearchAggregations aggrega
         );
     }
 
-    private Map<String, Long> getCategoryTaskResults(ElasticsearchAggregations aggregations) {
+    private Map<String, Long> getNonPeriodTaskResults(ElasticsearchAggregations aggregations, String name) {
         return new TreeMap<>(
-                aggregations.get("category_task")
-                        .aggregation()
-                        .getAggregate()
-                        .sterms()
-                        .buckets()
-                        .array()
-                        .stream()
-                        .collect(Collectors.toMap(
-                                bucket -> bucket.key().stringValue(),
-                                MultiBucketBase::docCount
-                        ))
-        );
-    }
-
-    private Map<String, Long> getManagerTaskResults(ElasticsearchAggregations aggregations) {
-        return new TreeMap<>(
-                aggregations.get("manager_task")
+                aggregations.get(name)
                         .aggregation()
                         .getAggregate()
                         .sterms()
diff --git a/src/main/java/clap/server/application/statistics/FindPeriodTaskProcessService.java b/src/main/java/clap/server/application/statistics/FindPeriodTaskProcessService.java
index 02595e52..7b94469e 100644
--- a/src/main/java/clap/server/application/statistics/FindPeriodTaskProcessService.java
+++ b/src/main/java/clap/server/application/statistics/FindPeriodTaskProcessService.java
@@ -3,6 +3,7 @@
 import clap.server.application.port.inbound.statistics.FindPeriodTaskProcessUsecase;
 import clap.server.application.port.outbound.task.TaskDocumentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.statistics.Statistics;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Map;
@@ -14,6 +15,9 @@ public class FindPeriodTaskProcessService implements FindPeriodTaskProcessUsecas
 
     @Override
     public Map<String, Long> aggregatePeriodTaskProcess(String period) {
+        if (period.equals("week") || period.equals("month")) {
+            return Statistics.transformToWeekdayStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period));
+        }
         return taskDocumentPort.findPeriodTaskProcessByPeriod(period);
     }
 }
diff --git a/src/main/java/clap/server/application/statistics/FindPeriodTaskRequestService.java b/src/main/java/clap/server/application/statistics/FindPeriodTaskRequestService.java
index 287c33fb..f003dffd 100644
--- a/src/main/java/clap/server/application/statistics/FindPeriodTaskRequestService.java
+++ b/src/main/java/clap/server/application/statistics/FindPeriodTaskRequestService.java
@@ -3,6 +3,7 @@
 import clap.server.application.port.inbound.statistics.FindPeriodTaskRequestUsecase;
 import clap.server.application.port.outbound.task.TaskDocumentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.statistics.Statistics;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Map;
@@ -14,6 +15,9 @@ public class FindPeriodTaskRequestService implements FindPeriodTaskRequestUsecas
 
     @Override
     public Map<String, Long> aggregatePeriodTaskRequest(String period) {
+        if (period.equals("week") || period.equals("month")) {
+            return Statistics.transformToWeekdayStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period));
+        }
         return taskDocumentPort.findPeriodTaskRequestByPeriod(period);
     }
 }
diff --git a/src/main/java/clap/server/domain/statistics/Statistics.java b/src/main/java/clap/server/domain/statistics/Statistics.java
new file mode 100644
index 00000000..8df5790b
--- /dev/null
+++ b/src/main/java/clap/server/domain/statistics/Statistics.java
@@ -0,0 +1,31 @@
+package clap.server.domain.statistics;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Statistics {
+    public static Map<String, Long> transformToWeekdayStatistics(Map<String, Long> statistics) {
+        TreeMap<String, Long> result = new TreeMap<>();
+        
+        for (Entry<String, Long> statistic : statistics.entrySet()) {
+            String stringDate = statistic.getKey();
+            LocalDate date = LocalDate.parse(stringDate);
+            
+            if (!(date.getDayOfWeek() == DayOfWeek.SATURDAY || date.getDayOfWeek() == DayOfWeek.SUNDAY)) {
+                result.put(stringDate.substring(6, 10).replace("-", "월 ") + "일", statistic.getValue());
+            }
+        }
+
+        return result;
+        
+    }
+}

From 60ebc4a180e3dac5eab81689957cc1c421560a52 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 04/11] =?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

---
 .../web/dto/admin/FindManagersResponse.java   |  15 ++
 .../inbound/web/member/ManagerController.java |  23 +++
 .../persistense/MemberPersistenceAdapter.java |  39 +++-
 .../persistense/TaskPersistenceAdapter.java   |   2 +
 .../repository/member/MemberRepository.java   |   8 +-
 .../repository/task/TaskRepository.java       |  26 ++-
 .../application/mapper/MemberMapper.java      |   2 +-
 .../inbound/domain/FindManagersUsecase.java   |   8 +
 .../domain/FindManagersUsecaseImpl.java       |  36 ++++
 .../port/inbound/domain/MemberService.java    |  34 +++-
 .../port/outbound/member/LoadMemberPort.java  |  10 +-
 .../server/domain/model/member/Member.java    |   4 +
 .../domain/model/member/MemberInfo.java       |   1 +
 src/main/resources/application.yml            |   6 +-
 src/main/resources/data.sql                   |  30 +++
 src/main/resources/env.properties             |  31 +++
 src/main/resources/mysql.yml                  |   2 +-
 .../web/admin/MemberControllerTest.java       | 188 ++++++++++++++++++
 18 files changed, 453 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
 create mode 100644 src/main/resources/data.sql
 create mode 100644 src/main/resources/env.properties
 create mode 100644 src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
new file mode 100644
index 00000000..645268e6
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
@@ -0,0 +1,15 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class FindManagersResponse {
+
+    private Long memberId;
+    private String nickname;  // 닉네임 필드 추가
+    private String imageUrl;  // 이미지 URL 필드 추가
+    private int remainingTasks;
+
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
new file mode 100644
index 00000000..66c80ae6
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
@@ -0,0 +1,23 @@
+package clap.server.adapter.inbound.web.member;
+
+import clap.server.application.port.inbound.domain.FindManagersUsecase;
+import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/manager")
+@RequiredArgsConstructor
+public class ManagerController {
+
+    private final FindManagersUsecase findManagersUsecase;
+
+    @GetMapping
+    public List<FindManagersResponse> findManagers() {
+        return findManagersUsecase.execute();
+    }
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
index c327d26f..b158176f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -1,12 +1,21 @@
 package clap.server.adapter.outbound.persistense;
 
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.domain.model.task.Task;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus ;
+import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
+import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
+import java.util.stream.Collectors;
+import java.util.List;
+
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 
@@ -14,9 +23,12 @@
 
 @PersistenceAdapter
 @RequiredArgsConstructor
-public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
+    public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
     private final MemberRepository memberRepository;
     private final MemberPersistenceMapper memberPersistenceMapper;
+    private final TaskRepository taskRepository;
+    private final TaskPersistenceMapper taskPersistenceMapper;
+
 
     @Override
     public Optional<Member> findById(final Long id) {
@@ -35,4 +47,29 @@ public void save(final Member member) {
         MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
         memberRepository.save(memberEntity);
     }
+
+    @Override
+    public List<Member> findActiveManagers() {
+        List<MemberEntity> memberEntities = memberRepository.findByRoleAndStatus(MemberRole.valueOf("ROLE_MANAGER"), MemberStatus.ACTIVE);
+        return memberEntities.stream()
+                .map(memberPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public int getRemainingTasks(Long memberId) {
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        return findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
+    }
+
+
+    @Override
+    public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses) {
+        List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
+        return taskEntities.stream()
+                .map(taskPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
+
 }
+
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 763230a5..e9ed5605 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java
@@ -42,4 +42,6 @@ public Page<FindTaskListResponse> findAllByRequesterId(Long requesterId, Pageabl
                 .map(taskPersistenceMapper::toDomain);
         return taskList.map(TaskMapper::toFindTaskListResponse);
     }
+
+
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index 99be21ab..f6de7fcf 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -1,13 +1,17 @@
 package clap.server.adapter.outbound.persistense.repository.member;
 
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
-    Optional<MemberEntity> findByStatusAndMemberId(MemberStatus memberStatus, Long memberId);
-}
\ No newline at end of file
+    List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
+
+    Optional<MemberEntity> findByStatusAndMemberId(MemberStatus memberStatus, Long id);
+}
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 3dabf934..06196a78 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
@@ -1,9 +1,33 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 
+import clap.server.adapter.inbound.web.dto.task.FindTaskListRequest;
 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.nio.channels.FileChannel;
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import java.util.List;
+
 @Repository
 public interface TaskRepository extends JpaRepository<TaskEntity, Long>, TaskCustomRepository {
-}
\ No newline at end of file
+    @Query("select t from TaskEntity t join fetch t.processor p where t.updatedAt between :updatedAtAfter and :updatedAtBefore")
+    List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
+            @Param("updatedAtAfter") LocalDateTime updatedAtAfter,
+            @Param("updatedAtBefore") LocalDateTime updatedAtBefore
+    );
+
+    // 'processor'의 'id'로 검색하기
+    List<TaskEntity> findByProcessor_MemberIdAndTaskStatusIn(Long memberId, Collection<TaskStatus> taskStatuses);
+}
+
+
+
+
+
diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java
index aeed7e4b..6d4f14ef 100644
--- a/src/main/java/clap/server/application/mapper/MemberMapper.java
+++ b/src/main/java/clap/server/application/mapper/MemberMapper.java
@@ -15,4 +15,4 @@ public static Member toMember(MemberInfo memberInfo) {
                 .imageUrl(null)
                 .build();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java
new file mode 100644
index 00000000..57327d16
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java
@@ -0,0 +1,8 @@
+package clap.server.application.port.inbound.domain;
+
+import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse;
+import java.util.List;
+
+public interface FindManagersUsecase {
+    List<FindManagersResponse> execute();
+}
diff --git a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
new file mode 100644
index 00000000..1fb1052a
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
@@ -0,0 +1,36 @@
+package clap.server.application.port.inbound.domain;
+
+import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse;
+import clap.server.domain.model.member.Member;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class FindManagersUsecaseImpl implements FindManagersUsecase {
+
+    private final MemberService memberService;
+
+    @Override
+    @Transactional
+    public List<FindManagersResponse> execute() {
+        List<Member> managers = memberService.findActiveManagers();
+
+        return managers.stream().map(manager -> {
+            int remainingTasks = memberService.getRemainingTasks(manager.getMemberId());
+            String nickname = memberService.getMemberNickname(manager.getMemberId());
+            String imageUrl = memberService.getMemberImageUrl(manager.getMemberId());
+
+            return new FindManagersResponse(
+                    manager.getMemberId(),
+                    nickname,
+                    imageUrl,
+                    remainingTasks
+            );
+        }).collect(Collectors.toList());
+    }
+}
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index 47de39c7..d31a4111 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -1,12 +1,16 @@
 package clap.server.application.port.inbound.domain;
 
 import clap.server.application.port.outbound.member.LoadMemberPort;
-import clap.server.exception.ApplicationException;
 import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Task;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.exception.ApplicationException;
 import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class MemberService {
@@ -14,11 +18,33 @@ public class MemberService {
 
     public Member findById(Long memberId) {
         return loadMemberPort.findById(memberId).orElseThrow(
-                ()-> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
+                () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
     }
-    
+
     public Member findActiveMember(Long memberId) {
         return loadMemberPort.findActiveMemberById(memberId).orElseThrow(
-                ()-> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
+                () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
+    }
+
+    public int getRemainingTasks(Long memberId) {
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
+    }
+
+    public String getMemberNickname(Long memberId) {
+        Member member = findById(memberId);
+        if (member.getMemberInfo() == null) {
+            throw new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND);
+        }
+        return member.getMemberInfo().getNickname();
+    }
+
+    public String getMemberImageUrl(Long memberId) {
+        Member member = findById(memberId);
+        return member.getImageUrl() != null ? member.getImageUrl() : "default-image-url";
+    }
+
+    public List<Member> findActiveManagers() {
+        return loadMemberPort.findActiveManagers();
     }
 }
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
index 40647bb7..0a9e8f99 100644
--- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
+++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -1,11 +1,19 @@
 package clap.server.application.port.outbound.member;
 
 import clap.server.domain.model.member.Member;
-
+import clap.server.domain.model.task.Task;  // Task 클래스 임포트 확인
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트
+import java.util.List;
 import java.util.Optional;
 
 public interface LoadMemberPort {
     Optional<Member> findById(Long id);
 
     Optional<Member> findActiveMemberById(Long id);
+
+    List<Member> findActiveManagers();
+
+    List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses);
+
+    int getRemainingTasks(Long memberId);
 }
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
index dde59d7e..3dbe7bae 100644
--- a/src/main/java/clap/server/domain/model/member/Member.java
+++ b/src/main/java/clap/server/domain/model/member/Member.java
@@ -35,4 +35,8 @@ public void register(Member admin) {
         this.status = MemberStatus.PENDING;
         this.password = "";
     }
+    public String getNickname() {
+        return memberInfo != null ? memberInfo.getNickname() : null;
+    }
+
 }
diff --git a/src/main/java/clap/server/domain/model/member/MemberInfo.java b/src/main/java/clap/server/domain/model/member/MemberInfo.java
index 69a6b55c..31917d52 100644
--- a/src/main/java/clap/server/domain/model/member/MemberInfo.java
+++ b/src/main/java/clap/server/domain/model/member/MemberInfo.java
@@ -27,4 +27,5 @@ public MemberInfo(String name, String email, String nickname, boolean isReviewer
         this.role = role;
         this.departmentRole = departmentRole;
     }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64c7f036..bc75e8f7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,9 @@
 spring.profiles.active: local
 
 spring:
+  jpa:
+    hibernate:
+      ddl-auto: none
   config:
     import:
       - mysql.yml
@@ -8,7 +11,7 @@ spring:
       - redis.yml
       - optional:classpath:env.properties
   application:
-    name: taskflow
+    name: taskflow2
 
 web.resources.add-mappings: false
 
@@ -44,3 +47,4 @@ spring.config.activate.on-profile: prod
 logging:
   level:
     root: INFO
+---
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 b77551db..4efa241f 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:
diff --git a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
new file mode 100644
index 00000000..c6b7c87a
--- /dev/null
+++ b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
@@ -0,0 +1,188 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.DepartmentStatus;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
+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 jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+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.test.annotation.Rollback;
+import org.springframework.test.web.servlet.MockMvc;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@Transactional
+@AutoConfigureMockMvc
+public class MemberControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private EntityManager entityManager;
+
+    @BeforeEach
+    @Transactional
+    @Rollback(false)
+    public void setupTestData() {
+        // 부서 추가
+        DepartmentEntity department = DepartmentEntity.builder()
+                .code("DEPT001")
+                .name("IT Department")
+                .status(DepartmentStatus.ACTIVE)
+                .build();
+        entityManager.persist(department); // department 먼저 persist
+
+        // 관리자 추가
+        MemberEntity admin = MemberEntity.builder()
+                .name("Admin User")
+                .email("admin@example.com")
+                .nickname("Admin1")
+                .isReviewer(false)
+                .role(MemberRole.ROLE_ADMIN)
+                .departmentRole("Admin")
+                .status(MemberStatus.ACTIVE)
+                .password("admin123")
+                .imageUrl("http://example.com/admin.jpg")
+                .notificationEnabled(true)
+                .department(department) // 부서 할당
+                .build();
+        entityManager.persist(admin);
+
+        // 카테고리 추가
+        CategoryEntity category = CategoryEntity.builder()
+                .code("CATEGORY001")
+                .name("Development")
+                .descriptionExample("Development tasks category")
+                .isDeleted(false)
+                .admin(admin)
+                .build();
+        entityManager.persist(category);
+
+        // 라벨 추가
+        LabelEntity label = LabelEntity.builder()
+                .labelType(LabelType.EMERGENCY)
+                .admin(admin)
+                .isDeleted(false)
+                .build();
+        entityManager.persist(label);
+
+        // 관리자 (manager) 추가
+        MemberEntity manager1 = MemberEntity.builder()  // manager1 정의
+                .name("Manager1")
+                .email("manager1@example.com")
+                .nickname("Manager1")
+                .isReviewer(true)
+                .role(MemberRole.ROLE_MANAGER) // 관리자로 설정
+                .departmentRole("Manager")
+                .status(MemberStatus.ACTIVE)
+                .password("manager123")
+                .imageUrl("http://example.com/manager1.jpg")
+                .notificationEnabled(true)
+                .department(department) // 부서 할당
+                .build();
+        entityManager.persist(manager1); // manager1 저장
+
+        // 태스크 추가
+        TaskEntity task = TaskEntity.builder()
+                .taskCode("TASK001")
+                .title("Task Title")
+                .description("Task Description")
+                .category(category) // 카테고리 연결
+                .requester(admin)
+                .taskStatus(TaskStatus.PENDING_COMPLETED)
+                .processorOrder(1)
+                .reviewer(admin)
+                .processor(manager1)  // 여기서 manager1을 processor로 설정
+                .label(label)
+                .dueDate(LocalDateTime.now().plusDays(7))
+                .completedAt(null)
+                .build();
+        entityManager.persist(task);
+
+        // 일반 사용자 (user) 추가
+        MemberEntity user = MemberEntity.builder()
+                .name("User1")
+                .email("user1@example.com")
+                .nickname("User1")
+                .isReviewer(false)
+                .role(MemberRole.ROLE_USER)
+                .departmentRole("User")
+                .status(MemberStatus.ACTIVE)
+                .password("user123")
+                .imageUrl("http://example.com/user1.jpg")
+                .notificationEnabled(true)
+                .department(department) // 부서 할당
+                .build();
+        entityManager.persist(user);
+        // 두 번째 관리자 추가
+        MemberEntity manager2 = MemberEntity.builder()
+                .name("Manager2")
+                .email("manager2@example.com")
+                .nickname("Manager2")
+                .isReviewer(true)
+                .role(MemberRole.ROLE_MANAGER)
+                .departmentRole("Manager")
+                .status(MemberStatus.ACTIVE)
+                .password("manager123")
+                .imageUrl("http://example.com/manager2.jpg")
+                .notificationEnabled(true)
+                .department(department)
+                .build();
+        entityManager.persist(manager2); // 두 번째 관리자 저장
+
+        // 추가로 5명의 사용자 생성
+        List<MemberEntity> members = new ArrayList<>();
+        for (int i = 2; i <= 5; i++) {
+            members.add(MemberEntity.builder()
+                    .name("User" + i)
+                    .email("user" + i + "@example.com")
+                    .nickname("User" + i)
+                    .isReviewer(i % 2 == 0)
+                    .role(MemberRole.ROLE_USER)
+                    .departmentRole("DepartmentUser")
+                    .status(MemberStatus.ACTIVE)
+                    .password("user123")
+                    .imageUrl("http://example.com/user" + i + ".jpg")
+                    .notificationEnabled(i % 2 != 0)
+                    .department(department) // 부서 할당
+                    .build());
+        }
+
+        // 멤버들을 데이터베이스에 저장
+        members.forEach(entityManager::persist);
+    }
+
+
+    @Test
+    public void testFindManagers() throws Exception {
+        mockMvc.perform(get("/manager"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$[0].nickname").value("Manager1"))
+                .andExpect(jsonPath("$[0].imageUrl").value("http://example.com/manager1.jpg"))
+                .andExpect(jsonPath("$[0].remainingTasks").value(1))
+                .andExpect(jsonPath("$[1].nickname").value("Manager2"))  // 추가된 관리자
+                .andExpect(jsonPath("$[1].imageUrl").value("http://example.com/manager2.jpg"))
+                .andExpect(jsonPath("$[1].remainingTasks").value(0));  // 예시로 추가된 관리자들의 데이터를 검증
+    }
+
+}

From a88a6bf1e7c51f8cffa4cb89eb635f898bbe286e Mon Sep 17 00:00:00 2001
From: nano-mm <nano123@gachon.ac.kr>
Date: Fri, 24 Jan 2025 04:18:33 +0900
Subject: [PATCH 05/11] =?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

---
 .../persistense/repository/member/MemberRepository.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
index f6de7fcf..9e284dac 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java
@@ -11,7 +11,9 @@
 
 @Repository
 public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
+
     List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
 
     Optional<MemberEntity> findByStatusAndMemberId(MemberStatus memberStatus, Long id);
 }
+

From 283e5a50c27842cf685e569b69da89d1e1235722 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 06/11] =?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

---
 .../web/dto/admin/FindManagersResponse.java   | 12 ++++++--
 .../inbound/web/member/ManagerController.java |  9 +++++-
 .../domain/FindManagersUsecaseImpl.java       |  5 ++++
 .../port/inbound/domain/MemberService.java    |  7 ++++-
 src/main/resources/application.yml            |  9 ++----
 src/main/resources/data.sql                   | 30 -------------------
 .../web/admin/MemberControllerTest.java       |  9 +++++-
 src/test/resources/application.yml            | 14 +++++----
 8 files changed, 47 insertions(+), 48 deletions(-)
 delete mode 100644 src/main/resources/data.sql

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
index 645268e6..26e64a60 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java
@@ -3,13 +3,21 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 @AllArgsConstructor
 public class FindManagersResponse {
 
     private Long memberId;
-    private String nickname;  // 닉네임 필드 추가
-    private String imageUrl;  // 이미지 URL 필드 추가
+    private String nickname;
+    private String imageUrl;
     private int remainingTasks;
 
+    public static List<FindManagersResponse> emptyListResponse() {
+        return List.of();
+    }
+
 }
+
+
diff --git a/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
index 66c80ae6..8354dd05 100644
--- a/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java
@@ -18,6 +18,13 @@ public class ManagerController {
 
     @GetMapping
     public List<FindManagersResponse> findManagers() {
-        return findManagersUsecase.execute();
+
+        List<FindManagersResponse> managers = findManagersUsecase.execute();
+
+        if (managers.isEmpty()) {
+            return FindManagersResponse.emptyListResponse();
+        }
+
+        return managers;
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
index 1fb1052a..0148fb72 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecaseImpl.java
@@ -18,8 +18,13 @@ public class FindManagersUsecaseImpl implements FindManagersUsecase {
     @Override
     @Transactional
     public List<FindManagersResponse> execute() {
+
         List<Member> managers = memberService.findActiveManagers();
 
+        if (managers.isEmpty()) {
+            return FindManagersResponse.emptyListResponse(); // 빈 리스트 반환
+        }
+
         return managers.stream().map(manager -> {
             int remainingTasks = memberService.getRemainingTasks(manager.getMemberId());
             String nickname = memberService.getMemberNickname(manager.getMemberId());
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
index d31a4111..a3d31fd3 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -45,6 +45,11 @@ public String getMemberImageUrl(Long memberId) {
     }
 
     public List<Member> findActiveManagers() {
-        return loadMemberPort.findActiveManagers();
+        List<Member> activeManagers = loadMemberPort.findActiveManagers();
+
+        if (activeManagers.isEmpty()) {
+            return List.of();
+        }
+        return activeManagers;
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c968d861..ef3f186c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,6 @@
 spring.profiles.active: local
 
 spring:
-  jpa:
-    hibernate:
-      ddl-auto: none
   config:
     import:
       - mysql.yml
@@ -12,12 +9,11 @@ spring:
       - auth.yml
       - optional:classpath:env.properties
   application:
-
     name: taskflow2
   elasticsearch:
     uris: ${ELASTIC_URI:127.0.0.1:9200}
-  web.resources.add-mappings: false
 
+  web.resources.add-mappings: false
 
 
 server:
@@ -54,5 +50,4 @@ logging:
 spring.config.activate.on-profile: prod
 logging:
   level:
-    root: INFO
----
+    root: INFO
\ No newline at end of file
diff --git a/src/main/resources/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);
diff --git a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
index c6b7c87a..5264ed4f 100644
--- a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
+++ b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
@@ -8,6 +8,7 @@
 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.config.elastic.ElasticsearchConfig;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
@@ -15,6 +16,8 @@
 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.context.annotation.Import;
+import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.web.servlet.MockMvc;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
@@ -26,9 +29,11 @@
 
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+@Import(ElasticsearchConfig.class)
 @SpringBootTest
 @Transactional
 @AutoConfigureMockMvc
@@ -174,6 +179,7 @@ public void setupTestData() {
 
 
     @Test
+    @WithMockUser(username = "admin", roles = "ADMIN")
     public void testFindManagers() throws Exception {
         mockMvc.perform(get("/manager"))
                 .andExpect(status().isOk())
@@ -182,7 +188,8 @@ public void testFindManagers() throws Exception {
                 .andExpect(jsonPath("$[0].remainingTasks").value(1))
                 .andExpect(jsonPath("$[1].nickname").value("Manager2"))  // 추가된 관리자
                 .andExpect(jsonPath("$[1].imageUrl").value("http://example.com/manager2.jpg"))
-                .andExpect(jsonPath("$[1].remainingTasks").value(0));  // 예시로 추가된 관리자들의 데이터를 검증
+                .andExpect(jsonPath("$[1].remainingTasks").value(0))  // 예시로 추가된 관리자들의 데이터를 검증
+                .andDo(print());
     }
 
 }
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index a0c7628e..47f4a275 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -1,24 +1,26 @@
 spring:
-  # H2 Setting Info (H2 Console에 접속하기 위한 설정정보 입력)
+  # H2 설정 정보 (H2 Console에 접속하기 위한 설정)
   h2:
     console:
       enabled: false  # H2 Console을 사용할지 여부 (H2 Console은 H2 Database를 UI로 제공해주는 기능)
       path: /h2  # H2 Console의 Path
-  # Database Setting Info (Database를 H2로 사용하기 위해 H2연결 정보 입력)
+  # Database 설정 정보 (H2 연동 정보)
   datasource:
-    driver-class-name: org.h2.Driver  # Database를 H2로 사용하겠다.
+    driver-class-name: org.h2.Driver  # H2 Database 사용
     url: jdbc:h2:mem:testdb  # H2 접속 정보
-    username: taskflow  # H2 접속 시 입력할 username 정보 (원하는 것으로 입력)
-    password:  # H2 접속 시 입력할 password 정보 (원하는 것으로 입력)
+    username: taskflow  # H2 접속 시 입력할 username 정보
+    password:  # H2 접속 시 입력할 password 정보
   jpa:
     hibernate:
       ddl-auto: create
 
+  elasticsearch:
+    uris: ${ELASTIC_URI:127.0.0.1:9200}  # 기본 URL로 localhost 사용
+
 swagger:
   server:
     url: http://localhost:8080
 
-
 jwt:
   secret-key:
     access-token: exampleSecretKeyForTFSystemAccessSecretKeyTestForPadding

From 2a9eed46968ffa574e9456b6c4149bbcca61ef04 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 16:03:51 +0900
Subject: [PATCH 07/11] =?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
---
 .../web/dto/statistics/PeriodType.java        | 28 ++++++++
 .../dto/statistics/StatisticsResponse.java    |  5 ++
 .../web/dto/statistics/StatisticsType.java    | 27 +++++++
 .../statistics/FindStatisticsController.java  | 71 +++++++++++++------
 .../infrastructure/elastic/PeriodConfig.java  |  2 +-
 .../elastic/TaskDocumentAdapter.java          | 24 -------
 ...ava => FindManagerTaskProcessUsecase.java} |  2 +-
 ...ava => FindManagerTaskProcessService.java} |  4 +-
 .../server/exception/ExceptionAdvice.java     | 13 ++++
 .../server/exception/StatisticsException.java | 10 +++
 .../exception/code/StatisticsErrorCode.java   | 15 ++++
 11 files changed, 150 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/statistics/PeriodType.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsResponse.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsType.java
 rename src/main/java/clap/server/application/port/inbound/statistics/{ManagerTaskProcessUsecase.java => FindManagerTaskProcessUsecase.java} (75%)
 rename src/main/java/clap/server/application/statistics/{ManagerTaskProcessService.java => FindManagerTaskProcessService.java} (74%)
 create mode 100644 src/main/java/clap/server/exception/StatisticsException.java
 create mode 100644 src/main/java/clap/server/exception/code/StatisticsErrorCode.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/statistics/PeriodType.java b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/PeriodType.java
new file mode 100644
index 00000000..0df867ec
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/PeriodType.java
@@ -0,0 +1,28 @@
+package clap.server.adapter.inbound.web.dto.statistics;
+
+import clap.server.exception.StatisticsException;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import static clap.server.exception.code.StatisticsErrorCode.STATISTICS_BAD_REQUEST;
+
+@Getter
+@RequiredArgsConstructor
+public enum PeriodType {
+    DAY("day"),
+    WEEK("week"),
+    MONTH("month");
+
+    private final String type;
+
+    @JsonCreator
+    public static PeriodType from(String input) {
+        for (PeriodType periodType : PeriodType.values()) {
+            if (periodType.getType().equals(input)) {
+                return periodType;
+            }
+        }
+        throw new StatisticsException(STATISTICS_BAD_REQUEST);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsResponse.java
new file mode 100644
index 00000000..200f09ab
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsResponse.java
@@ -0,0 +1,5 @@
+package clap.server.adapter.inbound.web.dto.statistics;
+
+public record StatisticsResponse(String key, long count) {
+
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsType.java b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsType.java
new file mode 100644
index 00000000..faf7ae29
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsType.java
@@ -0,0 +1,27 @@
+package clap.server.adapter.inbound.web.dto.statistics;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+@Getter
+@RequiredArgsConstructor
+public enum StatisticsType {
+    REQUEST_BY_PERIOD("request-by-period"),
+    PROCESS_BY_PERIOD("process-by-period"),
+    REQUEST_BY_CATEGORY("request-by-category"),
+    PROCESS_BY_MANAGER("process-by-manager");
+
+    private final String type;
+
+    @JsonCreator
+    public static StatisticsType from(String input) {
+        for (StatisticsType statisticsType : StatisticsType.values()) {
+            if (statisticsType.getType().equals(input)) {
+                return statisticsType;
+            }
+        }
+        return null;
+    }
+}
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 6be9e4c7..91ac152f 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
@@ -1,7 +1,11 @@
 package clap.server.adapter.inbound.web.statistics;
 
+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.common.annotation.architecture.WebAdapter;
+import clap.server.exception.StatisticsException;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -9,7 +13,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.Map;
+import java.util.List;
+
+import static clap.server.exception.code.StatisticsErrorCode.STATISTICS_BAD_REQUEST;
 
 @Tag(name = "작업 관련 통계")
 @WebAdapter
@@ -20,30 +26,49 @@ public class FindStatisticsController {
     private final FindPeriodTaskProcessUsecase findPeriodTaskProcessUsecase;
     private final FindCategoryTaskRequestUsecase findCategoryTaskRequestUsecase;
     private final FindSubCategoryTaskRequestUsecase findSubCategoryTaskRequestUsecase;
-    private final ManagerTaskProcessUsecase managerTaskProcessUsecase;
-
-    @GetMapping(value = "/task-requests-by-period")
-    public ResponseEntity<Map<String, Long>> aggregatePeriodTaskRequest(@RequestParam String period) {
-        return ResponseEntity.ok(findPeriodTaskRequestUsecase.aggregatePeriodTaskRequest(period));
-    }
-
-    @GetMapping("/task-processed-by-period")
-    public ResponseEntity<Map<String, Long>> aggregatePeriodTaskProcess(@RequestParam String period) {
-        return ResponseEntity.ok(findPeriodTaskProcessUsecase.aggregatePeriodTaskProcess(period));
-    }
-
-    @GetMapping("/task-requests-by-category")
-    public ResponseEntity<Map<String, Long>> aggregateCategoryTaskRequest(@RequestParam String period) {
-        return ResponseEntity.ok(findCategoryTaskRequestUsecase.aggregateCategoryTaskRequest(period));
-    }
+    private final FindManagerTaskProcessUsecase findManagerTaskProcessUsecase;
 
-    @GetMapping("/task-requests-by-subcategory")
-    public ResponseEntity<Map<String, Long>> aggregateSubCategoryTaskRequest(@RequestParam String period, @RequestParam String mainCategory) {
-        return ResponseEntity.ok(findSubCategoryTaskRequestUsecase.aggregateSubCategoryTaskRequest(period, mainCategory));
+    @GetMapping
+    public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
+        switch (statisticsType) {
+            case REQUEST_BY_PERIOD ->
+                    ResponseEntity.ok(findPeriodTaskRequestUsecase
+                    .aggregatePeriodTaskRequest(periodType.getType())
+                    .entrySet()
+                    .stream()
+                    .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+                    .toList());
+            case PROCESS_BY_PERIOD ->
+                    ResponseEntity.ok(findPeriodTaskProcessUsecase
+                    .aggregatePeriodTaskProcess(periodType.getType())
+                    .entrySet()
+                    .stream()
+                    .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+                    .toList());
+            case REQUEST_BY_CATEGORY ->
+                    ResponseEntity.ok(findCategoryTaskRequestUsecase.aggregateCategoryTaskRequest(periodType.getType())
+                            .entrySet()
+                            .stream()
+                            .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+                            .toList());
+            case PROCESS_BY_MANAGER ->
+                    ResponseEntity.ok(findManagerTaskProcessUsecase
+                    .aggregateManagerTaskProcess(periodType.getType())
+                    .entrySet()
+                    .stream()
+                    .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+                    .toList());
+        }
+        throw new StatisticsException(STATISTICS_BAD_REQUEST);
     }
 
-    @GetMapping("/tasks-processed-by-manager")
-    public ResponseEntity<Map<String, Long>> aggregateSubCategoryTaskRequest(@RequestParam String period) {
-        return ResponseEntity.ok(managerTaskProcessUsecase.aggregateManagerTaskProcess(period));
+    @GetMapping("/subcategory")
+    public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam String period, @RequestParam String mainCategory) {
+        return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
+                .aggregateSubCategoryTaskRequest(period, mainCategory)
+                .entrySet()
+                .stream()
+                .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+                .toList());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
index 2c5b16e7..6515fc4c 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/PeriodConfig.java
@@ -27,4 +27,4 @@ public long getDaysToSubtract() {
         return daysToSubtract;
     }
 
-}
+}
\ No newline at end of file
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
-                        ))
-        );
-    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java b/src/main/java/clap/server/application/port/inbound/statistics/FindManagerTaskProcessUsecase.java
similarity index 75%
rename from src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
rename to src/main/java/clap/server/application/port/inbound/statistics/FindManagerTaskProcessUsecase.java
index 68026e7a..84e31050 100644
--- a/src/main/java/clap/server/application/port/inbound/statistics/ManagerTaskProcessUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/statistics/FindManagerTaskProcessUsecase.java
@@ -2,6 +2,6 @@
 
 import java.util.Map;
 
-public interface ManagerTaskProcessUsecase {
+public interface FindManagerTaskProcessUsecase {
     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/FindManagerTaskProcessService.java
similarity index 74%
rename from src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
rename to src/main/java/clap/server/application/statistics/FindManagerTaskProcessService.java
index c06141c0..0ae2ae46 100644
--- a/src/main/java/clap/server/application/statistics/ManagerTaskProcessService.java
+++ b/src/main/java/clap/server/application/statistics/FindManagerTaskProcessService.java
@@ -1,6 +1,6 @@
 package clap.server.application.statistics;
 
-import clap.server.application.port.inbound.statistics.ManagerTaskProcessUsecase;
+import clap.server.application.port.inbound.statistics.FindManagerTaskProcessUsecase;
 import clap.server.application.port.outbound.task.TaskDocumentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import lombok.RequiredArgsConstructor;
@@ -9,7 +9,7 @@
 
 @ApplicationService
 @RequiredArgsConstructor
-public class ManagerTaskProcessService implements ManagerTaskProcessUsecase {
+public class FindManagerTaskProcessService implements FindManagerTaskProcessUsecase {
     private final TaskDocumentPort taskDocumentPort;
 
     @Override
diff --git a/src/main/java/clap/server/exception/ExceptionAdvice.java b/src/main/java/clap/server/exception/ExceptionAdvice.java
index d36b3e2a..af782c06 100644
--- a/src/main/java/clap/server/exception/ExceptionAdvice.java
+++ b/src/main/java/clap/server/exception/ExceptionAdvice.java
@@ -3,6 +3,7 @@
 import clap.server.exception.code.AuthErrorCode;
 import clap.server.exception.code.BaseErrorCode;
 import clap.server.exception.code.CommonErrorCode;
+import clap.server.exception.code.StatisticsErrorCode;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
@@ -170,4 +171,16 @@ public ResponseEntity<Object> handleAccessDeniedException(AccessDeniedException
                 AuthErrorCode.FORBIDDEN.getMessage()
         );
     }
+
+    @ExceptionHandler(StatisticsException.class)
+    public ResponseEntity<Object> handleAccessDeniedException(StatisticsException e, WebRequest request) {
+        return handleExceptionInternalFalse(
+                e,
+                StatisticsErrorCode.STATISTICS_BAD_REQUEST,
+                HttpHeaders.EMPTY,
+                HttpStatus.BAD_REQUEST,
+                request,
+                StatisticsErrorCode.STATISTICS_BAD_REQUEST.getMessage()
+        );
+    }
 }
diff --git a/src/main/java/clap/server/exception/StatisticsException.java b/src/main/java/clap/server/exception/StatisticsException.java
new file mode 100644
index 00000000..e06b9776
--- /dev/null
+++ b/src/main/java/clap/server/exception/StatisticsException.java
@@ -0,0 +1,10 @@
+package clap.server.exception;
+
+import clap.server.exception.code.BaseErrorCode;
+
+public class StatisticsException extends BaseException {
+
+    public StatisticsException(BaseErrorCode code) {
+        super(code);
+    }
+}
diff --git a/src/main/java/clap/server/exception/code/StatisticsErrorCode.java b/src/main/java/clap/server/exception/code/StatisticsErrorCode.java
new file mode 100644
index 00000000..8a808121
--- /dev/null
+++ b/src/main/java/clap/server/exception/code/StatisticsErrorCode.java
@@ -0,0 +1,15 @@
+package clap.server.exception.code;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@RequiredArgsConstructor
+public enum StatisticsErrorCode implements BaseErrorCode{
+    STATISTICS_BAD_REQUEST(HttpStatus.BAD_REQUEST, "STATISTICS_001", "잘못된 통계 조회 파라미터 입력.");
+
+    private final HttpStatus httpStatus;
+    private final String customCode;
+    private final String message;
+}

From ea99e9f9fcbe507ba3da4464e2b4751de1b104b7 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 17:47:05 +0900
Subject: [PATCH 08/11] =?UTF-8?q?CLAP-111=20Test=20:=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=EC=BD=94=EB=93=9C=20=EB=B0=8F=20=EC=84=A4=EC=A0=95=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>
- 관련: #74
---
 .../clap/server/TaskflowApplicationTests.java | 22 +++++++++++-------
 .../web/admin/MemberControllerTest.java       | 23 +++++++++++++++----
 src/test/resources/application.yml            |  6 +++--
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/test/java/clap/server/TaskflowApplicationTests.java b/src/test/java/clap/server/TaskflowApplicationTests.java
index 41766b64..65422b39 100644
--- a/src/test/java/clap/server/TaskflowApplicationTests.java
+++ b/src/test/java/clap/server/TaskflowApplicationTests.java
@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
@@ -24,19 +23,26 @@ class TaskflowApplicationTests {
     private MemberRepository memberRepository;
 
     @Container
-//    @ServiceConnection
-    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.5");
-
-    @Container
-    @ServiceConnection
-    public static RedisContainer REDIS_CONTAINER = new RedisContainer(DockerImageName.parse("redis:6.2.6"));
+    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.5")
+            .withReuse(true);
 
     @DynamicPropertySource
-    static void configureProperties(DynamicPropertyRegistry registry) {
+    static void elasticProperties(DynamicPropertyRegistry registry) {
         // Elasticsearch 설정
         registry.add("spring.elasticsearch.uris", ES_CONTAINER::getHttpHostAddress);
     }
 
+    @Container
+    public static RedisContainer REDIS_CONTAINER = new RedisContainer(DockerImageName.parse("redis:6.2.6"))
+            .withReuse(true);
+
+    @DynamicPropertySource
+    static void redisProperties(DynamicPropertyRegistry registry) {
+        // redis 설정
+        registry.add("spring.data.redis.host", REDIS_CONTAINER::getHost);
+        registry.add("spring.data.redis.port", () -> REDIS_CONTAINER.getMappedPort(6379));
+    }
+
     @Test
     void contextLoads() {
         assertThat(memberRepository.findAll()).isEmpty();
diff --git a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
index 5264ed4f..14a1689e 100644
--- a/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
+++ b/src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java
@@ -1,13 +1,15 @@
 package clap.server.adapter.inbound.web.admin;
 
 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.member.constant.DepartmentStatus;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
-import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 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.LabelType;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.config.elastic.ElasticsearchConfig;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
@@ -19,15 +21,17 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
-import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -37,8 +41,19 @@
 @SpringBootTest
 @Transactional
 @AutoConfigureMockMvc
+@Testcontainers
 public class MemberControllerTest {
 
+    @Container
+    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.5")
+            .withReuse(true);
+
+    @DynamicPropertySource
+    static void elasticProperties(DynamicPropertyRegistry registry) {
+        // Elasticsearch 설정
+        registry.add("spring.elasticsearch.uris", ES_CONTAINER::getHttpHostAddress);
+    }
+
     @Autowired
     private MockMvc mockMvc;
 
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 47f4a275..ba283b05 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -14,8 +14,9 @@ spring:
     hibernate:
       ddl-auto: create
 
-  elasticsearch:
-    uris: ${ELASTIC_URI:127.0.0.1:9200}  # 기본 URL로 localhost 사용
+  testcontainers:
+    beans:
+      startup: parallel
 
 swagger:
   server:
@@ -35,3 +36,4 @@ password:
   policy:
     length: 12
     characters: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+"
+

From 24c582db788797ee086f624578a29dea9e651633 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 21:13:31 +0900
Subject: [PATCH 09/11] =?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/application.yml | 19 +++++++++----------
 src/main/resources/mysql.yml       |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ef3f186c..26f09508 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,8 @@ spring:
       - swagger.yml
       - redis.yml
       - auth.yml
-      - optional:classpath:env.properties
   application:
-    name: taskflow2
+    name: taskflow
   elasticsearch:
     uris: ${ELASTIC_URI:127.0.0.1:9200}
 
@@ -24,12 +23,12 @@ server:
       max: 600
       min-spare: 100
 
-logging:
-  level:
-    root: INFO
-    taskflow.clap.server: ERROR
-    org:
-      springframework: DEBUG
+#logging:
+#  level:
+#    root: INFO
+#    taskflow.clap.server: ERROR
+#    org:
+#      springframework: DEBUG
 
 ---
 spring.config.activate.on-profile: local
@@ -37,8 +36,8 @@ logging:
   level:
     root: INFO
     taskflow.clap.server: ERROR
-    org:
-      springframework: DEBUG
+#    org:
+#      springframework: DEBUG
 
 ---
 spring.config.activate.on-profile: dev
diff --git a/src/main/resources/mysql.yml b/src/main/resources/mysql.yml
index a8215604..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:taskflowdev}?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 680428a9740a4c3c72ccc666cb12bd09844646c9 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Fri, 24 Jan 2025 23:38:05 +0900
Subject: [PATCH 10/11] =?UTF-8?q?CLAP-111=20refactor=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EC=8A=A4?=
 =?UTF-8?q?=EC=9B=A8=EA=B1=B0=20=EC=88=98=EC=A0=95=20=EB=B0=8F=202?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EB=B3=84=20?=
 =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #74
---
 .../web/statistics/FindStatisticsController.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 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 91ac152f..cdd2bae6 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
@@ -6,6 +6,8 @@
 import clap.server.application.port.inbound.statistics.*;
 import clap.server.common.annotation.architecture.WebAdapter;
 import clap.server.exception.StatisticsException;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -28,6 +30,9 @@ public class FindStatisticsController {
     private final FindSubCategoryTaskRequestUsecase findSubCategoryTaskRequestUsecase;
     private final FindManagerTaskProcessUsecase findManagerTaskProcessUsecase;
 
+    @Operation(summary = "기본 통계 API")
+    @Parameter(name = "periodType", description = "day, week, month", required = true)
+    @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true)
     @GetMapping
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
         switch (statisticsType) {
@@ -62,10 +67,13 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
         throw new StatisticsException(STATISTICS_BAD_REQUEST);
     }
 
+    @Operation(summary = "1차 카테고리 하위 2차 카테고리별 통계 API")
+    @Parameter(name = "periodType", description = "day, week, month", required = true)
+    @Parameter(name = "mainCategory", description = "1차 카테고리 이름", required = true)
     @GetMapping("/subcategory")
-    public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam String period, @RequestParam String mainCategory) {
+    public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam PeriodType periodType, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
-                .aggregateSubCategoryTaskRequest(period, mainCategory)
+                .aggregateSubCategoryTaskRequest(periodType.getType(), mainCategory)
                 .entrySet()
                 .stream()
                 .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))

From 836ae3f7d4d5fcaf40ce1d68b1e08b38f2fa87a3 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sat, 25 Jan 2025 00:40:25 +0900
Subject: [PATCH 11/11] =?UTF-8?q?CLAP-125=20Feature=20:=201=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #90
---
 .../web/admin/addCategoryController.java      | 36 +++++++++++++++++++
 .../web/dto/admin/AddMainCategoryRequest.java | 13 +++++++
 .../statistics/FindStatisticsController.java  |  9 ++---
 .../CategoryPersistenceAdapter.java           | 10 ++++--
 .../management/AddMainCategoryUsecase.java    |  5 +++
 .../outbound/task/CommandCategoryPort.java    |  7 ++++
 .../service/admin/AddMainCategoryService.java | 30 ++++++++++++++++
 .../server/domain/model/task/Category.java    |  8 +++++
 8 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/admin/addCategoryController.java
 create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java
 create mode 100644 src/main/java/clap/server/application/port/inbound/management/AddMainCategoryUsecase.java
 create mode 100644 src/main/java/clap/server/application/port/outbound/task/CommandCategoryPort.java
 create mode 100644 src/main/java/clap/server/application/service/admin/AddMainCategoryService.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
new file mode 100644
index 00000000..bcf5bec7
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/admin/addCategoryController.java
@@ -0,0 +1,36 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
+import clap.server.application.port.inbound.management.AddMainCategoryUsecase;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Tag(name = "카테고리 추가")
+@WebAdapter
+@RequiredArgsConstructor
+public class addCategoryController {
+    private final AddMainCategoryUsecase addMainCategoryUsecase;
+
+    @Operation(summary = "1차 카테고리 추가")
+    @PostMapping("/api/maincategory")
+    @Secured("ROLE_ADMIN")
+    public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Validated @RequestBody AddMainCategoryRequest addMainCategoryRequest) {
+        addMainCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
+    }
+
+//    @Operation(summary = "2차 카테고리 추가")
+//    @PostMapping("/api/subcategory")
+//    @Secured("ROLE_ADMIN")
+//    public void addSubCategory(@Validated @RequestBody AddCategoryRequest addCategoryRequest) {
+//        addMainCategoryUsecase.addSubCategory(addCategoryRequest.code(), addCategoryRequest.name());
+//    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java
new file mode 100644
index 00000000..32e05296
--- /dev/null
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java
@@ -0,0 +1,13 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import org.hibernate.validator.constraints.Length;
+
+public record AddMainCategoryRequest(
+        @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/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java
index cdd2bae6..742acb6e 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
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import static clap.server.exception.code.StatisticsErrorCode.STATISTICS_BAD_REQUEST;
+import static io.swagger.v3.oas.annotations.enums.ParameterIn.QUERY;
 
 @Tag(name = "작업 관련 통계")
 @WebAdapter
@@ -31,8 +32,8 @@ public class FindStatisticsController {
     private final FindManagerTaskProcessUsecase findManagerTaskProcessUsecase;
 
     @Operation(summary = "기본 통계 API")
-    @Parameter(name = "periodType", description = "day, week, month", required = true)
-    @Parameter(name = "statisticsType", description = "request-by-period, process-by-period, request-by-category, process-by-manager", required = true)
+    @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
     public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
         switch (statisticsType) {
@@ -68,8 +69,8 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
     }
 
     @Operation(summary = "1차 카테고리 하위 2차 카테고리별 통계 API")
-    @Parameter(name = "periodType", description = "day, week, month", required = true)
-    @Parameter(name = "mainCategory", description = "1차 카테고리 이름", required = true)
+    @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
+    @Parameter(name = "mainCategory", description = "1차 카테고리 이름", required = true, in = QUERY)
     @GetMapping("/subcategory")
     public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam PeriodType periodType, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
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 776406b9..2caa61d4 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
 import clap.server.adapter.outbound.persistense.mapper.CategoryPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.task.CategoryRepository;
+import clap.server.application.port.outbound.task.CommandCategoryPort;
 import clap.server.application.port.outbound.task.LoadCategoryPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
 import clap.server.domain.model.task.Category;
@@ -12,7 +13,7 @@
 
 @PersistenceAdapter
 @RequiredArgsConstructor
-public class CategoryPersistenceAdapter implements LoadCategoryPort {
+public class CategoryPersistenceAdapter implements LoadCategoryPort, CommandCategoryPort {
 
     private final CategoryRepository categoryRepository;
     private final CategoryPersistenceMapper categoryPersistenceMapper;
@@ -22,4 +23,9 @@ public Optional<Category> findById(Long id) {
         Optional<CategoryEntity> categoryEntity = categoryRepository.findById(id);
         return categoryEntity.map(categoryPersistenceMapper::toDomain);
     }
-}
+
+    @Override
+    public void save(Category category) {
+        categoryRepository.save(categoryPersistenceMapper.toEntity(category));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/inbound/management/AddMainCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/management/AddMainCategoryUsecase.java
new file mode 100644
index 00000000..9f701dfb
--- /dev/null
+++ b/src/main/java/clap/server/application/port/inbound/management/AddMainCategoryUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.management;
+
+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/outbound/task/CommandCategoryPort.java b/src/main/java/clap/server/application/port/outbound/task/CommandCategoryPort.java
new file mode 100644
index 00000000..04a11b09
--- /dev/null
+++ b/src/main/java/clap/server/application/port/outbound/task/CommandCategoryPort.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.outbound.task;
+
+import clap.server.domain.model.task.Category;
+
+public interface CommandCategoryPort {
+    void save(Category category);
+}
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/AddMainCategoryService.java b/src/main/java/clap/server/application/service/admin/AddMainCategoryService.java
new file mode 100644
index 00000000..82310e66
--- /dev/null
+++ b/src/main/java/clap/server/application/service/admin/AddMainCategoryService.java
@@ -0,0 +1,30 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.inbound.management.AddMainCategoryUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.outbound.task.CommandCategoryPort;
+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 java.util.Optional;
+
+import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class AddMainCategoryService implements AddMainCategoryUsecase {
+    private final CommandCategoryPort commandCategoryPort;
+    private final LoadMemberPort loadMemberPort;
+
+    @Override
+    public void addMainCategory(Long adminId, String code, String name) {
+        Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
+        Category mainCategory = Category.createMainCategory(
+                activeMember.orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND)),
+                code, name);
+        commandCategoryPort.save(mainCategory);
+    }
+}
\ 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 c74d5c17..36a87207 100644
--- a/src/main/java/clap/server/domain/model/task/Category.java
+++ b/src/main/java/clap/server/domain/model/task/Category.java
@@ -22,5 +22,13 @@ public class Category extends BaseTime {
    private String descriptionExample;
    private LocalDateTime createdAt; 
    private LocalDateTime updatedAt;
+
+   public static Category createMainCategory(Member admin, String code, String name) {
+      Category category = new Category();
+      category.admin = admin;
+      category.code = code;
+      category.name = name;
+      return category;
+   }
  }