Merge branch 'feature/DRAW-118' into sandbox

YAPP-Github · Jul 21, 2024 · 8893f8b · 8893f8b
2 parents 070f324 + 172bb40
commit 8893f8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...cket/src/main/kotlin/com/xorker/draw/websocket/message/response/MafiaGameMessengerImpl.kt b/...cket/src/main/kotlin/com/xorker/draw/websocket/message/response/MafiaGameMessengerImpl.kt
@@ -162,11 +162,11 @@ class MafiaGameMessengerImpl(
             roomId,
             MafiaGameDrawMessage(
                 MafiaGameDrawBody(
-                    phase.round,
-                    phase.turn,
-                    LocalDateTime.now(), // TOOD: 턴 시스템 도입 시 수정
-                    phase.drawData.take(phase.drawData.size - 1).map { it.second },
-                    phase.drawData.last().second,
+                    round = phase.round,
+                    turn = phase.turn,
+                    startTurnTime = LocalDateTime.now(), // TOOD: 턴 시스템 도입 시 수정
+                    draw = phase.drawData.take(phase.drawData.size - 1).map { it.second },
+                    currentDraw = phase.drawData.last().second,
                 ),
             ),
         )

diff --git a/core/src/main/kotlin/com/xorker/draw/mafia/MafiaGameService.kt b/core/src/main/kotlin/com/xorker/draw/mafia/MafiaGameService.kt
@@ -23,7 +23,6 @@ internal class MafiaGameService(
         phase.drawData.add(Pair(session.user.id, request.drawData))
 
         mafiaGameRepository.saveGameInfo(gameInfo)
-
-        mafiaGameMessenger.broadcastDraw(gameInfo)
+        mafiaGameMessenger.broadcastDraw(gameInfo.room.id, phase)
     }
 }