Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] #261 - O-KR 히스토리 조회 API 변경사항 반영 #262

Merged
merged 2 commits into from
Apr 8, 2024
Merged

[Fix] #261 - O-KR 히스토리 조회 API 변경사항 반영 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9f2b0
[Fix] #261 - History 조회 API 로직 변경
its-sky Apr 8, 2024
469a969
[Fix] #261 - History 조회 API DTO 스펙 변경
its-sky Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions moonshot-api/src/main/java/org/moonshot/objective/dto/response/HistoryResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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());
}
}
8 changes: 1 addition & 7 deletions moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand All @@ -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
Expand Down
Loading