Merge pull request #18 from TeamTroublePainter/feature/DRAW-416

DRAW-416 빠른 매칭 유저 중복 등록 오류 수정
TeamTroublePainter · Nov 25, 2024 · 8677787 · 8677787
2 parents e8fb2cd + 3e88343
commit 8677787
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/adapter/memory/src/main/kotlin/com/xorker/draw/mafia/MafiaGameWaitingQueueAdapter.kt b/adapter/memory/src/main/kotlin/com/xorker/draw/mafia/MafiaGameWaitingQueueAdapter.kt
@@ -1,5 +1,6 @@
 package com.xorker.draw.mafia
 
+import com.xorker.draw.exception.AlreadyWaitingUserException
 import com.xorker.draw.exception.UnSupportedException
 import com.xorker.draw.user.User
 import java.util.concurrent.ConcurrentHashMap
@@ -16,6 +17,9 @@ internal class MafiaGameWaitingQueueAdapter : MafiaGameWaitingQueueRepository {
 
     override fun enqueue(user: User, locale: String) {
         val queue = waitingQueue.getOrPut(locale) { ConcurrentLinkedQueue() }
+
+        queue.forEach { if (it.id == user.id) throw AlreadyWaitingUserException }
+
         queue.add(user)
     }
 

diff --git a/app/support/exception/src/main/kotlin/com/xorker/draw/exception/ExceptionButtonType.kt b/app/support/exception/src/main/kotlin/com/xorker/draw/exception/ExceptionButtonType.kt
@@ -66,6 +66,7 @@ fun XorkerException.getButtons(): List<ExceptionButtonType> {
         AlreadyLinkedAccountException,
         NotFoundLockKeyException,
         AlreadyPlayingPlayerException,
+        AlreadyWaitingUserException,
         -> buttonOk
     }
 }
diff --git a/...bsocket/src/main/kotlin/com/xorker/draw/websocket/event/MafiaGameInfoWebSocketListener.kt b/...bsocket/src/main/kotlin/com/xorker/draw/websocket/event/MafiaGameInfoWebSocketListener.kt
@@ -37,7 +37,7 @@ internal class MafiaGameInfoWebSocketListener(
             mafiaGameMessenger.broadcastPlayerList(gameInfo)
         }
 
-        if (gameInfo.room.isRandomMatching) {
+        if (gameInfo.room.isRandomMatching && gameInfo.phase is MafiaPhase.End) {
             for (player in gameInfo.room.players) {
                 val session = sessionManager.getSession(player.userId) ?: continue
                 session.origin.close()

diff --git a/domain/src/main/kotlin/com/xorker/draw/exception/XorkerException.kt b/domain/src/main/kotlin/com/xorker/draw/exception/XorkerException.kt
@@ -20,8 +20,9 @@ data object AlreadyJoinRoomException : ClientException("c005", "이미 참여한
 data object InvalidRequestOnlyMyTurnException : ClientException("c006", "요청자의 차례가 아니라서 처리 불가능") { private fun readResolve(): Any = InvalidRequestOnlyMyTurnException }
 data object InvalidRequestOtherPlayingException : ClientException("c007", "진행 중인 게임 방이 있습니다.") { private fun readResolve(): Any = InvalidRequestOtherPlayingException }
 data object AlreadyPlayingRoomException : ClientException("c008", "진행 중인 게임 방에는 참여할 수 없습니다.") { private fun readResolve(): Any = AlreadyPlayingRoomException }
-data object AlreadyPlayingPlayerException : ClientException("c010", "한 유저가 여러번 접속 시도를 하고 있습니다.") { private fun readResolve(): Any = AlreadyPlayingPlayerException }
 data object AlreadyLinkedAccountException : ClientException("c009", "이미 소셜 계정이 연동되어 있습니다.") { private fun readResolve(): Any = AlreadyLinkedAccountException }
+data object AlreadyPlayingPlayerException : ClientException("c010", "한 유저가 여러번 접속 시도를 하고 있습니다.") { private fun readResolve(): Any = AlreadyPlayingPlayerException }
+data object AlreadyWaitingUserException : ClientException("c011", "이미 빠른 게임 대기열에 등록된 유저입니다.") { private fun readResolve(): Any = AlreadyWaitingUserException }
 
 //endregion