Skip to content

refactor: ReservationNotFoundException 터지는 경우 멱등키 롤백 로직 추가 #366

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
Jjiggu merged 1 commit into from
Feb 23, 2026
Merged

refactor: ReservationNotFoundException 터지는 경우 멱등키 롤백 로직 추가 #366

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
4 changes: 4 additions & 0 deletions .../src/main/java/com/nowait/applicationuser/waiting/redis/WaitingIdempotencyRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,8 @@ public void saveIdempotencyInProgress(String key) {
throw new IllegalArgumentException("Failed to serialize value for Redis", e);
}
}

public void deleteByRegisterKey(String key) {
redisTemplate.delete(key);
}
}
7 changes: 7 additions & 0 deletions ...user-api/src/main/java/com/nowait/applicationuser/waiting/service/IdempotencyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,11 @@ public void saveIdempotencyKeyInProgress(String idempotentKey) {
}
}

public void rollbackIdempotencyKey(String idempotentKey) {
if (idempotentKey != null && !idempotentKey.isBlank()) {
log.info("Rolling back idempotency key: {}", idempotentKey);
waitingIdempotencyRepository.deleteByRegisterKey(idempotentKey);
}
}

}
21 changes: 14 additions & 7 deletions ...app-user-api/src/main/java/com/nowait/applicationuser/waiting/service/WaitingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,20 @@ public CancelWaitingResponse cancelWaiting(CustomOAuth2User oAuth2User, String p
.orElseThrow(UserNotFoundException::new);

// DB 웨이팅 상태 취소 처리
Reservation reservation = reservationRepository.findReservationByReservationNumber(request.getWaitingNumber())
.orElseThrow(ReservationNotFoundException::new);

reservation.markAsCancelled(LocalDateTime.now());

// Redis 대기열 취소 이벤트 발행
waitingRedisRepository.removeWaiting(storeId, user.getId());
Reservation reservation;
try {
reservation = reservationRepository.findReservationByReservationNumber(request.getWaitingNumber())
.orElseThrow(ReservationNotFoundException::new);

reservation.markAsCancelled(LocalDateTime.now());

// Redis 대기열 취소 이벤트 발행
waitingRedisRepository.removeWaiting(storeId, user.getId());
} catch (RuntimeException e) {
// 롤백 처리
idempotencyService.rollbackIdempotencyKey(httpServletRequest.getHeader("Idempotency-Key"));
throw e;
}

CancelWaitingResponse response = CancelWaitingResponse.builder()
.waitingNumber(reservation.getReservationNumber())
Expand Down