Merge pull request #26 from Team-NewsLetter/fix/#24

fix : 연속일 수정

Author: ss99x2002

src/main/java/com/swacademy/newsletter/repository/user/UserNewsHistoryQueryRepository.java

@@ -39,8 +39,12 @@ public List<UserInfoResponseDto.DailyNewsCheckDto> getDailyNewsCheck(Long userId
         return IntStream.range(0, 7)
                 .mapToObj(i -> {
                     LocalDate date = monday.plusDays(i);
-                    LocalDateTime start = date.atStartOfDay(zone).toLocalDateTime();
-                    LocalDateTime end = date.atTime(LocalTime.MAX).atZone(zone).toLocalDateTime();
+
+                    ZonedDateTime zonedStart = date.atStartOfDay(zone);
+                    ZonedDateTime zonedEnd = date.atTime(LocalTime.MAX).atZone(zone);
+
+                    LocalDateTime start = zonedStart.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                    LocalDateTime end = zonedEnd.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 
                     boolean checked = query
                             .selectOne()
@@ -49,15 +53,31 @@ public List<UserInfoResponseDto.DailyNewsCheckDto> getDailyNewsCheck(Long userId
                                     .and(newsHistory.readAt.between(start, end)))
                             .fetchFirst() != null;
 
-                    return new UserInfoResponseDto.DailyNewsCheckDto(date.getDayOfMonth(), checked);
+                    return new UserInfoResponseDto.DailyNewsCheckDto(date.getDayOfMonth(), checked, date);
                 })
                 .toList();
     }
 
     public int countConsecutiveDays(List<UserInfoResponseDto.DailyNewsCheckDto> checks) {
-        return (int) checks.stream()
-                .sorted(Comparator.comparingInt(UserInfoResponseDto.DailyNewsCheckDto::getDay))
-                .takeWhile(UserInfoResponseDto.DailyNewsCheckDto::getChecked)
-                .count();
+        List<UserInfoResponseDto.DailyNewsCheckDto> sorted = checks.stream()
+                .filter(check -> check.getDate() != null)
+                .sorted(Comparator.comparing(UserInfoResponseDto.DailyNewsCheckDto::getDate))
+                .toList();
+
+        int count = 0;
+        LocalDate expected = null;
+
+        for (UserInfoResponseDto.DailyNewsCheckDto check : sorted) {
+            if (!Boolean.TRUE.equals(check.getChecked())) break;
+            if (expected == null) {
+                expected = check.getDate();
+            } else if (!check.getDate().equals(expected)) {
+                break;
+            }
+            count++;
+            expected = expected.plusDays(1);
+        }
+
+        return count;
     }
 }

src/main/java/com/swacademy/newsletter/web/dto/response/user/UserInfoResponseDto.java

@@ -1,6 +1,9 @@
 package com.swacademy.newsletter.web.dto.response.user;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
+
+import java.time.LocalDate;
 import java.util.List;
 
 @Getter
@@ -23,6 +26,9 @@ public class UserInfoResponseDto {
     public static class DailyNewsCheckDto {
         private Integer day;      // 예: 1, 2
         private Boolean checked;  // 예: true, false
+
+        @JsonIgnore
+        private LocalDate date;  // 내부 연산용
     }
 
     @Getter