리뷰 반영: 대시보드 집계 안정성 보강

Author: Yunseok3541

src/main/java/com/Rootin/domain/dashboard/service/DashboardService.java

@@ -57,7 +57,7 @@ public GrassGraphResponse getGrassGraph(Long userId) {
                 .sorted(Comparator.comparing(GrassCell::date))
                 .collect(Collectors.toList());
 
-        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED.name()).stream()
+        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED).stream()
                 .map(java.sql.Date::toLocalDate)
                 .toList();
         int currentStreak = levelCalculator.calculateStreakFromDates(publishedDates);
@@ -115,12 +115,12 @@ public PersonalStatsResponse getPersonalStats(Long userId) {
                 .toList();
         int totalStudyDays = wateredDates.size();
 
-        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED.name()).stream()
+        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED).stream()
                 .map(java.sql.Date::toLocalDate)
                 .toList();
         int currentStreak = levelCalculator.calculateStreakFromDates(publishedDates);
 
-        int longestStreak = calculateMaxStreak(wateredDates);
+        int longestStreak = calculateMaxStreak(publishedDates);
 
         int currentPoints = Optional.ofNullable(overview.getCurrentPoints()).orElse(0);
 
@@ -181,18 +181,24 @@ public QuestResponse getQuests(Long userId) {
         // 반열린 구간 [todayStart, tomorrowStart) — datetime(6) microsecond 누락 방지
         LocalDateTime tomorrowStart = today.plusDays(1).atStartOfDay();
 
-        WateringLogAggregateProjection todayStats = wateringLogRepository
+        Optional<WateringLogAggregateProjection> todayStats = wateringLogRepository
                 .aggregateByUserIdAndWateredAtGreaterThanEqualAndWateredAtLessThan(userId, todayStart, tomorrowStart);
+        long todayTilCount = todayStats
+                .map(WateringLogAggregateProjection::getTilCount)
+                .orElse(0L);
+        long todayContentLength = todayStats
+                .map(WateringLogAggregateProjection::getContentLength)
+                .orElse(0L);
 
         // Q1: 오늘 TIL >= 1개
-        boolean q1 = todayStats.getTilCount() >= 1;
+        boolean q1 = todayTilCount >= 1;
 
         // Q2: 오늘 TIL에 태그 >= 1개
         long todayTagCount = tilTagRepository.countByUserTodayTil(userId, PostStatus.PUBLISHED, todayStart, tomorrowStart);
         boolean q2 = todayTagCount >= 1;
 
         // Q3: 오늘 총 글자 수 >= 200
-        boolean q3 = todayStats.getContentLength() >= 200;
+        boolean q3 = todayContentLength >= 200;
 
         // 달성된 퀘스트에 대해 오늘 첫 달성이면 포인트 지급
         awardQuestPoints(userId, q1, q2, q3, today);

src/main/java/com/Rootin/domain/garden/repository/WateringLogRepository.java

@@ -137,7 +137,7 @@ SELECT COUNT(w) AS tilCount,
           AND w.wateredAt >= :from
           AND w.wateredAt < :to
     """)
-    WateringLogAggregateProjection aggregateByUserIdAndWateredAtGreaterThanEqualAndWateredAtLessThan(
+    Optional<WateringLogAggregateProjection> aggregateByUserIdAndWateredAtGreaterThanEqualAndWateredAtLessThan(
             @Param("userId") Long userId,
             @Param("from") LocalDateTime from,
             @Param("to") LocalDateTime to

src/main/java/com/Rootin/domain/garden/service/GardenDashboardService.java

@@ -126,7 +126,7 @@ public GardenInfoResponse getGardenDashboard(Long potId, Long userId) {
 
         // 11. 유저의 TIL 발행 날짜만 조회해 현재 연속 작성일(스트릭)을 계산합니다.
         // 같은 날짜에 여러 글을 작성해도 스트릭에는 날짜 하나만 필요하므로 DISTINCT 날짜 조회로 힙 사용량을 줄입니다.
-        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED.name())
+        List<LocalDate> publishedDates = tilRepository.findDistinctPublishedDatesByUserId(userId, PostStatus.PUBLISHED)
                 .stream()
                 .map(java.sql.Date::toLocalDate)
                 .toList();

src/main/java/com/Rootin/domain/til/repository/TilRepository.java

@@ -40,6 +40,10 @@ List<java.sql.Date> findDistinctPublishedDatesByUserId(
             @Param("status") String status
     );
 
+    default List<java.sql.Date> findDistinctPublishedDatesByUserId(Long userId, PostStatus status) {
+        return findDistinctPublishedDatesByUserId(userId, status.name());
+    }
+
     Optional<Til> findFirstByUserIdAndPotIdAndStatus(Long userId, Long potId, PostStatus status);
 
     @Query("""

src/test/java/com/Rootin/domain/dashboard/service/DashboardServiceQuestTest.java

@@ -224,13 +224,16 @@ void grassGraph_maxStreak_usesOnlyGraphRangeDates() {
     @DisplayName("현재 스트릭은 물주기 로그 날짜가 아니라 TIL 발행 날짜 기준으로 계산한다")
     void currentStreak_usesPublishedTilDates() {
         Til todayTil = tilRepository.save(Til.create(user, "오늘 발행 TIL", "내용", pot));
+        Til anotherTodayTil = tilRepository.save(Til.create(user, "오늘 발행 TIL 2", "내용", pot));
         saveWateringLogAt(todayTil.getId(), 50, LocalDate.now().minusDays(10));
+        saveWateringLogAt(anotherTodayTil.getId(), 50, LocalDate.now().minusDays(9));
 
         var grass = dashboardService.getGrassGraph(user.getId());
         var personalStats = dashboardService.getPersonalStats(user.getId());
 
         assertThat(grass.currentStreak()).isEqualTo(1);
         assertThat(personalStats.currentStreak()).isEqualTo(1);
+        // 물주기 로그 날짜 기준이면 2가 되지만, 개인 통계의 연속 기록은 TIL 발행 날짜 기준으로 통일한다.
         assertThat(personalStats.longestStreak()).isEqualTo(1);
     }