Merge pull request #262 from MOONSHOT-Team/feature/#261

[Fix] #261 - O-KR 히스토리 조회 API 변경사항 반영
MOONSHOT-Team · Apr 8, 2024 · 044f341 · 044f341
2 parents 5003db9 + 469a969
commit 044f341
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/dto/response/HistoryResponseDto.java b/moonshot-api/src/main/java/org/moonshot/objective/dto/response/HistoryResponseDto.java
@@ -1,20 +1,12 @@
 package org.moonshot.objective.dto.response;
 
 import java.util.List;
-import java.util.Map;
-import org.moonshot.objective.model.Criteria;
 
 public record HistoryResponseDto(
         List<ObjectiveGroupByYearDto> groups,
-        List<YearDto> years,
         List<String> categories
 ) {
-    public static HistoryResponseDto of(List<ObjectiveGroupByYearDto> groups, Map<Integer, Integer> years,
-                                        List<String> categories, Criteria criteria) {
-        return new HistoryResponseDto(
-                groups,
-                YearDto.of(years),
-                categories.stream().distinct().toList()
-        );
+    public static HistoryResponseDto of(List<ObjectiveGroupByYearDto> groups, List<String> categories) {
+        return new HistoryResponseDto(groups, categories.stream().distinct().toList());
     }
 }
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java b/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java
@@ -14,7 +14,6 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.moonshot.common.model.Period;
@@ -120,11 +119,6 @@ public HistoryResponseDto getObjectiveHistory(final Long userId, final Integer y
         List<Objective> objectives = objectiveRepository.findObjectives(userId, year, category, criteria);
         Map<Integer, List<Objective>> groups = objectives.stream()
                 .collect(Collectors.groupingBy(objective -> objective.getPeriod().getStartAt().getYear()));
-        Map<Integer, Integer> years = groups.entrySet().stream()
-                .collect(Collectors.toMap(
-                        Entry::getKey,
-                        entry -> entry.getValue().size()
-                ));
         List<String> categories = objectives.stream().map(objective -> objective.getCategory().getValue()).toList();
 
         List<ObjectiveGroupByYearDto> groupList = groups.entrySet().stream()
@@ -142,7 +136,7 @@ public HistoryResponseDto getObjectiveHistory(final Long userId, final Integer y
                     .sorted(Comparator.comparingInt(ObjectiveGroupByYearDto::year).reversed()).toList();
         }
 
-        return HistoryResponseDto.of(groupsSortedByCriteria, years, categories, criteria);
+        return HistoryResponseDto.of(groupsSortedByCriteria, categories);
     }
 
     @Override