From 68a597ee5e3d6b14ff5d99e6b921f7e76ad08a2a Mon Sep 17 00:00:00 2001 From: Jinyoung-Kim96 Date: Tue, 19 May 2026 12:44:43 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20ACTIVE=20=EC=A0=84=ED=99=98=20=EC=8B=9C?= =?UTF-8?q?=20NPE=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../waiting/application/service/WaitingService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/michelet/waiting/application/service/WaitingService.java b/src/main/java/com/michelet/waiting/application/service/WaitingService.java index 0aad245..694b474 100644 --- a/src/main/java/com/michelet/waiting/application/service/WaitingService.java +++ b/src/main/java/com/michelet/waiting/application/service/WaitingService.java @@ -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) {