Merge branch 'sandbox' of https://github.com/YAPP-Github/24th-App-Tea…

…m-2-BE into sandbox
YAPP-Github · Aug 24, 2024 · 58bfd29 · 58bfd29
2 parents f03dca4 + dff709e
commit 58bfd29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...ket/src/main/kotlin/com/xorker/draw/websocket/message/response/MafiaPhaseMessengerImpl.kt b/...ket/src/main/kotlin/com/xorker/draw/websocket/message/response/MafiaPhaseMessengerImpl.kt
@@ -6,6 +6,7 @@ import com.xorker.draw.mafia.MafiaKeyword
 import com.xorker.draw.mafia.MafiaPhase
 import com.xorker.draw.mafia.MafiaPhaseMessenger
 import com.xorker.draw.mafia.MafiaPlayer
+import com.xorker.draw.room.RoomId
 import com.xorker.draw.user.UserId
 import com.xorker.draw.websocket.SessionMessage
 import com.xorker.draw.websocket.broker.WebSocketBroadcaster
@@ -55,7 +56,7 @@ internal class MafiaPhaseMessengerImpl(
             is MafiaPhase.Ready -> MafiaPhaseReadyMessage(
                 MafiaPhaseReadyBody(
                     startTime = phase.job.startTime,
-                    mafiaGameInfo = generateMafiaGameInfoMessage(phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption),
+                    mafiaGameInfo = generateMafiaGameInfoMessage(this.room.id, phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption),
                 ),
             )
 
@@ -66,15 +67,16 @@ internal class MafiaPhaseMessengerImpl(
                     startTurnTime = phase.job.startTime,
                     draw = phase.getDraw(),
                     currentDraw = phase.getCurrentDraw(),
-                    mafiaGameInfo = generateMafiaGameInfoMessage(phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption),
+                    mafiaGameInfo = generateMafiaGameInfoMessage(this.room.id, phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption),
                 ),
             )
 
             is MafiaPhase.Vote -> MafiaPhaseVoteMessage(
                 MafiaPhaseVoteBody(
                     startTime = phase.job.startTime,
                     mafiaGameInfo = if (isOrigin.not()) {
-                        generateMafiaGameInfoMessage(phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
+                        val room = this.room
+                        generateMafiaGameInfoMessage(room.id, phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
                     } else {
                         null
                     },
@@ -87,7 +89,8 @@ internal class MafiaPhaseMessengerImpl(
                 MafiaPhaseInferAnswerBody(
                     startTime = phase.job.startTime,
                     mafiaGameInfo = if (isOrigin.not()) {
-                        generateMafiaGameInfoMessage(phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
+                        val room = this.room
+                        generateMafiaGameInfoMessage(room.id, phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
                     } else {
                         null
                     },
@@ -100,7 +103,8 @@ internal class MafiaPhaseMessengerImpl(
                 MafiaPhaseEndBody(
                     startTime = phase.job.startTime,
                     mafiaGameInfo = if (isOrigin.not()) {
-                        generateMafiaGameInfoMessage(phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
+                        val room = this.room
+                        generateMafiaGameInfoMessage(room.id, phase.mafiaPlayer, phase.turnList, phase.keyword, gameOption)
                     } else {
                         null
                     },
@@ -114,13 +118,15 @@ internal class MafiaPhaseMessengerImpl(
     }
 
     private fun generateMafiaGameInfoMessage(
+        roomId: RoomId,
         mafiaPlayer: MafiaPlayer,
         turnList: List<MafiaPlayer>,
         keyword: MafiaKeyword,
         gameOption: MafiaGameOption,
     ): MafiaGameInfoMessage =
         MafiaGameInfoMessage(
             MafiaGameInfoBody(
+                roomId = roomId,
                 mafiaUserId = mafiaPlayer.userId,
                 turnList = turnList,
                 category = keyword.category,

diff --git a/.../main/kotlin/com/xorker/draw/websocket/message/response/dto/phase/MafiaGameInfoMessage.kt b/.../main/kotlin/com/xorker/draw/websocket/message/response/dto/phase/MafiaGameInfoMessage.kt
@@ -2,6 +2,7 @@ package com.xorker.draw.websocket.message.response.dto.phase
 
 import com.xorker.draw.mafia.MafiaGameOption
 import com.xorker.draw.mafia.MafiaPlayer
+import com.xorker.draw.room.RoomId
 import com.xorker.draw.user.UserId
 import com.xorker.draw.websocket.ResponseAction
 import com.xorker.draw.websocket.SessionMessage
@@ -14,6 +15,7 @@ data class MafiaGameInfoMessage(
 }
 
 data class MafiaGameInfoBody(
+    val roomId: RoomId,
     val mafiaUserId: UserId,
     val turnList: List<MafiaPlayer>,
     val category: String,