Add roomId parameter when starting a game (#201)

Game-as-a-Service · Feb 18, 2024 · 06484e9 · 06484e9
1 parent 77d9dea
commit 06484e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/application/src/main/kotlin/tw/waterballsa/gaas/application/client/GameService.kt b/application/src/main/kotlin/tw/waterballsa/gaas/application/client/GameService.kt
@@ -5,6 +5,7 @@ interface GameService {
 }
 
 data class StartGameRequest(
+    val roomId: String,
     val players: List<GamePlayer>,
 ) {
     data class GamePlayer(

diff --git a/application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/StartGameUseCase.kt b/application/src/main/kotlin/tw/waterballsa/gaas/application/usecases/StartGameUseCase.kt
@@ -64,8 +64,11 @@ class StartGameUseCase(
     }
 
     private fun Room.startGameByHost(jwtToken: String): StartedGameEvent {
+        if(roomId == null) {
+            throw PlatformException(GAME_START_FAILED, "Room Id is null")
+        }
         val gameServerHost = game.backEndUrl
-        val startGameRequest = StartGameRequest(players.map { it.toGamePlayer() })
+        val startGameRequest = StartGameRequest(roomId!!.value, players.map { it.toGamePlayer() })
         val startGameResponse = gameService.startGame(gameServerHost, jwtToken, startGameRequest)
 
         return StartedGameEvent(GAME_STARTED, Data(startGameResponse.url, roomId!!))

diff --git a/spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/RoomControllerTest.kt b/spring/src/test/kotlin/tw/waterballsa/gaas/spring/it/controllers/RoomControllerTest.kt
@@ -781,7 +781,7 @@ class RoomControllerTest @Autowired constructor(
         mockMvc.perform(
             post("/rooms/${room.roomId!!.value}:startGame")
                 .withJwt(toJwt())
-                .withJson(StartGameRequest(room.players.map { it.toGamePlayer() }))
+                .withJson(StartGameRequest(room.roomId!!.value,room.players.map { it.toGamePlayer() }))
         )
 
     private fun Player.toGamePlayer(): StartGameRequest.GamePlayer =