CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정

<footer>
- 관련: #74

Author: hyoseong-Choi

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;
+    }
+
 }

src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java

@@ -50,23 +50,23 @@ 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
     public Map<String, Long> findSubCategoryTaskRequestByPeriod(String period, String mainCategory) {
         PeriodConfig periodConfig = PeriodConfig.valueOf(period.toUpperCase());
 
         NativeQuery query = buildSubCategoryTaskRequestQuery(periodConfig, mainCategory);
-        return getCategoryTaskResults(executeQuery(query));
+        return getNonPeriodTaskResults(executeQuery(query), "category_task");
     }
 
     @Override
     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()

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);
     }
 }

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);
     }
 }

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;
+        
+    }
+}