Skip to content

[FIX] ACTIVE 전환 시 Redis 유저 플래그 제거 시점 수정 #46

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
Jinyoung-Kim96 merged 2 commits into from
May 19, 2026
Merged

[FIX] ACTIVE 전환 시 Redis 유저 플래그 제거 시점 수정 #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a597e
fix: ACTIVE 전환 시 NPE 수정
Jinyoung-Kim96 May 19, 2026
7b4cc04
fix: ACTIVE 전환 시 Redis 유저 플래그 제거 시점 수정
Jinyoung-Kim96 May 19, 2026
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
12 changes: 9 additions & 3 deletions src/main/java/com/michelet/waiting/application/service/WaitingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ public WaitingResult enterWaiting(EnterWaitingCommand command) {
command.restaurantId(), waiting.getToken().value()
);

if (position == null) {
Waiting updated = waitingRepository.findById(saved.getId())
.orElseThrow(() -> new WaitingException(WaitingErrorCode.NOT_FOUND));
return WaitingResult.of(updated);
}

return WaitingResult.of(saved, position);

} catch (Exception e) {
Expand Down Expand Up @@ -138,6 +144,9 @@ public void completeWaiting(UUID waitingId){
waitingRepository.softDelete(waitingId, SYSTEM_UUID);

waitingActivationPort.remove(waiting.getRestaurantId(), waiting.getToken().value());

// 예약 완료 후 재등록 가능하도록 유저 플래그 제거
waitingActivationPort.removeUser(waiting.getRestaurantId(), waiting.getUserId());
}

// 스케줄러 - N명씩 입장 허용
Expand Down Expand Up @@ -184,9 +193,6 @@ public void activateNextBatch(UUID restaurantId){

activeSaved = true;

// ACTIVE 전환 후 예약 완료 시 재등록 가능하도록 플래그 제거
waitingActivationPort.removeUser(restaurantId, waiting.getUserId());

// 3. 동일한 Outbox 인스턴스 PROCESSED 로 update
outbox.markProcessed(LocalDateTime.now());
waitingOutboxRepository.update(outbox);
Expand Down
Loading