fix: 에러 로직 수정

sasaping · Oct 24, 2024 · 9beaeab · 9beaeab
1 parent 2544e89
commit 9beaeab
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/.../gateway/server/src/main/java/com/sparta/gateway/server/application/UserQueueService.java b/.../gateway/server/src/main/java/com/sparta/gateway/server/application/UserQueueService.java
@@ -30,13 +30,24 @@ public class UserQueueService {
   private Long activeUsers;
 
   public Mono<RegisterUserResponse> registerUser(String userId) {
+    return reactiveRedisTemplate.opsForZSet()
+        .rank(USER_QUEUE_PROCEED_KEY, userId)
+        .defaultIfEmpty(-1L)
+        .flatMap(rank -> {
+          if (rank >= 0) {
+            return updateUserActivityTime(userId)
+                .thenReturn(new RegisterUserResponse(0L));
+          }
 
-    lockComponent.execute("registerUser", 1000, 1000, () -> {
-      activeUsers = reactiveRedisTemplate.opsForSet().size(USER_ACTIVE_SET_KEY).block();
-    });
-
-    return activeUsers < MAX_ACTIVE_USERS ? addToProceedQueue(userId) : checkAndAddToQueue(userId);
-
+          return reactiveRedisTemplate.opsForSet().size(USER_ACTIVE_SET_KEY)
+              .flatMap(activeUsers -> {
+                if (activeUsers < MAX_ACTIVE_USERS) {
+                  return addToProceedQueue(userId);
+                } else {
+                  return checkAndAddToQueue(userId);
+                }
+              });
+        });
   }
 
   private Mono<RegisterUserResponse> checkAndAddToQueue(String userId) {