From a9dfe9ee6cb56b536d3d9b848a387389a4248c1d Mon Sep 17 00:00:00 2001
From: dla0510 <dla0510@naver.com>
Date: Mon, 27 May 2024 18:23:24 +0900
Subject: [PATCH] =?UTF-8?q?keyName=20=EB=B3=80=EC=88=98=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annotation/CheckWaitingQueueAndTokenAop.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/tiketeer/Tiketeer/domain/purchase/annotation/CheckWaitingQueueAndTokenAop.java b/src/main/java/com/tiketeer/Tiketeer/domain/purchase/annotation/CheckWaitingQueueAndTokenAop.java
index 52f0eddc..063f587f 100644
--- a/src/main/java/com/tiketeer/Tiketeer/domain/purchase/annotation/CheckWaitingQueueAndTokenAop.java
+++ b/src/main/java/com/tiketeer/Tiketeer/domain/purchase/annotation/CheckWaitingQueueAndTokenAop.java
@@ -47,16 +47,17 @@ public Object check(final ProceedingJoinPoint joinPoint) throws Throwable {
 		String[] args = purchaseToken.split(":");
 		var email = args[0];
 		var ticketingId = args[1];
+		var keyName = "queue::" + ticketingId;
 
 		validateUser(email);
-		validateTokenWithRedis(ticketingId, email);
+		validateTokenWithRedis(keyName, email);
 
 		try {
 			return joinPoint.proceed();
 		} catch (Throwable e) {
 			throw e;
 		} finally {
-			redisService.removeZset("queue::" + ticketingId, email);
+			redisService.removeZset(keyName, email);
 		}
 	}
 
@@ -76,16 +77,16 @@ private void validateUser(String email) {
 		}
 	}
 
-	private void validateTokenWithRedis(String ticketingId, String email) {
-		var results = redisService.getZSetRankAndScore("queue::" + ticketingId, email).orElseThrow(() -> {
-			log.error("User does not enter queue (email: {}, ticketing_id: {})", email, ticketingId);
+	private void validateTokenWithRedis(String keyName, String email) {
+		var results = redisService.getZSetRankAndScore(keyName, email).orElseThrow(() -> {
+			log.error("User does not enter queue (queue_name: {}, email: {})", keyName, email);
 			return new UserNotExistInQueueException();
 		});
 		var rank = results.getFirst();
 
 		if (rank >= 10) {
 			log.error(
-				"User is not in purchasing order. (email: \" + email + \", ticketing_id: \" + ticketingId + \")\"");
+				"User is not in purchasing order. (queue_name: {}, email: {})", keyName, email);
 			throw new UserNotInOrderException();
 		}
 	}