CLAP-158 Refactor: 통계 usecase 통합 및 매핑 로직 구현 클래스 수정

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/dto/statistics/StatisticsResponse.java

@@ -1,5 +1,7 @@
 package clap.server.adapter.inbound.web.dto.statistics;
 
-public record StatisticsResponse(String key, long count) {
+public record StatisticsResponse(
+        String key,
+        long count) {
 
 }

src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java

@@ -25,11 +25,9 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks/statistics")
 public class FindStatisticsController {
-    private final FindPeriodTaskRequestUsecase findPeriodTaskRequestUsecase;
-    private final FindPeriodTaskProcessUsecase findPeriodTaskProcessUsecase;
-    private final FindCategoryTaskRequestUsecase findCategoryTaskRequestUsecase;
+    private final FindTaskProcessUsecase findTaskProcessUsecase;
     private final FindSubCategoryTaskRequestUsecase findSubCategoryTaskRequestUsecase;
-    private final FindManagerTaskProcessUsecase findManagerTaskProcessUsecase;
+
 
     @Operation(summary = "기본 통계 API")
     @Parameter(name = "periodType", description = "day, week, month", required = true, in = QUERY)
@@ -38,32 +36,13 @@ public class FindStatisticsController {
     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());
+                    ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType()));
+            case PROCESS_BY_PERIOD -> ResponseEntity.ok(findTaskProcessUsecase
+                    .aggregatePeriodTaskProcess(periodType.getType()));
             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());
+                    ResponseEntity.ok(findTaskProcessUsecase.aggregateCategoryTaskRequest(periodType.getType()));
+            case PROCESS_BY_MANAGER -> ResponseEntity.ok(findTaskProcessUsecase
+                    .aggregateManagerTaskProcess(periodType.getType()));
         }
         throw new StatisticsException(STATISTICS_BAD_REQUEST);
     }
@@ -74,10 +53,6 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
     @GetMapping("/subcategory")
     public ResponseEntity<List<StatisticsResponse>> aggregateSubCategoryTaskRequest(@RequestParam PeriodType periodType, @RequestParam String mainCategory) {
         return ResponseEntity.ok(findSubCategoryTaskRequestUsecase
-                .aggregateSubCategoryTaskRequest(periodType.getType(), mainCategory)
-                .entrySet()
-                .stream()
-                .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
-                .toList());
+                .aggregateSubCategoryTaskRequest(periodType.getType(), mainCategory));
     }
 }

src/main/java/clap/server/application/mapper/response/FindTaskStatisticsMapper.java

@@ -0,0 +1,19 @@
+package clap.server.application.mapper.response;
+
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
+
+import java.util.List;
+import java.util.Map;
+
+public class FindTaskStatisticsMapper {
+    private FindTaskStatisticsMapper() {
+        throw new IllegalArgumentException();
+    }
+
+    public static List<StatisticsResponse> toStatisticsResponse(Map<String, Long> map){
+        return map.entrySet()
+            .stream()
+            .map(result -> new StatisticsResponse(result.getKey(), result.getValue()))
+            .toList();
+    }
+}

src/main/java/clap/server/application/port/inbound/statistics/FindCategoryTaskRequestUsecase.java

@@ -1,7 +1,9 @@
 package clap.server.application.port.inbound.statistics;
 
-import java.util.Map;
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
+
+import java.util.List;
 
 public interface FindSubCategoryTaskRequestUsecase {
-    Map<String, Long> aggregateSubCategoryTaskRequest(String period, String mainCategory);
+    List<StatisticsResponse> aggregateSubCategoryTaskRequest(String period, String mainCategory);
 }

src/main/java/clap/server/application/port/inbound/statistics/FindManagerTaskProcessUsecase.java

@@ -0,0 +1,12 @@
+package clap.server.application.port.inbound.statistics;
+
+import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse;
+
+import java.util.List;
+
+public interface FindTaskProcessUsecase {
+    List<StatisticsResponse> aggregateCategoryTaskRequest(String period);
+    List<StatisticsResponse> aggregateManagerTaskProcess(String period);
+    List<StatisticsResponse> aggregatePeriodTaskProcess(String period);
+    List<StatisticsResponse> aggregatePeriodTaskRequest(String period);
+}