Yo happy now, Jan?!

Dzoukr · Dec 18, 2018 · 5e8f8ec · 5e8f8ec
1 parent 4b8d9a2
commit 5e8f8ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 29 deletions.
diff --git a/src/CosmoStore/CosmoStore.fsproj b/src/CosmoStore/CosmoStore.fsproj
@@ -5,7 +5,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CosmoStore.fs" />
-    <Compile Include="Observable.fs" />
     <EmbeddedResource Include="CosmosDb\StoredProcedures\AppendEvents.js" />
     <Compile Include="CosmosDb\CosmosDb.fs" />
     <Compile Include="CosmosDb\Serialization.fs" />

diff --git a/src/CosmoStore/CosmosDb/EventStore.fs b/src/CosmoStore/CosmosDb/EventStore.fs
@@ -145,14 +145,17 @@ let getEventStore (configuration:Configuration) =
     } |> Async.AwaitTask |> Async.RunSynchronously
 
     {
-        AppendEvent = fun stream pos -> 
-                        List.singleton 
-                        >> appendEvents getRequestOptions client appendEventProcUri stream pos 
-                        >> Observable.hookEvent eventAppended 
+        AppendEvent = fun stream pos event -> task {
+            let! events = appendEvents getRequestOptions client appendEventProcUri stream pos [event]
+            events |> List.iter eventAppended.Trigger
+            return events |> List.head
+        }
 
-        AppendEvents = fun stream pos -> 
-                        appendEvents getRequestOptions client appendEventProcUri stream pos 
-                        >> Observable.hookEvents eventAppended
+        AppendEvents = fun stream pos events -> task {
+            let! events = appendEvents getRequestOptions client appendEventProcUri stream pos events
+            events |> List.iter eventAppended.Trigger
+            return events
+        } 
 
         GetEvent = getEvent client eventsCollectionUri
         GetEvents = getEvents client eventsCollectionUri

diff --git a/src/CosmoStore/Observable.fs b/src/CosmoStore/Observable.fs
diff --git a/src/CosmoStore/TableStorage/EventStore.fs b/src/CosmoStore/TableStorage/EventStore.fs
@@ -139,8 +139,16 @@ let getEventStore (configuration:Configuration) =
 
     let table = client.GetTableReference(configuration.TableName)
     {
-        AppendEvent = fun stream pos -> List.singleton >> appendEvents table stream pos >> Observable.hookEvent eventAppended 
-        AppendEvents = fun stream pos -> appendEvents table stream pos >> Observable.hookEvents eventAppended
+        AppendEvent = fun stream pos event -> task {
+            let! events = appendEvents table stream pos [event]
+            events |> List.iter eventAppended.Trigger
+            return events |> List.head
+        }
+        AppendEvents = fun stream pos events -> task {
+            let! events = appendEvents table stream pos events
+            events |> List.iter eventAppended.Trigger
+            return events
+        }
         GetEvent = getEvent table
         GetEvents = getEvents table
         GetStreams = getStreams table