Fixing problem with not storing Event metadata #1

Dzoukr · Oct 26, 2018 · 92dbc34 · 92dbc34
1 parent 8c6e59b
commit 92dbc34
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 18 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.1.2 - October 26 2018
+* Fixing problem with not storing Event metadata #1
+
 ### 1.1.1 - October 23 2018
 * Package description update
 

diff --git a/src/CosmoStore/TableStorage/Conversion.fs b/src/CosmoStore/TableStorage/Conversion.fs
@@ -3,6 +3,7 @@ module CosmoStore.TableStorage.Conversion
 open System
 open Microsoft.WindowsAzure.Storage.Table
 open CosmoStore
+open System.Collections.Generic
 
 let internal streamRowKey = "Stream"
 
@@ -28,10 +29,14 @@ let eventWriteToEntity streamId position (x:EventWrite) : DynamicTableEntity =
     | None -> ()
     entity
 
-let private nullToNone = function
-    | null -> None
-    | v -> Some v
-
+let private tryStringValue key (dict:IDictionary<string, EntityProperty>) = 
+    match dict.TryGetValue(key) with
+    | true, v ->
+        match v with
+        | null -> None
+        | x -> x.StringValue |> Some
+    | false, _ -> None
+
 let isEvent (x:DynamicTableEntity) = x.RowKey <> streamRowKey
 
 let newStreamEntity streamId = DynamicTableEntity(streamId, "Stream")
@@ -44,6 +49,6 @@ let entityToEventRead (x:DynamicTableEntity) : EventRead =
         Position = x.Properties.["Position"].Int64Value.Value
         Name = x.Properties.["Name"].StringValue
         Data = x.Properties.["Data"].StringValue |> Serialization.stringToJToken
-        Metadata = x.Properties.["Metadata"].StringValue |> nullToNone |> Option.map Serialization.stringToJToken
+        Metadata = x.Properties |> tryStringValue "Metadata" |> Option.map Serialization.stringToJToken
         CreatedUtc = x.Timestamp.UtcDateTime
     }
diff --git a/tests/CosmoStore.Tests/BasicTests.fs b/tests/CosmoStore.Tests/BasicTests.fs
@@ -5,12 +5,13 @@ open NUnit.Framework
 open CosmoStore
 open Newtonsoft.Json.Linq
 open Microsoft.Azure.Documents.Client
+open CosmoStore.TableStorage
 
 module CosmosDb =
     open CosmoStore.CosmosDb
 
-    let private smallSize = 1000
-    let private bigSize = 100000
+    let smallSize = 1000
+    let bigSize = 100000
 
 
     let private getConfig throughput = 
@@ -22,40 +23,38 @@ module CosmosDb =
         let n = sprintf "EventStore_%i" throughput
         { c with DatabaseName = n }
 
-    let private cleanup throughput =
+    let getCleanEventStore throughput =
         let conf = getConfig throughput
         let client = new DocumentClient(conf.ServiceEndpoint, conf.AuthKey)
         try
-            client.DeleteDocumentCollectionAsync(UriFactory.CreateDocumentCollectionUri(conf.DatabaseName, "Events")) 
+            do client.DeleteDocumentCollectionAsync(UriFactory.CreateDocumentCollectionUri(conf.DatabaseName, "Events")) 
             |> Async.AwaitTask 
             |> Async.RunSynchronously 
             |> ignore
-        with _ -> ()
+        with ex -> ()
+        conf |> EventStore.getEventStore
 
     let eventStoreSmall = 
-        smallSize |> cleanup
-        smallSize |> getConfig |> EventStore.getEventStore
+        smallSize |> getCleanEventStore 
     let eventStoreBig = 
-        bigSize |> cleanup
-        bigSize |> getConfig |> EventStore.getEventStore
+        bigSize |> getCleanEventStore
 
 module TableStorage =
     open CosmoStore.TableStorage
     open Microsoft.WindowsAzure.Storage
 
     let private conf = Configuration.CreateDefaultForLocalEmulator()
 
-    let private cleanup() =
+    let getCleanEventStore() =
         let account = CloudStorageAccount.DevelopmentStorageAccount
         let client = account.CreateCloudTableClient()
         let table = client.GetTableReference("Events")
         try
             table.DeleteIfExistsAsync() |> Async.AwaitTask |> Async.RunSynchronously |> ignore
         with _ -> ()
-
-    let eventStore = 
-        cleanup()
         conf |> EventStore.getEventStore
+
+    let eventStore = getCleanEventStore()
 
 let getStreamId () = sprintf "TestStream_%A" (Guid.NewGuid())
 
@@ -88,6 +87,12 @@ let getEventStore = function
     | StoreType.CosmosBig -> CosmosDb.eventStoreBig
     | StoreType.TableStorage -> TableStorage.eventStore   
 
+let getCleanEventStore = function
+    | StoreType.CosmosSmall -> CosmosDb.getCleanEventStore CosmosDb.smallSize
+    | StoreType.CosmosBig -> CosmosDb.getCleanEventStore CosmosDb.bigSize
+    | StoreType.TableStorage -> TableStorage.getCleanEventStore()   
+
+
 [<Test>]
 let ``Appends event`` ([<Values(StoreType.CosmosSmall, StoreType.CosmosBig, StoreType.TableStorage)>] (typ:StoreType)) =
     let store = typ |> getEventStore

diff --git a/tests/CosmoStore.Tests/CosmoStore.Tests.fsproj b/tests/CosmoStore.Tests/CosmoStore.Tests.fsproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BasicTests.fs" />
+    <Compile Include="Issues.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\CosmoStore\CosmoStore.fsproj" />

diff --git a/tests/CosmoStore.Tests/Issues.fs b/tests/CosmoStore.Tests/Issues.fs
@@ -0,0 +1,19 @@
+module CosmoStore.Tests.Issues
+
+open NUnit.Framework
+open CosmoStore
+open CosmoStore.Tests.BasicTests
+
+[<Test>]
+let ``Can read back Events stored without metadata`` ([<Values(StoreType.CosmosSmall, StoreType.CosmosBig, StoreType.TableStorage)>] (typ:StoreType)) =
+    let store = typ |> getCleanEventStore
+    let streamId = getStreamId()
+    let event = 
+        1 |> getEvent |> fun e -> { e with Metadata = None }
+    event
+    |> store.AppendEvent streamId ExpectedPosition.Any
+    |> Async.AwaitTask
+    |> Async.RunSynchronously
+    |> fun e ->
+        Assert.AreEqual(None, e.Metadata)
+    |> ignore