Update to FsCodec 2.0.0-rc3

jet · Feb 13, 2020 · 21a5bfc · 21a5bfc
1 parent 5fa682c
commit 21a5bfc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/equinox-fc/Domain/Allocation.fs b/equinox-fc/Domain/Allocation.fs
@@ -3,6 +3,9 @@ module Allocation
 // NOTE - these types and the union case names reflect the actual storage formats and hence need to be versioned with care
 module Events =
 
+    let [<Literal>] CategoryId = "Allocation"
+    let (|For|) id = FsCodec.StreamName.create CategoryId (AllocationId.toString id)
+
     type Commenced =    { ticketIds : TicketId[] }
     type Tickets =      { ticketIds : TicketId[] }
     type Allocated =    { ticketIds : TicketId[]; listId : TicketListId }
@@ -31,8 +34,6 @@ module Events =
         | Snapshotted
         interface TypeShape.UnionContract.IUnionContract
     let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
-    let [<Literal>] categoryId = "Allocation"
-    let (|For|) id = Equinox.AggregateId(categoryId, AllocationId.toString id)
 
 module Fold =
 

diff --git a/equinox-fc/Domain/Allocator.fs b/equinox-fc/Domain/Allocator.fs
@@ -5,6 +5,9 @@ open System
 // NOTE - these types and the union case names reflect the actual storage formats and hence need to be versioned with care
 module Events =
 
+    let [<Literal>] CategoryId = "Allocator"
+    let (|For|) id = FsCodec.StreamName.create CategoryId (AllocatorId.toString id)
+
     type Commenced =    { allocationId : AllocationId; cutoff : DateTimeOffset }
     type Completed =    { allocationId : AllocationId; reason : Reason }
     and  [<Newtonsoft.Json.JsonConverter(typeof<FsCodec.NewtonsoftJson.TypeSafeEnumConverter>)>]
@@ -15,8 +18,6 @@ module Events =
         | Completed     of Completed
         interface TypeShape.UnionContract.IUnionContract
     let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
-    let [<Literal>] category = "Allocator"
-    let (|For|) id = Equinox.AggregateId(category, AllocatorId.toString id)
 
 module Fold =
 

diff --git a/equinox-fc/Domain/Ticket.fs b/equinox-fc/Domain/Ticket.fs
@@ -3,6 +3,9 @@ module Ticket
 // NOTE - these types and the union case names reflect the actual storage formats and hence need to be versioned with care
 module Events =
 
+    let [<Literal>] CategoryId = "Ticket"
+    let (|For|) id = FsCodec.StreamName.create CategoryId (TicketId.toString id)
+
     type Reserved =     { allocatorId : AllocatorId }
     type Allocated =    { allocatorId : AllocatorId; listId : TicketListId }
 
@@ -12,8 +15,6 @@ module Events =
         | Revoked
         interface TypeShape.UnionContract.IUnionContract
     let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
-    let [<Literal>] category = "Ticket"
-    let (|For|) id = Equinox.AggregateId(category, TicketId.toString id)
 
 module Fold =
 

diff --git a/equinox-fc/Domain/TicketList.fs b/equinox-fc/Domain/TicketList.fs
@@ -3,15 +3,16 @@ module TicketList
 // NOTE - these types and the union case names reflect the actual storage formats and hence need to be versioned with care
 module Events =
 
+    let [<Literal>] CategoryId = "TicketList"
+    let (|For|) id = FsCodec.StreamName.create CategoryId (TicketListId.toString id)
+
     type Allocated =    { allocatorId : AllocatorId; ticketIds : TicketId[] }
     type Snapshotted =  { ticketIds : TicketId[] }
     type Event =
         | Allocated     of Allocated
         | Snapshotted   of Snapshotted
         interface TypeShape.UnionContract.IUnionContract
     let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
-    let [<Literal>] categoryId = "TicketList"
-    let (|For|) id = Equinox.AggregateId(categoryId, TicketListId.toString id)
 
 module Fold =