Skip to content

refactor(report): 일간 리포트 생성 트랜잭션 단순화 및 동시성 안정화 #78

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
1Seob merged 1 commit into from
Jan 9, 2026
Merged

refactor(report): 일간 리포트 생성 트랜잭션 단순화 및 동시성 안정화 #78

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
17 changes: 13 additions & 4 deletions src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/service/AnswerEntryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
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;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
Expand All @@ -21,15 +21,24 @@ public class AnswerEntryService {
private final AnswerEntryRepository answerEntryRepository;


@Transactional(propagation = Propagation.REQUIRES_NEW)
@Transactional
public AnswerEntry getOrCreateTodayAnswerEntry(User user, DailyQuestion dq, String answerText) {

TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();

LocalDate today = TodayDateTimeProvider.getTodayDate();

return answerEntryRepository.findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
.orElseGet(() -> answerEntryRepository.save(AnswerEntry.create(user, dq, answerText, today)));
return answerEntryRepository.
findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
.orElseGet(() -> {
try {
return answerEntryRepository.save(AnswerEntry.create(user, dq, answerText, today));
} catch (DataIntegrityViolationException e) {
// 동시 요청에서 이미 누가 만들었을 수 있음 -> 재조회로 멱등 처리
return answerEntryRepository.findByUserAndCreatedAtBetween(user, range.startOfToday(), range.startOfTomorrow())
.orElseThrow(() -> e);
}
});
}
}

17 changes: 13 additions & 4 deletions ...ava/com/devkor/ifive/nadab/domain/dailyreport/core/service/PendingDailyReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
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;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
Expand All @@ -23,15 +23,24 @@ public class PendingDailyReportService {
private final DailyReportRepository dailyReportRepository;


@Transactional(propagation = Propagation.REQUIRES_NEW)
@Transactional
public DailyReport getOrCreatePendingDailyReport(AnswerEntry entry) {

TodayDateTimeRangeDto range = TodayDateTimeProvider.getRange();

LocalDate today = TodayDateTimeProvider.getTodayDate();

DailyReport report = dailyReportRepository.findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
.orElseGet(() -> dailyReportRepository.save(DailyReport.createPending(entry, today)));
DailyReport report = dailyReportRepository.
findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
.orElseGet(() -> {
try {
return dailyReportRepository.save(DailyReport.createPending(entry, today));
} catch (DataIntegrityViolationException e) {
// 동시 요청에서 이미 누가 만들었을 수 있음 -> 재조회로 멱등 처리
return dailyReportRepository.findByAnswerEntryAndCreatedAtBetween(entry, range.startOfToday(), range.startOfTomorrow())
.orElseThrow(() -> e);
}
});

if (report.getStatus() == DailyReportStatus.COMPLETED) {
throw new ConflictException(ErrorCode.DAILY_REPORT_ALREADY_COMPLETED);
Expand Down