Push Event schemas out to Deck

FsUno.Domain/CommandHandler.fs

@@ -1,5 +1,6 @@
 module FsUno.Domain.CommandHandlers
 
+open Deck
 open Game
 
 // This version use F# agents (MailboxProcessor) to keep
@@ -14,7 +15,7 @@ module Game =
     let create readStream appendToStream =
 
         // this is the "repository"
-        let streamId gameId = sprintf "Game-%O" gameId 
+        let streamId (GameId gameId) = sprintf "Game-%O" gameId 
         let load gameId =
             let rec fold state version =
                 async {

FsUno.Domain/Deck.fs

@@ -25,3 +25,13 @@ type Card =
 type Direction =
     | ClockWise
     | CounterClockWise
+
+// Game events
+
+type GameId = GameId of int
+
+type GameStartedEvent = { GameId: GameId; PlayerCount: int; FirstCard: Card; FirstPlayer: int }
+type CardPlayedEvent = { GameId: GameId; Player: int; Card: Card; NextPlayer: int }
+type PlayerPlayedAtWrongTurnEvent = { GameId: GameId; Player: int; Card: Card }
+type PlayerPlayedWrongCardEvent = { GameId: GameId; Player: int; Card: Card }
+type DirectionChangedEvent = { GameId: GameId; Direction: Direction }

FsUno.Domain/Game.fs

@@ -2,8 +2,6 @@
 
 open Deck
 
-type GameId = GameId of int
-
 // Commands
 
 type Command =
@@ -25,30 +23,9 @@ and PlayCard = {
 type Event =
     | GameStarted of GameStartedEvent
     | CardPlayed of CardPlayedEvent
-    | PlayerPlayedAtWrongTurn of PlayerPlayedWrong 
-    | PlayerPlayedWrongCard of PlayerPlayedWrong
-    | DirectionChanged of DirectionChanged
-
-and GameStartedEvent = {
-    GameId: GameId
-    PlayerCount: int
-    FirstCard: Card 
-    FirstPlayer: int }
-
-and CardPlayedEvent = {
-    GameId: GameId
-    Player: int
-    Card: Card
-    NextPlayer: int }
-
-and PlayerPlayedWrong = {
-    GameId: GameId
-    Player: int
-    Card: Card }
-
-and DirectionChanged = {
-    GameId: GameId
-    Direction: Direction }
+    | PlayerPlayedAtWrongTurn of PlayerPlayedAtWrongTurnEvent
+    | PlayerPlayedWrongCard of PlayerPlayedWrongCardEvent
+    | DirectionChanged of DirectionChangedEvent
 
 // Type representing current player turn; All operations should be encapsulated
 

FsUno.Persistence.EventStore/Serialization.fs

@@ -1,6 +1,6 @@
 module Serialization
 
-open FsUno.Domain
+open FsUno.Domain.Deck
 
 // This module provides Json serialization to store
 // events in the event store 
@@ -197,7 +197,7 @@ let valueConverter (valueType: Type) =
 
 let converters =
     let valueConverters =
-        getValues typeof<Game.GameId>.Assembly
+        getValues typeof<GameId>.Assembly
         |> Seq.map valueConverter
         |> Seq.toList
     [ unionConverter;optionConverter]