Merge pull request #175 from GTable/refactor/#174-waiting-refactoring

Refactor: 웨이팅 로직 버그 해결 및 로직 개선

Author: Jjiggu

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/controller/ReservationController.java

@@ -8,18 +8,15 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.nowait.applicationadmin.reservation.dto.CallingWaitingResponseDto;
 import com.nowait.applicationadmin.reservation.dto.EntryStatusResponseDto;
 import com.nowait.applicationadmin.reservation.dto.ReservationStatusRequest;
 import com.nowait.applicationadmin.reservation.dto.WaitingUserResponse;
 import com.nowait.applicationadmin.reservation.service.ReservationService;
 import com.nowait.common.api.ApiUtils;
-import com.nowait.common.enums.ReservationStatus;
 import com.nowait.domaincorerdb.user.entity.MemberDetails;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -40,7 +37,13 @@ public class ReservationController {
 	@ApiResponse(responseCode = "200", description = "주점별 전체 대기 리스트 조회")
 	public ResponseEntity<?> getWaitingUsersWithScore(@PathVariable Long storeId) {
 		List<WaitingUserResponse> response = reservationService.getAllWaitingUserDetails(storeId);
-		return ResponseEntity.ok(response);
+		return ResponseEntity
+			.ok()
+			.body(
+				ApiUtils.success(
+					response
+				)
+			);
 	}
 
 	@GetMapping("/admin/{storeId}/completed")
@@ -51,7 +54,13 @@ public ResponseEntity<?> getCompletedReservationList(
 		@AuthenticationPrincipal MemberDetails memberDetails
 	) {
 		List<WaitingUserResponse> response = reservationService.getCompletedWaitingUserDetails(storeId);
-		return ResponseEntity.ok(response);
+		return ResponseEntity
+			.ok()
+			.body(
+				ApiUtils.success(
+					response
+				)
+			);
 	}
 
 	// @PatchMapping("/admin/{storeId}/call/{userId}")

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/EntryStatusResponseDto.java

@@ -2,6 +2,9 @@
 
 import java.time.LocalDateTime;
 
+import com.nowait.common.enums.ReservationStatus;
+import com.nowait.domaincorerdb.reservation.entity.Reservation;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
@@ -11,7 +14,10 @@
 @Builder
 public class EntryStatusResponseDto {
 	@Schema(description = "예약 ID", example = "1201")
-	private String id; // reservationId
+	private String reservationId; // reservationId
+
+	@Schema(description = "예약 번호", example = "23-240504-0001")
+	private String reservationNumber;
 
 	@Schema(description = "유저 ID", example = "16")
 	private String userId;
@@ -25,6 +31,15 @@ public class EntryStatusResponseDto {
 	@Schema(description = "대기 등록 시각", example = "2025-07-22T16:00:00")
 	private LocalDateTime createdAt;
 
+	@Schema(description = "호출 시각", example = "2025-07-22T16:00:00")
+	private LocalDateTime calledAt; // 호출 시각
+
+	@Schema(description = "입장 완료 처리 시각", example = "2025-07-22T16:00:00")
+	private LocalDateTime confirmedAt; // 완료 시각
+
+	@Schema(description = "웨이팅 취소 시각", example = "2025-07-22T16:00:00")
+	private LocalDateTime cancelledAt; // 취소 시각
+
 	@Schema(description = "대기 상태", example = "CALLING")
 	private String status;
 
@@ -33,5 +48,26 @@ public class EntryStatusResponseDto {
 
 	@Schema(description = "호출 메시지", example = "호출 메시지")
 	private String message;
+
+	public static EntryStatusResponseDto fromEntity(Reservation r) {
+		return EntryStatusResponseDto.builder()
+			.reservationId(r.getId().toString())
+			.reservationNumber(r.getReservationNumber())
+			.userId(r.getUser().getId().toString())
+			.partySize(r.getPartySize())
+			.userName(r.getUser().getNickname())
+			.createdAt(r.getRequestedAt())
+			.status(r.getStatus().name())
+			.calledAt(r.getCalledAt())
+			.confirmedAt(r.getConfirmedAt())
+			.cancelledAt(r.getCancelledAt())
+			.message(switch (r.getStatus()) {
+				case CALLING   -> r.getUser().getNickname() + "님을 호출하였습니다.";
+				case CONFIRMED -> r.getUser().getNickname() + "님의 입장이 완료되었습니다.";
+				case CANCELLED -> r.getUser().getNickname() + "님의 예약이 취소되었습니다.";
+				default        -> "";
+			})
+			.build();
+	}
 }
 

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java

@@ -16,8 +16,8 @@
 @Schema(description = "대기 사용자 응답 DTO")
 public class WaitingUserResponse {
 
-	@Schema(description = "예약 ID", example = "1201")
-	private String id; // reservationId
+	@Schema(description = "예약 ID", example = "16-20240201-0002")
+	private String reservationNumber;
 
 	@Schema(description = "유저 ID", example = "16")
 	private String userId;
@@ -39,12 +39,24 @@ public class WaitingUserResponse {
 
 	public static WaitingUserResponse fromEntity(Reservation reservation) {
 		return WaitingUserResponse.builder()
-			.id(reservation.getId().toString())
+			.reservationNumber(reservation.getReservationNumber())
 			.userId(reservation.getUser().getId().toString())
 			.partySize(reservation.getPartySize())
 			.userName(reservation.getUser().getNickname())
 			.createdAt(reservation.getRequestedAt())
 			.status(reservation.getStatus().name())
 			.build();
 	}
+
+	public static WaitingUserResponse fromRedis(String reservationId, String userId, Integer partySize, String userName, LocalDateTime createdAt, String status, Double score) {
+		return WaitingUserResponse.builder()
+			.reservationNumber(reservationId)
+			.userId(userId)
+			.partySize(partySize)
+			.userName(userName)
+			.createdAt(createdAt)
+			.status(status)
+			.score(score)
+			.build();
+	}
 }

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/repository/WaitingRedisRepository.java

@@ -1,7 +1,7 @@
 package com.nowait.applicationadmin.reservation.repository;
 
-import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -16,6 +16,7 @@
 @Repository
 @RequiredArgsConstructor
 public class WaitingRedisRepository {
+
 	private final StringRedisTemplate redisTemplate;
 
 	// 대기열 전체 인원수 조회
@@ -54,6 +55,19 @@ public Integer getWaitingPartySize(Long storeId, String userId) {
 		return value == null ? null : Integer.valueOf(value.toString());
 	}
 
+	// ReservationNumber 조회
+	public String getReservationId(Long storeId, String userId) {
+		String status = getWaitingStatus(storeId, userId);
+		if (!"WAITING".equals(status) && !"CALLING".equals(status)) {
+			// 이미 종료된 대기라면, 예약 번호도 없던 것처럼 취급
+			return null;
+		}
+		String numberMapKey = RedisKeyUtils.buildReservationNumberKey(storeId);
+		Object val = redisTemplate.opsForHash().get(numberMapKey, userId);
+
+		return val != null ? val.toString() : null;
+	}
+
 	public void deleteWaiting(Long storeId, String userId) {
 		String statusKey = RedisKeyUtils.buildWaitingStatusKeyPrefix() + storeId;
 		redisTemplate.opsForHash().delete(statusKey, userId);
@@ -63,6 +77,26 @@ public void deleteWaiting(Long storeId, String userId) {
 
 		String partyKey = RedisKeyUtils.buildWaitingPartySizeKeyPrefix() + storeId;
 		redisTemplate.opsForHash().delete(partyKey, userId);
+
+		String numberMapKey  = RedisKeyUtils.buildReservationNumberKey(storeId);
+		redisTemplate.opsForHash().delete(numberMapKey, userId);
+
+		String key = RedisKeyUtils.buildWaitingCalledAtKeyPrefix() + storeId;
+		redisTemplate.opsForHash().delete(key, userId);
+	}
+
+	// 호출 시각 기록
+	public void setWaitingCalledAt(Long storeId, String userId, long timestamp) {
+		String key = RedisKeyUtils.buildWaitingCalledAtKeyPrefix() + storeId;
+		redisTemplate.opsForHash().put(key, userId, String.valueOf(timestamp));
+
+		redisTemplate.expireAt(key, RedisKeyUtils.expireAtNext03());
+	}
+
+	public Long getWaitingCalledAt(Long storeId, String userId) {
+		String key = RedisKeyUtils.buildWaitingCalledAtKeyPrefix() + storeId;
+		Object val = redisTemplate.opsForHash().get(key, userId);
+		return val == null ? null : Long.valueOf(val.toString());
 	}
 }