根據第一次code review修正

Game-as-a-Service · Nov 5, 2023 · 51753c3 · 51753c3
1 parent d6c6b5b
commit 51753c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/domain/src/main/kotlin/tw/waterballsa/gaas/domain/Room.kt b/domain/src/main/kotlin/tw/waterballsa/gaas/domain/Room.kt
@@ -51,7 +51,7 @@ class Room(
             throw PlatformException(GAME_NOT_STARTED, "Game has not started yet")
         }
         status = WAITING
-        playersCancelReady()
+        cancelReadyForNonHostPlayers()
     }
 
     fun hasPlayer(playerId: Player.Id): Boolean =
@@ -94,7 +94,7 @@ class Room(
 
     private fun findPlayer(playerId: Player.Id): Player? = players.find { it.id == playerId }
 
-    private fun playersCancelReady() {
+    private fun cancelReadyForNonHostPlayers() {
         players.forEach { player ->
             if (!isHost(player.id)) {
                 player.cancelReady()

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
@@ -518,11 +518,9 @@ class RoomControllerTest @Autowired constructor(
     }
 
     private fun givenPlayersArePlayingInRoom(host: Player, vararg players: Player): Room {
-        val combinedPlayers = (listOf(host) + players).toMutableList()
-        players.forEach { player ->
-            player.ready()
-        }
-        testRoom = createRoom(host = host, players = combinedPlayers, status = PLAYING)
+        players.forEach { it.ready() }
+        val allPlayers = mutableListOf(host, *players)
+        testRoom = createRoom(host = host, players = allPlayers, status = PLAYING)
         return testRoom
     }