Move AggregateId to Events

jet · Dec 7, 2019 · ce94f3d · ce94f3d
1 parent abd36be
commit ce94f3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/equinox-fc/Domain/LocationEpoch.fs b/equinox-fc/Domain/LocationEpoch.fs
@@ -13,6 +13,9 @@ module Events =
  interface TypeShape.UnionContract.IUnionContract
  let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
  let [<Literal>] categoryId = "LocationEpoch"
+ let (|AggregateId|) (locationId, epochId) =
+ let id = sprintf "%s_%s" (LocationId.toString locationId) (LocationEpochId.toString epochId)
+ Equinox.AggregateId(categoryId, id)
 
 module Folds =
 
@@ -69,10 +72,7 @@ let sync (balanceCarriedForward : Folds.Balance option) (decide : (Folds.Balance
 type Service internal (resolve, ?maxAttempts) =
 
  let log = Serilog.Log.ForContext<Service>()
- let (|AggregateId|) (locationId, epochId) =
- let id = sprintf "%s_%s" (LocationId.toString locationId) (LocationEpochId.toString epochId)
- Equinox.AggregateId(Events.categoryId, id)
- let (|Stream|) (AggregateId id) = Equinox.Stream<Events.Event,Folds.State>(log, resolve id, maxAttempts = defaultArg maxAttempts 2)
+ let (|Stream|) (Events.AggregateId id) = Equinox.Stream<Events.Event,Folds.State>(log, resolve id, maxAttempts = defaultArg maxAttempts 2)
 
  member __.Sync<'R>(locationId, epochId, prevEpochBalanceCarriedForward, decide, shouldClose) : Async<Result<'R>> =
  let (Stream stream) = (locationId, epochId)

diff --git a/equinox-fc/Domain/LocationSeries.fs b/equinox-fc/Domain/LocationSeries.fs
@@ -10,6 +10,7 @@ module Events =
  interface TypeShape.UnionContract.IUnionContract
  let codec = FsCodec.NewtonsoftJson.Codec.Create<Event>()
  let [<Literal>] categoryId = "LocationSeries"
+ let (|AggregateId|) id = Equinox.AggregateId(categoryId, LocationId.toString id)
 
 module Folds =
 
@@ -28,8 +29,7 @@ let toActiveEpoch state =
 type Service internal (resolve, ?maxAttempts) =
 
  let log = Serilog.Log.ForContext<Service>()
- let (|AggregateId|) id = Equinox.AggregateId(Events.categoryId, LocationId.toString id)
- let (|Stream|) (AggregateId id) = Equinox.Stream<Events.Event,Folds.State>(log, resolve id, maxAttempts = defaultArg maxAttempts 2)
+ let (|Stream|) (Events.AggregateId id) = Equinox.Stream<Events.Event,Folds.State>(log, resolve id, maxAttempts = defaultArg maxAttempts 2)
 
  member __.Read(locationId) : Async<LocationEpochId option> =
  let (Stream stream) = locationId