diff --git a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java index 1dfadec..147ab19 100644 --- a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java +++ b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java @@ -38,27 +38,28 @@ public HabitReportResponseDto getHabitReport(Long memberId, int year, int month) .map(data -> new HabitReportResponseDto.WeeklyData((int) data[0], (long) data[1], (long) data[2])) .collect(Collectors.toList()); - // 주별 활동 횟수 조회 및 변환 + // 주별 활동 횟수 List weeklyHabitCountsData = habitHistoryRepository.getWeeklyHabitCounts(memberId, year, month); List weeklyHabitCounts = weeklyHabitCountsData.stream() .map(data -> new HabitReportResponseDto.WeeklyData( ((Number) data[0]).intValue(), // 주차 ((Number) data[1]).longValue(), // 습관 ID - ((BigDecimal) data[2]).longValue() // 활동 횟수 (BigDecimal → Long 변환) + Long.parseLong(String.valueOf(data[2])) // 활동 횟수 (BigDecimal -> String -> Long) )) .collect(Collectors.toList()); -// 주별 활동 시간 조회 및 변환 +// 주별 활동 시간 List weeklyActiveTimeData = habitHistoryRepository.getWeeklyActiveTime(memberId, year, month); List weeklyActiveTime = weeklyActiveTimeData.stream() .map(data -> new HabitReportResponseDto.WeeklyData( ((Number) data[0]).intValue(), // 주차 ((Number) data[1]).longValue(), // 습관 ID - ((BigDecimal) data[2]).longValue() // 활동 시간 (BigDecimal → Long 변환) + Long.parseLong(String.valueOf(data[2])) // 활동 시간 (BigDecimal -> String -> Long) )) .collect(Collectors.toList()); + return new HabitReportResponseDto(recordPercentage, achievementGrowth, topHabit, weeklyAchievementRates, weeklyActiveTime,weeklyHabitCounts); } }