refactor: 큐 클랜징 로직 리팩터링

Team-BingBong · Jan 14, 2024 · f1d23bc · f1d23bc
1 parent 9bf68aa
commit f1d23bc
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/...ng/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java b/...ng/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java
@@ -23,7 +23,7 @@ public class BookingQueueService {
 
 	private final static double MILLISECONDS_PER_SECOND = 1000.0;
 	private final static double TIMEOUT_SECONDS = 7 * 60;
-	private final static long ENTRY_LIMIT = 5;
+	private final static long ENTRY_LIMIT = 2;
 
 	private final BookingQueueManager bookingQueueManager;
 	private final BookingJwtProvider bookingJwtProvider;
@@ -34,19 +34,17 @@ public void enterQueue(BookingQueueEnterRequest request, String sessionId) {
 	}
 
 	public OrderInQueueGetResponse getOrderInQueue(Long eventId, String sessionId) {
+		cleanQueue(eventId);
 		Long order = getOrder(eventId, sessionId);
-		Long myOrder = order <= ENTRY_LIMIT ? 0 : order - ENTRY_LIMIT;
-		Boolean isMyTurn = isReadyToEnter(eventId, sessionId);
-
-		double currentTimeSeconds = System.currentTimeMillis() / MILLISECONDS_PER_SECOND;
-		double timeLimitSeconds = currentTimeSeconds - TIMEOUT_SECONDS;
-		bookingQueueManager.removeRangeByScore(eventId, 0, timeLimitSeconds);
-
+		Boolean isMyTurn = order <= ENTRY_LIMIT;
+		Long myOrder = isMyTurn ? 0 : order - ENTRY_LIMIT;
 		return OrderInQueueGetResponse.of(myOrder, isMyTurn);
 	}
 
 	public TokenIssueResponse issueToken(TokenIssueRequest request, String sessionId) {
-		if (!isReadyToEnter(request.eventId(), sessionId)) {
+		Long order = getOrder(request.eventId(), sessionId);
+
+		if (order > ENTRY_LIMIT) {
 			throw new BookingException(BookingErrorCode.OUT_OF_ORDER);
 		}
 
@@ -61,12 +59,6 @@ private Long getOrder(Long eventId, String sessionId) {
 			.orElseThrow(() -> new BookingException(BookingErrorCode.NOT_IN_QUEUE));
 	}
 
-	private Boolean isReadyToEnter(Long eventId, String sessionId) {
-		Long myOrder = getOrder(eventId, sessionId);
-		Long entryLimit = ENTRY_LIMIT;
-		return myOrder <= entryLimit;
-	}
-
 	public void exitQueue(BookingQueueExitRequest request, String sessionId) {
 		bookingQueueManager.remove(request.eventId(), sessionId);
 	}
@@ -75,4 +67,13 @@ public SessionIdIssueResponse issueSessionId() {
 		UUID sessionId = UUID.randomUUID();
 		return SessionIdIssueResponse.from(sessionId.toString());
 	}
+
+	/*
+	 * 대기열에 존재하는 세션 중 타임아웃된 세션을 제거한다.
+	 */
+	private void cleanQueue(Long eventId) {
+		double currentTimeSeconds = System.currentTimeMillis() / MILLISECONDS_PER_SECOND;
+		double timeLimitSeconds = currentTimeSeconds - TIMEOUT_SECONDS;
+		bookingQueueManager.removeRangeByScore(eventId, 0, timeLimitSeconds);
+	}
 }