Refactor: 대기열 시스템 구조 개선

src/main/java/com/thirdparty/ticketing/domain/common/Event.java

@@ -0,0 +1,3 @@
+package com.thirdparty.ticketing.domain.common;
+
+public interface Event {}

src/main/java/com/thirdparty/ticketing/domain/common/EventPublisher.java

@@ -0,0 +1,6 @@
+package com.thirdparty.ticketing.domain.common;
+
+public interface EventPublisher {
+
+    void publish(Event event);
+}

src/main/java/com/thirdparty/ticketing/domain/waiting/manager/DefaultWaitingManager.java

@@ -4,9 +4,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.RunningRoom;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class DefaultWaitingManager extends WaitingManager {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/manager/WaitingManager.java

@@ -1,8 +1,8 @@
 package com.thirdparty.ticketing.domain.waiting.manager;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.RunningRoom;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/DefaultRunningRoom.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class DefaultRunningRoom implements RunningRoom {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/DefaultWaitingCounter.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class DefaultWaitingCounter implements WaitingCounter {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/DefaultWaitingLine.java

@@ -3,7 +3,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class DefaultWaitingLine implements WaitingLine {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/DefaultWaitingRoom.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class DefaultWaitingRoom extends WaitingRoom {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/RunningRoom.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public interface RunningRoom {
     boolean contains(WaitingMember waitingMember);

src/main/java/com/thirdparty/ticketing/domain/waiting/room/WaitingCounter.java

@@ -1,6 +1,6 @@
 package com.thirdparty.ticketing.domain.waiting.room;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public interface WaitingCounter {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/WaitingLine.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public interface WaitingLine {
 

src/main/java/com/thirdparty/ticketing/domain/waiting/room/WaitingRoom.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/PollingEvent.java

@@ -0,0 +1,11 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+import com.thirdparty.ticketing.domain.common.Event;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class PollingEvent implements Event {
+
+    private final long performanceId;
+}

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/RunningManager.java

@@ -0,0 +1,13 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+import java.util.Set;
+
+public interface RunningManager {
+    boolean isReadyToHandle(String email, long performanceId);
+
+    long getRunningCount(long performanceId);
+
+    long getAvailableToRunning(long performanceId);
+
+    void enterRunningRoom(long performanceId, Set<WaitingMember> waitingMembers);
+}

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/RunningRoom.java

@@ -0,0 +1,3 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+public interface RunningRoom {}

src/main/java/com/thirdparty/ticketing/domain/waiting/WaitingAspect.java → src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingAspect.java

@@ -1,4 +1,4 @@
-package com.thirdparty.ticketing.domain.waiting;
+package com.thirdparty.ticketing.domain.waitingsystem;
 
 import jakarta.servlet.http.HttpServletRequest;
 

src/main/java/com/thirdparty/ticketing/domain/waiting/WaitingController.java → src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingController.java

@@ -1,29 +1,26 @@
-package com.thirdparty.ticketing.domain.waiting;
+package com.thirdparty.ticketing.domain.waitingsystem;
 
 import java.util.Map;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import com.thirdparty.ticketing.domain.common.LoginMember;
-import com.thirdparty.ticketing.domain.waiting.manager.WaitingManager;
 
 import lombok.RequiredArgsConstructor;
 
-@RestController
 @RequiredArgsConstructor
 @RequestMapping("/api")
 public class WaitingController {
 
-    private final WaitingManager waitingManager;
+    private final WaitingSystem waitingSystem;
 
     @GetMapping("/performances/{performanceId}/wait")
     public ResponseEntity<Map<String, Long>> getCounts(
             @LoginMember String email, @PathVariable("performanceId") Long performanceId) {
-        long remainingCount = waitingManager.getRemainingCount(email, performanceId);
+        long remainingCount = waitingSystem.getRemainingCount(email, performanceId);
         return ResponseEntity.ok(Map.of("remainingCount", remainingCount));
     }
 }

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingManager.java

@@ -0,0 +1,11 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+import java.util.Set;
+
+public interface WaitingManager {
+    void enterWaitingRoom(String email, long performanceId);
+
+    WaitingMember findWaitingMember(String email, long performanceId);
+
+    Set<WaitingMember> pullOutMembers(long performanceId, long availableToRunning);
+}

src/main/java/com/thirdparty/ticketing/domain/waiting/WaitingMember.java → src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingMember.java

@@ -1,4 +1,4 @@
-package com.thirdparty.ticketing.domain.waiting;
+package com.thirdparty.ticketing.domain.waitingsystem;
 
 import java.time.ZonedDateTime;
 

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingRoom.java

@@ -0,0 +1,3 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+public interface WaitingRoom {}

src/main/java/com/thirdparty/ticketing/domain/waitingsystem/WaitingSystem.java

@@ -0,0 +1,37 @@
+package com.thirdparty.ticketing.domain.waitingsystem;
+
+import java.util.Set;
+
+import com.thirdparty.ticketing.domain.common.EventPublisher;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class WaitingSystem {
+
+    private final WaitingManager waitingManager;
+    private final RunningManager runningManager;
+    private final EventPublisher eventPublisher;
+
+    public boolean isReadyToHandle(String email, long performanceId) {
+        return runningManager.isReadyToHandle(email, performanceId);
+    }
+
+    public void enterWaitingRoom(String email, long performanceId) {
+        waitingManager.enterWaitingRoom(email, performanceId);
+    }
+
+    public long getRemainingCount(String email, long performanceId) {
+        WaitingMember waitingMember = waitingManager.findWaitingMember(email, performanceId);
+        long runningCount = runningManager.getRunningCount(performanceId);
+        eventPublisher.publish(new PollingEvent(performanceId));
+        return waitingMember.getWaitingCount() - runningCount;
+    }
+
+    public void moveUserToRunning(long performanceId) {
+        long availableToRunning = runningManager.getAvailableToRunning(performanceId);
+        Set<WaitingMember> waitingMembers =
+                waitingManager.pullOutMembers(performanceId, availableToRunning);
+        runningManager.enterRunningRoom(performanceId, waitingMembers);
+    }
+}

src/main/java/com/thirdparty/ticketing/global/waiting/manager/RedisWaitingManager.java

@@ -3,10 +3,10 @@
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.manager.WaitingManager;
 import com.thirdparty.ticketing.domain.waiting.room.RunningRoom;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class RedisWaitingManager extends WaitingManager {
 

src/main/java/com/thirdparty/ticketing/global/waiting/room/RedisRunningRoom.java

@@ -5,8 +5,8 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.SetOperations;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.RunningRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class RedisRunningRoom implements RunningRoom {
 

src/main/java/com/thirdparty/ticketing/global/waiting/room/RedisWaitingCounter.java

@@ -3,8 +3,8 @@
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingCounter;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 public class RedisWaitingCounter implements WaitingCounter {
 

src/main/java/com/thirdparty/ticketing/global/waiting/room/RedisWaitingLine.java

@@ -6,8 +6,8 @@
 import org.springframework.data.redis.core.ZSetOperations;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingLine;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.ObjectMapperUtils;
 
 public class RedisWaitingLine implements WaitingLine {

src/main/java/com/thirdparty/ticketing/global/waiting/room/RedisWaitingRoom.java

@@ -7,10 +7,10 @@
 import org.springframework.data.redis.core.RedisTemplate;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingCounter;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingLine;
 import com.thirdparty.ticketing.domain.waiting.room.WaitingRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.ObjectMapperUtils;
 
 public class RedisWaitingRoom extends WaitingRoom {

src/test/java/com/thirdparty/ticketing/domain/waiting/manager/DefaultWaitingManagerTest.java

@@ -9,11 +9,11 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
 import com.thirdparty.ticketing.domain.waiting.room.DefaultRunningRoom;
 import com.thirdparty.ticketing.domain.waiting.room.DefaultWaitingCounter;
 import com.thirdparty.ticketing.domain.waiting.room.DefaultWaitingLine;
 import com.thirdparty.ticketing.domain.waiting.room.DefaultWaitingRoom;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 
 class DefaultWaitingManagerTest {
 

src/test/java/com/thirdparty/ticketing/global/waiting/RedisRunningRoomTest.java

@@ -12,7 +12,7 @@
 import org.springframework.data.redis.core.SetOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.room.RedisRunningRoom;
 import com.thirdparty.ticketing.support.TestContainerStarter;
 

src/test/java/com/thirdparty/ticketing/global/waiting/RedisWaitingCounterTest.java

@@ -17,7 +17,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.room.RedisWaitingCounter;
 import com.thirdparty.ticketing.support.TestContainerStarter;
 

src/test/java/com/thirdparty/ticketing/global/waiting/RedisWaitingLineTest.java

@@ -19,7 +19,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.room.RedisWaitingLine;
 import com.thirdparty.ticketing.support.TestContainerStarter;
 

src/test/java/com/thirdparty/ticketing/global/waiting/RedisWaitingManagerTest.java

@@ -12,7 +12,7 @@
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.manager.RedisWaitingManager;
 import com.thirdparty.ticketing.support.TestContainerStarter;
 

src/test/java/com/thirdparty/ticketing/global/waiting/RedisWaitingRoomTest.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.thirdparty.ticketing.domain.waiting.WaitingMember;
+import com.thirdparty.ticketing.domain.waitingsystem.WaitingMember;
 import com.thirdparty.ticketing.global.waiting.room.RedisWaitingRoom;
 import com.thirdparty.ticketing.support.TestContainerStarter;