diff --git a/src/main/java/com/umc/mada/todo/service/ChartService.java b/src/main/java/com/umc/mada/todo/service/ChartService.java index 1a1254b..ec70c93 100644 --- a/src/main/java/com/umc/mada/todo/service/ChartService.java +++ b/src/main/java/com/umc/mada/todo/service/ChartService.java @@ -107,18 +107,16 @@ public StatisticsResponseDto monthlyStatistics(Authentication authentication, Lo public Map findDatesWithTodosByMonth(Authentication authentication, YearMonth yearMonth) { User user = userRepository.findByAuthId(authentication.getName()).orElseThrow(()-> new RuntimeException("올바른 유저 ID가 아닙니다.")); - Set datesWithTodosSet = new HashSet<>(); // 투두 - List todoDates = todoRepository.findDistinctDaysByUserIdAndYearMonth(user.getId(), yearMonth.toString()); - datesWithTodosSet.addAll(todoDates); + Set datesWithTodosSet = new HashSet<>(todoRepository.findDistinctDaysByUserIdAndYearMonth(user.getId(), yearMonth.toString())); // 반복 투두 - List recurringTodoDates = repeatTodoRepository.findDistinctDaysByUserIdAndYearMonth(user.getId(), yearMonth.toString()); - datesWithTodosSet.addAll(recurringTodoDates); + datesWithTodosSet.addAll(repeatTodoRepository.findDistinctDaysByUserIdAndYearMonth(user.getId(), yearMonth.toString())); List datesWithTodos = new ArrayList<>(datesWithTodosSet); Collections.sort(datesWithTodos); + Map map = new LinkedHashMap<>(); Map data = new LinkedHashMap<>(); data.put("datesWithTodos", datesWithTodos);