CLAP-94 Feature: 1차 카테고리별 작업 요청량 조회 API 조회

hyoseong-Choi · hyoseong-Choi · commit 036dbf141874 · 2025-01-21T16:17:18.000+09:00
<footer> - 관련: #48
diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/StatisticsFindController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/StatisticsFindController.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.web.statistics;
 
+import clap.server.application.port.inbound.statistics.CategoryTaskRequestUsecase;
 import clap.server.application.port.inbound.statistics.PeriodTaskProcessUsecase;
 import clap.server.application.port.inbound.statistics.PeriodTaskRequestUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
@@ -14,7 +15,7 @@
 public class StatisticsFindController {
     private final PeriodTaskRequestUsecase periodTaskRequestUsecase;
     private final PeriodTaskProcessUsecase periodTaskProcessUsecase;
-//    private final CategoryTaskRequestUsecase categoryTaskRequestUsecase;
+    private final CategoryTaskRequestUsecase categoryTaskRequestUsecase;
 //    private final SubCategoryTaskRequestUsecase subCategoryTaskRequestUsecase;
 //    private final ManagerTaskProcessUsecase managerTaskProcessUsecase;
 
@@ -27,8 +28,11 @@ public Map<String, Long> aggregatePeriodTaskRequest(@RequestParam String period)
     public Map<String, Long> aggregatePeriodTaskProcess(@RequestParam String period) {
         return periodTaskProcessUsecase.periodTaskProcessAggregate(period);
     }
-//    @GetMapping("/task/statistics/task-requests-by-category")
-//
+    @GetMapping("/task/statistics/task-requests-by-category")
+    public Map<String, Long> aggregateCategoryTaskRequest(@RequestParam String period) {
+        return categoryTaskRequestUsecase.categoryTaskRequestAggregate(period);
+    }
+
 //    @GetMapping("/task/statistics/task-requests-by-subcategory")
 //
 //    @GetMapping("/task/statistics/tasks-processed-by-manager")
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/ElasticTaskAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/ElasticTaskAdapter.java
@@ -1,12 +1,10 @@
 package clap.server.adapter.outbound.infrastructure.elastic;
 
-import clap.server.adapter.outbound.infrastructure.elastic.dto.PeriodConfig;
 import clap.server.adapter.outbound.infrastructure.elastic.entity.ElasticTask;
 import clap.server.adapter.outbound.infrastructure.elastic.repository.TaskElasticRepository;
 import clap.server.application.port.outbound.task.ElasticTaskPort;
 import clap.server.common.annotation.architecture.InfrastructureAdapter;
 import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
-import co.elastic.clients.elasticsearch._types.aggregations.CalendarInterval;
 import co.elastic.clients.elasticsearch._types.aggregations.MultiBucketBase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.elasticsearch.client.elc.ElasticsearchAggregations;
@@ -32,27 +30,26 @@ public void saveStatistics(List<ElasticTask> statistics) {
 
     @Override
     public Map<String, Long> findPeriodTaskRequestByPeriod(String period) {
-        PeriodConfig periodConfig = getPeriodConfig(period);
+        PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildPeriodTaskRequestQuery(periodConfig);
-        ElasticsearchAggregations result = executeQuery(query);
-        return processResults(result, periodConfig);
+        return getPeriodTaskResults(executeQuery(query), periodConfig);
     }
 
     @Override
     public Map<String, Long> findPeriodTaskProcessByPeriod(String period) {
-        PeriodConfig periodConfig = getPeriodConfig(period);
+        PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildPeriodTaskProcessQuery(periodConfig);
-        ElasticsearchAggregations result = executeQuery(query);
-        return processResults(result, periodConfig);
+        return getPeriodTaskResults(executeQuery(query), periodConfig);
     }
 
-    private PeriodConfig getPeriodConfig(String period) {
-        if (period.equals("week")) {
-            return new PeriodConfig(14, CalendarInterval.Day, 0, 10);
-        }
-        return new PeriodConfig(1, CalendarInterval.Hour, 11, 19);
+    @Override
+    public Map<String, Long> findCategoryTaskRequestByPeriod(String period) {
+        PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
+
+        NativeQuery query = buildCategoryTaskRequestQuery(periodConfig);
+        return getCategoryTaskResults(executeQuery(query));
     }
 
     private NativeQuery buildPeriodTaskRequestQuery(PeriodConfig config) {
@@ -61,10 +58,10 @@ private NativeQuery buildPeriodTaskRequestQuery(PeriodConfig config) {
                         .range(r -> r
                                 .date(d -> d
                                         .field("created_at")
-                                        .gte(String.valueOf(LocalDate.now().minusDays(config.daysToSubtract()))))))
+                                        .gte(String.valueOf(LocalDate.now().minusDays(config.getDaysToSubtract()))))))
                 .withAggregation("period_task", AggregationBuilders.dateHistogram()
                         .field("created_at")
-                        .calendarInterval(config.calendarInterval())
+                        .calendarInterval(config.getCalendarInterval())
                         .build()._toAggregation())
                 .withMaxResults(0)
                 .build();
@@ -76,7 +73,7 @@ private NativeQuery buildPeriodTaskProcessQuery(PeriodConfig config) {
                         .range(r -> r
                                 .date(d -> d
                                         .field("created_at")
-                                        .gte(String.valueOf(LocalDate.now().minusDays(config.daysToSubtract())))))).build();
+                                        .gte(String.valueOf(LocalDate.now().minusDays(config.getDaysToSubtract())))))).build();
         NativeQuery statusQuery = NativeQuery.builder()
                 .withQuery(q -> q
                         .term(v -> v
@@ -87,10 +84,24 @@ private NativeQuery buildPeriodTaskProcessQuery(PeriodConfig config) {
                 .withQuery(q -> q
                         .bool(b -> b
                                 .must(rangeQuery.getQuery(), statusQuery.getQuery()))
-                        )
+                )
                 .withAggregation("period_task", AggregationBuilders.dateHistogram()
                         .field("created_at")
-                        .calendarInterval(config.calendarInterval())
+                        .calendarInterval(config.getCalendarInterval())
+                        .build()._toAggregation())
+                .withMaxResults(0)
+                .build();
+    }
+
+    private NativeQuery buildCategoryTaskRequestQuery(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("category_task", AggregationBuilders.terms()
+                        .field("main_category")
                         .build()._toAggregation())
                 .withMaxResults(0)
                 .build();
@@ -102,7 +113,7 @@ private ElasticsearchAggregations executeQuery(NativeQuery query) {
                 .getAggregations();
     }
 
-    private Map<String, Long> processResults(ElasticsearchAggregations aggregations, PeriodConfig config) {
+    private Map<String, Long> getPeriodTaskResults(ElasticsearchAggregations aggregations, PeriodConfig config) {
         return new TreeMap<>(
                 aggregations.get("period_task")
                         .aggregation()
@@ -113,11 +124,27 @@ private Map<String, Long> processResults(ElasticsearchAggregations aggregations,
                         .stream()
                         .collect(Collectors.toMap(
                                 bucket -> bucket.keyAsString().substring(
-                                        config.substringStart(),
-                                        config.substringEnd()
+                                        config.getSubstringStart(),
+                                        config.getSubstringEnd()
                                 ),
                                 MultiBucketBase::docCount
                         ))
         );
     }
+
+    private Map<String, Long> getCategoryTaskResults(ElasticsearchAggregations aggregations) {
+        return new TreeMap<>(
+                aggregations.get("category_task")
+                        .aggregation()
+                        .getAggregate()
+                        .sterms()
+                        .buckets()
+                        .array()
+                        .stream()
+                        .collect(Collectors.toMap(
+                                bucket -> bucket.key().stringValue(),
+                                MultiBucketBase::docCount
+                        ))
+        );
+    }
 }
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
@@ -0,0 +1,18 @@
+package clap.server.adapter.outbound.infrastructure.elastic;
+
+import co.elastic.clients.elasticsearch._types.aggregations.CalendarInterval;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum PeriodConfig {
+    DAY(1, CalendarInterval.Hour, 11, 19),
+    WEEK(14, CalendarInterval.Day, 0, 10);
+
+    private final long daysToSubtract;
+    private final CalendarInterval calendarInterval;
+    private final int substringStart;
+    private final int substringEnd;
+
+}
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/dto/PeriodConfig.java b/src/main/java/clap/server/adapter/outbound/infrastructure/elastic/dto/PeriodConfig.java
diff --git a/src/main/java/clap/server/application/port/inbound/statistics/CategoryTaskRequestUsecase.java b/src/main/java/clap/server/application/port/inbound/statistics/CategoryTaskRequestUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.statistics;
+
+import java.util.Map;
+
+public interface CategoryTaskRequestUsecase {
+    Map<String, Long> categoryTaskRequestAggregate(String period);
+}
diff --git a/src/main/java/clap/server/application/port/outbound/task/ElasticTaskPort.java b/src/main/java/clap/server/application/port/outbound/task/ElasticTaskPort.java
@@ -11,4 +11,6 @@ public interface ElasticTaskPort {
     Map<String, Long> findPeriodTaskRequestByPeriod(String period);
 
     Map<String, Long> findPeriodTaskProcessByPeriod(String period);
+
+    Map<String, Long> findCategoryTaskRequestByPeriod(String period);
 }
diff --git a/src/main/java/clap/server/application/statistics/CategoryTaskRequestService.java b/src/main/java/clap/server/application/statistics/CategoryTaskRequestService.java
@@ -0,0 +1,19 @@
+package clap.server.application.statistics;
+
+import clap.server.application.port.inbound.statistics.CategoryTaskRequestUsecase;
+import clap.server.application.port.outbound.task.ElasticTaskPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class CategoryTaskRequestService implements CategoryTaskRequestUsecase {
+    private final ElasticTaskPort elasticTaskPort;
+
+    @Override
+    public Map<String, Long> categoryTaskRequestAggregate(String period) {
+        return elasticTaskPort.findCategoryTaskRequestByPeriod(period);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,6 @@ public interface ElasticTaskPort {`
`11`	`11`	`Map<String, Long> findPeriodTaskRequestByPeriod(String period);`
`12`	`12`
`13`	`13`	`Map<String, Long> findPeriodTaskProcessByPeriod(String period);`
	`14`	`+`
	`15`	`+ Map<String, Long> findCategoryTaskRequestByPeriod(String period);`
`14`	`16`	`}`