Make a usable version of getEventByCorrelationId

paket.dependencies

@@ -34,6 +34,7 @@ group Marten
     nuget TaskBuilder.fs
     nuget FSharp.Core >= 4.3.4 < 4.5.4
     nuget Marten.FSharp
+    github baronfel/Newtonsoft.Json.FSharp.Idiomatic src/Newtonsoft.Json.FSharp.Idiomatic/Newtonsoft.Json.FSharp.Idiomatic.fs 
 
 group InMemory
     source https://api.nuget.org/v3/index.json

paket.lock

@@ -3475,7 +3475,9 @@ NUGET
       FSharp.Core (>= 4.1.17) - restriction: || (&& (>= net45) (< net46) (< netstandard1.6)) (&& (< net45) (>= netstandard1.6)) (&& (>= net46) (< netstandard1.6)) (>= net47)
       NETStandard.Library (>= 1.6.1) - restriction: && (< net45) (>= netstandard1.6)
       System.ValueTuple (>= 4.4) - restriction: || (&& (>= net45) (< net46) (< netstandard1.6)) (&& (< net45) (>= netstandard1.6)) (&& (>= net46) (< netstandard1.6)) (>= net47)
-
+GITHUB
+  remote: baronfel/Newtonsoft.Json.FSharp.Idiomatic
+    src/Newtonsoft.Json.FSharp.Idiomatic/Newtonsoft.Json.FSharp.Idiomatic.fs (abe8185653e06893623dd3a39b353afc226fa703)
 GROUP TableStorage
 STORAGE: NONE
 NUGET

src/CosmoStore.Marten/CosmoStore.Marten.fsproj

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <Authors>Roman Provazník;Kunjan Dalal</Authors>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Content Include="paket.references" />
-      <Content Include="RELEASE_NOTES.md" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\CosmoStore\CosmoStore.fsproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Include="MartenConf.fs" />
-      <Compile Include="EventStore.fs" />
-    </ItemGroup>
-    <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Authors>Roman Provazník;Kunjan Dalal</Authors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\paket-files\marten\baronfel\Newtonsoft.Json.FSharp.Idiomatic\src\Newtonsoft.Json.FSharp.Idiomatic\Newtonsoft.Json.FSharp.Idiomatic.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/Newtonsoft.Json.FSharp.Idiomatic.fs</Link>
+    </Compile>
+    <Content Include="paket.references" />
+    <Content Include="RELEASE_NOTES.md" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CosmoStore\CosmoStore.fsproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MartenConf.fs" />
+    <Compile Include="EventStore.fs" />
+  </ItemGroup>
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>

src/CosmoStore.Marten/EventStore.fs

@@ -1,5 +1,7 @@
 namespace CosmoStore.Marten
 open Npgsql
+open Newtonsoft.Json
+open Newtonsoft.Json.FSharp.Idiomatic
 
 module EventStore =
     open System
@@ -130,16 +132,28 @@ module EventStore =
         let! events = getEvents store streamId filter
         return events.Head
     }
+    open Microsoft.FSharp.Quotations.Patterns
+
+    let rec private propertyName quotation =
+        match quotation with
+        | PropertyGet (_,propertyInfo,_) -> propertyInfo.Name
+        | Lambda (_,expr) -> propertyName expr
+        | _ -> ""
+
+    // Get a type safe name in case this changes somehow
+    let private correlationIdPropName = propertyName <@ fun (x : EventRead) -> x.CorrelationId @>
 
-    let private getEventsByCorrelationId (store: IDocumentStore) corrId =
+    let private getEventsByCorrelationIdQuery = sprintf "where data->>'%s' = ?" correlationIdPropName
+
+    let private getEventsByCorrelationId (store: IDocumentStore) (corrId : Guid) =
         task {
             use session = store.LightweightSession()
+
+            let! res = 
+                session
+                |> Session.sqlTask<EventRead> getEventsByCorrelationIdQuery [| box (corrId.ToString()) |]
 
-//            let res = session |> Session.query<EventRead> |> Queryable.filter <@ fun x ->  Option.toNullable(x.CorrelationId) = Nullable(corrId) @> |> Seq.toList
-//TODO: Option is type is not supported by store. So, it is better to convert option type to Nullable and then put a guard on that.
-//TODO: remove this not optimized filter once things converted to nullable. Then above code can be used. Until then don't use in production
-            let res = session |> Session.query<EventRead> |> Seq.filter (fun x -> x.CorrelationId = Some corrId) |> Seq.toList
-            return (res)
+            return res |> Seq.toList
         }
 
     let private getStreams (store: IDocumentStore) streamsRead = task {
@@ -154,7 +168,7 @@ module EventStore =
             |> Queryable.toListTask
 
         return (res |> Seq.toList)
-     }
+    }
 
     let private getStream (store: IDocumentStore) streamId = task {
         use session = store.LightweightSession()
@@ -170,11 +184,27 @@ module EventStore =
 
     let userConnStr(conf) = createConnString (conf.Host) (conf.Username) (conf.Password) (conf.Database)
 
+    let converters: JsonConverter [] = [|
+        OptionConverter()
+        SingleCaseDuConverter()
+        MultiCaseDuConverter()
+    |]
+
+    let martenSerializer =
+        // Need to tell marten to use enums as strings or we have to teach npgsql about our enums when using parameters
+        let s = Services.JsonNetSerializer(EnumStorage = EnumStorage.AsString)
+
+        for c in converters do
+            s.Customize(fun s -> s.Converters.Add(c))
+        s
+
     let getEventStore (conf:  Configuration) =
         let store =
-            userConnStr conf
-            |> string
-            |> DocumentStore.For
+            Marten.DocumentStore.For(
+                fun ds ->
+                    ds.Connection(userConnStr conf |> string) |> ignore
+                    ds.Serializer(martenSerializer) |> ignore
+            )
 
         let eventAppended = Event<EventRead>()
 

src/CosmoStore.Marten/paket.references

@@ -2,3 +2,4 @@ group Marten
     FSharp.Core
     TaskBuilder.fs
     Marten.FSharp
+    File: Newtonsoft.Json.FSharp.Idiomatic.fs