diff --git a/src/main/java/com/devkor/ifive/nadab/domain/test/application/TestReportService.java b/src/main/java/com/devkor/ifive/nadab/domain/test/application/TestReportService.java index 65b9d50..73b40bc 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/test/application/TestReportService.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/test/application/TestReportService.java @@ -44,6 +44,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; + @Service @RequiredArgsConstructor public class TestReportService { @@ -211,8 +213,13 @@ public void deleteThisMonthMonthlyReport(Long userId) { MonthRangeDto range = MonthRangeCalculator.getLastMonthRange(); - MonthlyReportV2 report = monthlyReportV2Repository.findByUserIdAndMonthStartDate(user.getId(), range.monthStartDate()) - .orElseThrow(() -> new NotFoundException(ErrorCode.MONTHLY_REPORT_NOT_FOUND)); + Optional reportV2 = monthlyReportV2Repository.findByUserIdAndMonthStartDate(user.getId(), range.monthStartDate()); + if (reportV2.isEmpty()) { + deleteMonthMonthlyReportV1(user.getEmail()); + return; + } + + MonthlyReportV2 report = reportV2.get(); if (report.getStatus() != MonthlyReportStatus.COMPLETED) { throw new BadRequestException(ErrorCode.MONTHLY_REPORT_NOT_COMPLETED);