players hands and deck is modify on PlayerHavePassEvent & CardIsPlayedEvent events

src/main/kotlin/eventDemo/app/entity/Deck.kt

@@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable
 data class Deck(
     val stack: Set<Card> = emptySet(),
     val discard: Set<Card> = emptySet(),
-    val playersHands: List<PlayerHand> = emptyList(),
+    val playersHands: PlayerHands = emptyMap(),
 ) {
-    constructor(players: List<Player>) : this(playersHands = players.map { PlayerHand(it) })
+    constructor(players: List<Player>) : this(playersHands = players.associateWith { emptyList<Card>() })
 
     fun putOneCardOnDiscard(): Deck {
         val takenCard = stack.first()
@@ -16,20 +16,54 @@ data class Deck(
         return copy(stack = newStack)
     }
 
-    fun take(n: Int): Pair<Deck, List<Card>> {
+    private fun take(n: Int): Pair<Deck, List<Card>> {
         val takenCards = stack.take(n)
         val newStack = stack.filterNot { takenCards.contains(it) }.toSet()
         return Pair(copy(stack = newStack), takenCards)
     }
 
+    private fun takeOne(): Pair<Deck, Card> = take(1).let { (deck, cards) -> Pair(deck, cards.first()) }
+
+    fun takeOneCardTo(player: Player): Deck =
+        takeOne().let { (deck, newPlayerCard) ->
+            val newHands =
+                deck.playersHands.mapValues { (p, cards) ->
+                    if (p == player) {
+                        cards + newPlayerCard
+                    } else {
+                        cards
+                    }
+                }
+            deck.copy(playersHands = newHands)
+        }
+
+    fun putOneCardFromHand(
+        player: Player,
+        card: Card,
+    ): Deck =
+        run {
+            // Validate parameters
+            val playerHand =
+                playersHands[player]
+                    ?: error("No player on this game")
+            if (playerHand.none { it == card }) {
+                error("No card exist on the player hand")
+            }
+        }.let {
+            copy(
+                discard = discard + card,
+                playersHands = playersHands.addCard(player, card),
+            )
+        }
+
     companion object {
         fun initHands(
             players: Set<Player>,
             handSize: Int = 7,
         ): Deck {
             val deck = new()
-            val playersHands = players.map { PlayerHand(it, deck.stack.take(handSize)) }
+            val playersHands = players.associateWith { deck.stack.take(handSize) }
-            val allTakenCards = playersHands.flatMap { it.cards }
+            val allTakenCards = playersHands.flatMap { it.value }
             val newStack = deck.stack.filterNot { allTakenCards.contains(it) }.toSet()
             return deck.copy(
                 stack = newStack,

src/main/kotlin/eventDemo/app/entity/PlayerHand.kt

@@ -1,11 +1,14 @@
 package eventDemo.app.entity
 
-import kotlinx.serialization.Serializable
+typealias PlayerHands = Map<Player, List<Card>>
 
-@Serializable
+fun PlayerHands.addCard(
-data class PlayerHand(
+    player: Player,
-    val player: Player,
+    card: Card,
-    val cards: List<Card> = emptyList(),
+) = mapValues { (p, cards) ->
-) {
+    if (p == player) {
-    val count = lazy { cards.count() }
+        cards - card
+    } else {
+        cards
+    }
 }

src/main/kotlin/eventDemo/app/event/GameStateBuilder.kt

@@ -37,6 +37,7 @@ private fun GameId.buildStateFromEvents(events: List<GameEvent>): GameState =
                     lastPlayer = event.player,
                     direction = direction,
                     lastColor = color,
+                    deck = state.deck.putOneCardFromHand(event.player, event.card),
                 )
             }
 
@@ -57,6 +58,7 @@ private fun GameId.buildStateFromEvents(events: List<GameEvent>): GameState =
             is PlayerHavePassEvent -> {
                 state.copy(
                     lastPlayer = event.player,
+                    deck = state.deck.takeOneCardTo(event.player),
                 )
             }
 
@@ -69,7 +71,7 @@ private fun GameId.buildStateFromEvents(events: List<GameEvent>): GameState =
             is GameStartedEvent -> {
                 state.copy(
                     lastColor = (event.deck.discard.first() as? Card.ColorCard)?.color,
-                    lastCard = eventDemo.app.GameState.LastCard(event.deck.discard.first(), event.firstPlayer),
+                    lastCard = GameState.LastCard(event.deck.discard.first(), event.firstPlayer),
                     lastPlayer = event.firstPlayer,
                     deck = event.deck,
                     isStarted = true,