feat(report): 일간 리포트의 날짜 경계 엣지 케이스 처리 로직 구현 (#108)

* feat(report): 일간 리포트의 날짜 경계 엣지 케이스 처리 로직 구현

n일에 할당된 오늘의 질문에 대한 답변이 n+1일에 제출된 경우

* refactor(report): AnswerEntryService, PendingDailyReportService의 조회 로직 변경

createdAt 시간 범위(Range) 기반 조회 -> 비즈니스 날짜(Date) 필드 기반 조회

* refactor(report): QuestionCommandService의 조회 로직 변경

createdAt 시간 범위(Range) 기반 조회 -> 비즈니스 날짜(Date) 필드 기반 조회

Author: 1Seob

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/application/DailyReportQueryService.java

@@ -10,11 +10,12 @@
 import com.devkor.ifive.nadab.global.core.response.ErrorCode;
 import com.devkor.ifive.nadab.global.exception.NotFoundException;
 import com.devkor.ifive.nadab.global.shared.util.TodayDateTimeProvider;
-import com.devkor.ifive.nadab.global.shared.util.dto.TodayDateTimeRangeDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+
 
 @Service
 @RequiredArgsConstructor
@@ -29,12 +30,12 @@ public DailyReportResponse getDailyReport(Long id) {
         User user = userRepository.findById(id)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.USER_NOT_FOUND));
 
-        TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();
+        LocalDate today = TodayDateTimeProvider.getTodayDate();
 
-        AnswerEntry entry = answerEntryRepository.findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
+        AnswerEntry entry = answerEntryRepository.findByUserAndDate(user, today)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.ANSWER_NOT_FOUND));
 
