Skip to content

Fix: 리포트 타입 에러 수정 #60

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

Merged
yeondub1121 merged 1 commit into from
Feb 21, 2025
Merged

Fix: 리포트 타입 에러 수정 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/main/java/Spring/MindStone/repository/habitRepository/HabitHistoryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ int countCompletedHabitsByMonth(@Param("memberId") Long memberId,
@Param("year") int year,
@Param("month") int month);

// 특정 주별 습관 달성 횟수 조회 (리포트)
@Query(value = "SELECT WEEK(hh.created_at), hh.habit_id, COUNT(*) " +
// 주별 습관 달성 횟수 조회 (리포트)
@Query(value = "SELECT WEEK(hh.created_at), hh.habit_id, CAST(COUNT(*) AS SIGNED) " +
"FROM habit_history hh " +
"WHERE hh.member_id = :memberId " +
"AND YEAR(hh.created_at) = :year " +
Expand All @@ -114,8 +114,8 @@ List<Object[]> getWeeklyHabitCounts(@Param("memberId") Long memberId,
@Param("year") int year,
@Param("month") int month);

// 특정 주별 활동 시간 조회 (리포트)
@Query(value = "SELECT WEEK(he.start_time), hh.habit_id, SUM(TIMESTAMPDIFF(MINUTE, he.start_time, COALESCE(he.end_time, he.start_time))) " +
// 주별 활동 시간 조회 (리포트)
@Query(value = "SELECT WEEK(he.start_time), hh.habit_id, CAST(SUM(TIMESTAMPDIFF(MINUTE, he.start_time, COALESCE(he.end_time, he.start_time))) AS SIGNED) " +
"FROM habit_history hh " +
"JOIN habit_execution he ON hh.id = he.habit_history_id " +
"WHERE hh.member_id = :memberId " +
Expand All @@ -127,6 +127,7 @@ List<Object[]> getWeeklyActiveTime(@Param("memberId") Long memberId,
@Param("year") int year,
@Param("month") int month);


// 달성률 증가율 계산 (리포트)
@Query(value = "SELECT (endRate - startRate) * 100.0 / NULLIF(startRate, 0) " +
"FROM (SELECT " +
Expand Down
24 changes: 14 additions & 10 deletions src/main/java/Spring/MindStone/service/habitService/HabitReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,27 @@ 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<Object[]> weeklyActiveTimeData = habitHistoryRepository.getWeeklyActiveTime(memberId, year, month);
List<HabitReportResponseDto.WeeklyData> weeklyActiveTime = weeklyActiveTimeData.stream()
.map(data -> new HabitReportResponseDto.WeeklyData((int) data[0], (long) data[1], (long) data[2]))
.collect(Collectors.toList());

// 주별 활동 횟수
// 주별 활동 횟수 조회 및 변환
List<Object[]> weeklyHabitCountsData = habitHistoryRepository.getWeeklyHabitCounts(memberId, year, month);
List<HabitReportResponseDto.WeeklyData> weeklyHabitCounts = weeklyHabitCountsData.stream()
.map(data -> new HabitReportResponseDto.WeeklyData(
((Number) data[0]).intValue(),
((Number) data[1]).longValue(),
((BigDecimal) data[2]).longValue()
((Number) data[0]).intValue(), // 주차
((Number) data[1]).longValue(), // 습관 ID
((BigDecimal) data[2]).longValue() // 활동 횟수 (BigDecimal → Long 변환)
))
.collect(Collectors.toList());

// 주별 활동 시간 조회 및 변환
List<Object[]> weeklyActiveTimeData = habitHistoryRepository.getWeeklyActiveTime(memberId, year, month);
List<HabitReportResponseDto.WeeklyData> weeklyActiveTime = weeklyActiveTimeData.stream()
.map(data -> new HabitReportResponseDto.WeeklyData(
((Number) data[0]).intValue(), // 주차
((Number) data[1]).longValue(), // 습관 ID
((BigDecimal) data[2]).longValue() // 활동 시간 (BigDecimal → Long 변환)
))
.collect(Collectors.toList());


return new HabitReportResponseDto(recordPercentage, achievementGrowth, topHabit, weeklyAchievementRates, weeklyActiveTime,weeklyHabitCounts);
}
}