-        DailyReport report = dailyReportRepository.findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
+        DailyReport report = dailyReportRepository.findByAnswerEntryAndDate(entry, today)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.DAILY_REPORT_NOT_FOUND));
 
         return new DailyReportResponse(

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/application/DailyReportService.java

@@ -44,13 +44,20 @@ public CreateDailyReportResponse generateDailyReport(Long userId, DailyReportReq
                 .orElseThrow(() -> new NotFoundException(ErrorCode.QUESTION_NOT_FOUND));
 
         LocalDate today = TodayDateTimeProvider.getTodayDate();
+
+        // 1. 오늘 -> 어제 순서로 조회 (없으면 예외)
         UserDailyQuestion udq = userDailyQuestionRepository.findByUserIdAndDate(userId, today)
+                .or(() -> userDailyQuestionRepository.findByUserIdAndDate(userId, today.minusDays(1)))
                 .orElseThrow(() -> new NotFoundException(ErrorCode.DAILY_QUESTION_NOT_FOUND));
+
+        // 2. 결과 날짜를 비교하여 플래그 설정
+        boolean isDayPassed = !udq.getDate().isEqual(today);
+
         if (!udq.getDailyQuestion().getId().equals(request.questionId())) {
             throw new BadRequestException(ErrorCode.DAILY_QUESTION_MISMATCH);
         }
 
-        PrepareDailyResultDto prep = dailyReportTxService.prepareDaily(user, question, request.answer());
+        PrepareDailyResultDto prep = dailyReportTxService.prepareDaily(user, question, request.answer(), isDayPassed);
 
         AnswerEntry answerEntry = prep.entry();
 

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/application/DailyReportTxService.java

@@ -42,13 +42,13 @@ public class DailyReportTxService {
 
     private static final long DAILY_REPORT_REWARD = 10L;
 
-    protected PrepareDailyResultDto prepareDaily(User user, DailyQuestion dq, String answerText) {
+    protected PrepareDailyResultDto prepareDaily(User user, DailyQuestion dq, String answerText, boolean isDayPassed) {
 
         //  AnswerEntry 생성 또는 조회 (별도의 트랜잭션)
-        AnswerEntry entry = answerEntryService.getOrCreateTodayAnswerEntry(user, dq, answerText);
+        AnswerEntry entry = answerEntryService.getOrCreateTodayAnswerEntry(user, dq, answerText, isDayPassed);
 
         // DailyReport PENDING 생성 또는 조회 (별도의 트랜잭션)
-        DailyReport report = pendingDailyReportService.getOrCreatePendingDailyReport(entry);
+        DailyReport report = pendingDailyReportService.getOrCreatePendingDailyReport(entry, isDayPassed);
 
         return new PrepareDailyResultDto(entry, report.getId(), user.getId());
     }

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/AnswerEntryRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.Optional;
 
@@ -22,7 +23,7 @@ boolean existsActiveAnswer(
             @Param("questionId") Long questionId
     );
 
-    Optional<AnswerEntry> findByUserAndCreatedAtBetween(User user, OffsetDateTime start, OffsetDateTime end);
+    Optional<AnswerEntry> findByUserAndDate(User user, LocalDate date);
 
-    boolean existsByUserAndCreatedAtBetween(User user, OffsetDateTime start, OffsetDateTime end);
+    boolean existsByUserAndDate(User user, LocalDate date);
 }

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/DailyReportRepository.java

@@ -6,6 +6,7 @@
 import com.devkor.ifive.nadab.domain.dailyreport.core.entity.DailyReport;
 import com.devkor.ifive.nadab.domain.dailyreport.core.entity.DailyReportStatus;
 import com.devkor.ifive.nadab.domain.user.core.entity.InterestCode;
+import com.devkor.ifive.nadab.domain.user.core.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -37,7 +38,7 @@ public interface DailyReportRepository extends JpaRepository<DailyReport, Long>
     """)
     int markFailed(@Param("reportId") Long reportId);
 
-    Optional<DailyReport> findByAnswerEntryAndCreatedAtBetween(AnswerEntry answerEntry, OffsetDateTime start, OffsetDateTime end);
+    Optional<DailyReport> findByAnswerEntryAndDate(AnswerEntry answerEntry, LocalDate date);
 
     /**
      * 특정 유저의 주간 범위 내 COMPLETED 일간 리포트 개수를 반환합니다.

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/service/AnswerEntryService.java

@@ -5,7 +5,6 @@
 import com.devkor.ifive.nadab.domain.question.core.entity.DailyQuestion;
 import com.devkor.ifive.nadab.domain.user.core.entity.User;
 import com.devkor.ifive.nadab.global.shared.util.TodayDateTimeProvider;
-import com.devkor.ifive.nadab.global.shared.util.dto.TodayDateTimeRangeDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
@@ -22,20 +21,18 @@ public class AnswerEntryService {
 
 
     @Transactional
-    public AnswerEntry getOrCreateTodayAnswerEntry(User user, DailyQuestion dq, String answerText) {
+    public AnswerEntry getOrCreateTodayAnswerEntry(User user, DailyQuestion dq, String answerText, boolean isDayPassed) {
 
-        TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();
+        LocalDate targetDate =
+                isDayPassed ? TodayDateTimeProvider.getTodayDate().minusDays(1) : TodayDateTimeProvider.getTodayDate();
 
-        LocalDate today = TodayDateTimeProvider.getTodayDate();
-
-        return answerEntryRepository.
-                findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
+        return answerEntryRepository.findByUserAndDate(user, targetDate)
                 .orElseGet(() -> {
                     try {
-                        return answerEntryRepository.save(AnswerEntry.create(user, dq, answerText, today));
+                        return answerEntryRepository.save(AnswerEntry.create(user, dq, answerText, targetDate));
                     } catch (DataIntegrityViolationException e) {
                         // 동시 요청에서 이미 누가 만들었을 수 있음 -> 재조회로 멱등 처리
-                        return answerEntryRepository.findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
+                        return answerEntryRepository.findByUserAndDate(user, targetDate)
                                 .orElseThrow(() -> e);
                     }
                 });

src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/service/PendingDailyReportService.java

@@ -7,7 +7,6 @@
 import com.devkor.ifive.nadab.global.core.response.ErrorCode;
 import com.devkor.ifive.nadab.global.exception.ConflictException;
 import com.devkor.ifive.nadab.global.shared.util.TodayDateTimeProvider;
-import com.devkor.ifive.nadab.global.shared.util.dto.TodayDateTimeRangeDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
@@ -24,20 +23,19 @@ public class PendingDailyReportService {
 
 
     @Transactional
-    public DailyReport getOrCreatePendingDailyReport(AnswerEntry entry) {
+    public DailyReport getOrCreatePendingDailyReport(AnswerEntry entry, boolean isDayPassed) {
 
-        TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();
-
-        LocalDate today = TodayDateTimeProvider.getTodayDate();
+        LocalDate targetDate =
+                isDayPassed ? TodayDateTimeProvider.getTodayDate().minusDays(1) : TodayDateTimeProvider.getTodayDate();
 
         DailyReport report = dailyReportRepository.
-                findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
+                findByAnswerEntryAndDate(entry, targetDate)
                 .orElseGet(() -> {
                     try {
-                        return dailyReportRepository.save(DailyReport.createPending(entry, today));
+                        return dailyReportRepository.save(DailyReport.createPending(entry, targetDate));
                     } catch (DataIntegrityViolationException e) {
                         // 동시 요청에서 이미 누가 만들었을 수 있음 -> 재조회로 멱등 처리
-                        return dailyReportRepository.findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
+                        return dailyReportRepository.findByAnswerEntryAndDate(entry, targetDate)
                                 .orElseThrow(() -> e);
                     }
                 });

src/main/java/com/devkor/ifive/nadab/domain/question/application/QuestionCommandService.java

@@ -14,7 +14,6 @@
 import com.devkor.ifive.nadab.global.exception.ConflictException;
 import com.devkor.ifive.nadab.global.exception.NotFoundException;
 import com.devkor.ifive.nadab.global.shared.util.TodayDateTimeProvider;
-import com.devkor.ifive.nadab.global.shared.util.dto.TodayDateTimeRangeDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
@@ -100,8 +99,6 @@ public UserDailyQuestion createTodayQuestion(Long userId, LocalDate todayKst) {
     public DailyQuestionResponse rerollTodayQuestion(Long userId) {
         LocalDate today = TodayDateTimeProvider.getTodayDate();
 
-        TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();
-
         UserDailyQuestion udq = userDailyQuestionRepository.findByUserIdAndDate(userId, today)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.DAILY_QUESTION_NOT_FOUND));
 
@@ -111,7 +108,7 @@ public DailyQuestionResponse rerollTodayQuestion(Long userId) {
 
         User user = udq.getUser();
 
-        boolean alreadyAnswered = answerEntryRepository.existsByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow());
+        boolean alreadyAnswered = answerEntryRepository.existsByUserAndDate(user, today);
         if (alreadyAnswered) {
             throw new ConflictException(ErrorCode.QUESTION_ALREADY_ANSWERED);
         }

src/main/java/com/devkor/ifive/nadab/global/shared/util/TodayDateTimeProvider.java

@@ -1,13 +1,10 @@
 package com.devkor.ifive.nadab.global.shared.util;
 
-import com.devkor.ifive.nadab.global.shared.util.dto.TodayDateTimeRangeDto;
-
 import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.time.ZoneId;
 
 /**
- * 오늘 날짜, 오늘 날짜의 시작과 내일 날짜의 시작 등을 제공하는 유틸리티 클래스
+ * 오늘 날짜를 제공하는 유틸리티 클래스
  * repository 등에서 오늘 날짜 범위 조회 시 사용
  */
 public class TodayDateTimeProvider {
@@ -17,20 +14,6 @@ public class TodayDateTimeProvider {
     private TodayDateTimeProvider() {
     }
 
-    public static TodayDateTimeRangeDto getRange() {
-        LocalDate today = LocalDate.now(SEOUL);
-
-        OffsetDateTime startOfToday =
-                today.atStartOfDay(SEOUL).toOffsetDateTime();
-
-        OffsetDateTime startOfTomorrow =
-                today.plusDays(1)
-                        .atStartOfDay(SEOUL)
-                        .toOffsetDateTime();
-
-        return new TodayDateTimeRangeDto(startOfToday, startOfTomorrow);
-    }
-
     public static LocalDate getTodayDate() {
         return LocalDate.now(SEOUL);
     }