Rename Append.fs to AppendRaw.fs, same with Read.fs. Fix code accordingly.

Jamil Maqdis Anton · Jamil Maqdis Anton · commit 090bfd2866e6 · 2020-10-14T21:00:49.000+02:00
diff --git a/src/Append.fs b/src/Append.fs
@@ -1,41 +1,20 @@
 namespace SqlStreamStore.FSharp
 
-open SqlStreamStore.FSharp
 open SqlStreamStore.Streams
 
 module Append =
-    let private stringIdToGuid: StreamMessageId -> System.Guid =
-        function
-        | StreamMessageId.Custom guid -> guid
-        | StreamMessageId.Auto -> System.Guid.NewGuid()
+    let appendNewMessage (store: SqlStreamStore.IStreamStore)
+                         (streamName: StreamName)
+                         (appendVersion: AppendVersion)
+                         (messageDetails: MessageDetails)
+                         : Async<Result<AppendResult, string>> =
+        AppendRaw.appendNewMessage store streamName appendVersion messageDetails
+        |> ExceptionHandler.simpleExceptionHandler 
 
-    let private newStreamMessageFromMessageDetails: MessageDetails -> NewStreamMessage =
-        fun msg ->
-            match msg.jsonMetadata with
-            | "" -> NewStreamMessage(stringIdToGuid msg.id, msg.type_, msg.jsonData)
-            | metadata -> NewStreamMessage(stringIdToGuid msg.id, msg.type_, msg.jsonData, metadata)
-
-    let private fromAppendVersion: AppendVersion -> int =
-        function
-        | AppendVersion.Any -> ExpectedVersion.Any
-        | AppendVersion.EmptyStream -> ExpectedVersion.EmptyStream
-        | AppendVersion.NoStream -> ExpectedVersion.NoStream
-        | AppendVersion.SpecificVersion version -> version
-
-    let appendNewMessage: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> MessageDetails -> Async<AppendResult> =
-        fun store streamName appendVersion messageDetails ->
-            store.AppendToStream
-                (StreamId(streamName),
-                 fromAppendVersion appendVersion,
-                 [| newStreamMessageFromMessageDetails messageDetails |])
-            |> Async.AwaitTask
-
-    let appendNewMessages: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> List<MessageDetails> -> Async<AppendResult> =
-        fun store streamName appendVersion messages ->
-            store.AppendToStream
-                (StreamId(streamName),
-                 fromAppendVersion appendVersion,
-                 messages
-                 |> List.map newStreamMessageFromMessageDetails
-                 |> List.toArray)
-            |> Async.AwaitTask
+    let appendNewMessages (store: SqlStreamStore.IStreamStore)
+                          (streamName: StreamName)
+                          (appendVersion: AppendVersion)
+                          (messages: MessageDetails list)
+                          : Async<Result<AppendResult, string>> =
+        AppendRaw.appendNewMessages store streamName appendVersion messages
+        |> ExceptionHandler.simpleExceptionHandler 
diff --git a/src/AppendExtras.fs b/src/AppendExtras.fs
diff --git a/src/AppendRaw.fs b/src/AppendRaw.fs
@@ -0,0 +1,41 @@
+namespace SqlStreamStore.FSharp
+
+open SqlStreamStore.FSharp
+open SqlStreamStore.Streams
+
+module AppendRaw =
+    let private stringIdToGuid: StreamMessageId -> System.Guid =
+        function
+        | StreamMessageId.Custom guid -> guid
+        | StreamMessageId.Auto -> System.Guid.NewGuid()
+
+    let private newStreamMessageFromMessageDetails: MessageDetails -> NewStreamMessage =
+        fun msg ->
+            match msg.jsonMetadata with
+            | "" -> NewStreamMessage(stringIdToGuid msg.id, msg.type_, msg.jsonData)
+            | metadata -> NewStreamMessage(stringIdToGuid msg.id, msg.type_, msg.jsonData, metadata)
+
+    let private fromAppendVersion: AppendVersion -> int =
+        function
+        | AppendVersion.Any -> ExpectedVersion.Any
+        | AppendVersion.EmptyStream -> ExpectedVersion.EmptyStream
+        | AppendVersion.NoStream -> ExpectedVersion.NoStream
+        | AppendVersion.SpecificVersion version -> version
+
+    let appendNewMessage: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> MessageDetails -> Async<AppendResult> =
+        fun store streamName appendVersion messageDetails ->
+            store.AppendToStream
+                (StreamId(streamName),
+                 fromAppendVersion appendVersion,
+                 [| newStreamMessageFromMessageDetails messageDetails |])
+            |> Async.AwaitTask
+
+    let appendNewMessages: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> List<MessageDetails> -> Async<AppendResult> =
+        fun store streamName appendVersion messages ->
+            store.AppendToStream
+                (StreamId(streamName),
+                 fromAppendVersion appendVersion,
+                 messages
+                 |> List.map newStreamMessageFromMessageDetails
+                 |> List.toArray)
+            |> Async.AwaitTask
diff --git a/src/Read.fs b/src/Read.fs
@@ -1,57 +1,16 @@
-﻿namespace SqlStreamStore.FSharp
-
-open System.Threading
-open SqlStreamStore.Streams
-
-module Read =
-    let private fromReadVersion: ReadVersion -> int =
-        function
-        | ReadVersion.Start -> int (Position.Start)
-        | ReadVersion.End -> int (Position.End)
-        | ReadVersion.SpecificVersion version -> int (version)
-
-    let private fromStartPositionInclusive: StartPosition -> int64 =
-        function
-        | StartPosition.Start -> 0L
-        | StartPosition.End -> -1L
-        | StartPosition.SpecificPosition position -> position
-
-    let readFromAllStream: SqlStreamStore.IStreamStore -> ReadingDirection -> StartPosition -> MessageCount -> Async<ReadAllPage> =
-        fun store readingDirection startPositionInclusive msgCount ->
-            match readingDirection with
-            | ReadingDirection.Forward ->
-                store.ReadAllForwards(fromStartPositionInclusive startPositionInclusive, msgCount)
-            | ReadingDirection.Backward ->
-                store.ReadAllBackwards(fromStartPositionInclusive startPositionInclusive, msgCount)
-            |> Async.AwaitTask
-
-    let readFromAllStream': SqlStreamStore.IStreamStore -> ReadingDirection -> StartPosition -> MessageCount -> bool -> CancellationToken -> Async<ReadAllPage> =
-        fun store readingDirection startPositionInclusive msgCount prefetchJson cancellationToken ->
-            match readingDirection with
-            | ReadingDirection.Forward ->
-                store.ReadAllForwards
-                    (fromStartPositionInclusive startPositionInclusive, msgCount, prefetchJson, cancellationToken)
-            | ReadingDirection.Backward ->
-                store.ReadAllBackwards
-                    (fromStartPositionInclusive startPositionInclusive, msgCount, prefetchJson, cancellationToken)
-            |> Async.AwaitTask
-
-    let readFromStream: SqlStreamStore.IStreamStore -> ReadingDirection -> StreamName -> ReadVersion -> MessageCount -> Async<ReadStreamPage> =
-        fun store readingDirection streamName readVersion msgCount ->
-            match readingDirection with
-            | ReadingDirection.Forward ->
-                store.ReadStreamForwards(StreamId(streamName), fromReadVersion readVersion, msgCount)
-            | ReadingDirection.Backward ->
-                store.ReadStreamBackwards(StreamId(streamName), fromReadVersion readVersion, msgCount)
-            |> Async.AwaitTask
-
-    let readFromStream': SqlStreamStore.IStreamStore -> ReadingDirection -> StreamName -> ReadVersion -> MessageCount -> bool -> CancellationToken -> Async<ReadStreamPage> =
-        fun store readingDirection streamName readVersion msgCount prefetchJson cancellationToken ->
-            match readingDirection with
-            | ReadingDirection.Forward ->
-                store.ReadStreamForwards
-                    (StreamId(streamName), fromReadVersion readVersion, msgCount, prefetchJson, cancellationToken)
-            | ReadingDirection.Backward ->
-                store.ReadStreamBackwards
-                    (StreamId(streamName), fromReadVersion readVersion, msgCount, prefetchJson, cancellationToken)
-            |> Async.AwaitTask
+namespace SqlStreamStore.FSharp
+
+open SqlStreamStore.Streams
+
+module Read =
+    let readFromAllStream (store: SqlStreamStore.IStreamStore)
+                          (readingDirection: ReadingDirection)
+                          (startPositionInclusive: StartPosition)
+                          (msgCount: MessageCount)
+                          : Async<Result<ReadAllPage, string>> =
+        ReadRaw.readFromAllStream store readingDirection startPositionInclusive msgCount
+        |> ExceptionHandler.simpleExceptionHandler 
+
+    let readFromStream store readingDirection streamName readVersion msgCount =
+        ReadRaw.readFromStream store readingDirection streamName readVersion msgCount
+        |> ExceptionHandler.simpleExceptionHandler 
diff --git a/src/ReadRaw.fs b/src/ReadRaw.fs
@@ -0,0 +1,57 @@
+﻿namespace SqlStreamStore.FSharp
+
+open System.Threading
+open SqlStreamStore.Streams
+
+module ReadRaw =
+    let private fromReadVersion: ReadVersion -> int =
+        function
+        | ReadVersion.Start -> int (Position.Start)
+        | ReadVersion.End -> int (Position.End)
+        | ReadVersion.SpecificVersion version -> int (version)
+
+    let private fromStartPositionInclusive: StartPosition -> int64 =
+        function
+        | StartPosition.Start -> 0L
+        | StartPosition.End -> -1L
+        | StartPosition.SpecificPosition position -> position
+
+    let readFromAllStream: SqlStreamStore.IStreamStore -> ReadingDirection -> StartPosition -> MessageCount -> Async<ReadAllPage> =
+        fun store readingDirection startPositionInclusive msgCount ->
+            match readingDirection with
+            | ReadingDirection.Forward ->
+                store.ReadAllForwards(fromStartPositionInclusive startPositionInclusive, msgCount)
+            | ReadingDirection.Backward ->
+                store.ReadAllBackwards(fromStartPositionInclusive startPositionInclusive, msgCount)
+            |> Async.AwaitTask
+
+    let readFromAllStream': SqlStreamStore.IStreamStore -> ReadingDirection -> StartPosition -> MessageCount -> bool -> CancellationToken -> Async<ReadAllPage> =
+        fun store readingDirection startPositionInclusive msgCount prefetchJson cancellationToken ->
+            match readingDirection with
+            | ReadingDirection.Forward ->
+                store.ReadAllForwards
+                    (fromStartPositionInclusive startPositionInclusive, msgCount, prefetchJson, cancellationToken)
+            | ReadingDirection.Backward ->
+                store.ReadAllBackwards
+                    (fromStartPositionInclusive startPositionInclusive, msgCount, prefetchJson, cancellationToken)
+            |> Async.AwaitTask
+
+    let readFromStream: SqlStreamStore.IStreamStore -> ReadingDirection -> StreamName -> ReadVersion -> MessageCount -> Async<ReadStreamPage> =
+        fun store readingDirection streamName readVersion msgCount ->
+            match readingDirection with
+            | ReadingDirection.Forward ->
+                store.ReadStreamForwards(StreamId(streamName), fromReadVersion readVersion, msgCount)
+            | ReadingDirection.Backward ->
+                store.ReadStreamBackwards(StreamId(streamName), fromReadVersion readVersion, msgCount)
+            |> Async.AwaitTask
+
+    let readFromStream': SqlStreamStore.IStreamStore -> ReadingDirection -> StreamName -> ReadVersion -> MessageCount -> bool -> CancellationToken -> Async<ReadStreamPage> =
+        fun store readingDirection streamName readVersion msgCount prefetchJson cancellationToken ->
+            match readingDirection with
+            | ReadingDirection.Forward ->
+                store.ReadStreamForwards
+                    (StreamId(streamName), fromReadVersion readVersion, msgCount, prefetchJson, cancellationToken)
+            | ReadingDirection.Backward ->
+                store.ReadStreamBackwards
+                    (StreamId(streamName), fromReadVersion readVersion, msgCount, prefetchJson, cancellationToken)
+            |> Async.AwaitTask
diff --git a/src/SqlStreamStore.FSharp.fsproj b/src/SqlStreamStore.FSharp.fsproj
@@ -11,10 +11,14 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <Compile Include="AsyncExtras.fs" />
+        <Compile Include="ExceptionHandler.fs" />
         <Compile Include="Types.fs" />
+        <Compile Include="AppendRaw.fs" />
+        <Compile Include="ReadRaw.fs" />
+        <Compile Include="Postgres.fs" />
         <Compile Include="Append.fs" />
         <Compile Include="Read.fs" />
-        <Compile Include="Postgres.fs" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/AppendExtrasTests.fs b/tests/AppendExtrasTests.fs
@@ -0,0 +1,53 @@
+module SqlStreamStore.FSharp.Tests.AppendExtrasTests
+
+open Expecto
+
+open SqlStreamStore.FSharp
+
+
+[<Tests>]
+let tests =
+    testList
+        "AppendExtras Tests"
+        [ testAsync "Should append one message to stream." {
+              let inMemStore = new SqlStreamStore.InMemoryStreamStore()
+
+              let streamName = "test"
+
+              let appendVersion = AppendVersion.NoStream
+
+              let msg =
+                  { id = StreamMessageId.Auto
+                    type_ = "testing"
+                    jsonData = "{}"
+                    jsonMetadata = "{}" }
+
+              let! appendResult = AppendRaw.appendNewMessage inMemStore streamName appendVersion msg
+
+              Expect.equal appendResult.CurrentVersion 0 "Error: message version doesn't match."
+          }
+
+          testAsync "Should append a list of messages to stream." {
+              let inMemStore = new SqlStreamStore.InMemoryStreamStore()
+
+              let streamName = "test"
+
+              let appendVersion = AppendVersion.NoStream
+
+              let msg1 =
+                  { id = StreamMessageId.Auto
+                    type_ = "testing"
+                    jsonData = "{}"
+                    jsonMetadata = "{}" }
+
+              let msg2 =
+                  { id = StreamMessageId.Auto
+                    type_ = "testing"
+                    jsonData = "{}"
+                    jsonMetadata = "{}" }
+
+              let msgList = [ msg1; msg2 ]
+
+              let! appendResult = AppendRaw.appendNewMessages inMemStore streamName appendVersion msgList
+              Expect.equal appendResult.CurrentVersion 1 "Error: message version doesn't match."
+          } ]
diff --git a/tests/AppendTests.fs b/tests/AppendTests.fs
@@ -21,7 +21,7 @@ let tests =
                     jsonData = "{}"
                     jsonMetadata = "{}" }
 
-              let! appendResult = Append.appendNewMessage inMemStore streamName appendVersion msg
+              let! appendResult = AppendRaw.appendNewMessage inMemStore streamName appendVersion msg
 
               Expect.equal appendResult.CurrentVersion 0 "Error: message version doesn't match."
           }
@@ -47,6 +47,6 @@ let tests =
 
               let msgList = [ msg1; msg2 ]
 
-              let! appendResult = Append.appendNewMessages inMemStore streamName appendVersion msgList
+              let! appendResult = AppendRaw.appendNewMessages inMemStore streamName appendVersion msgList
               Expect.equal appendResult.CurrentVersion 1 "Error: message version doesn't match."
           } ]
diff --git a/tests/ReadTests.fs b/tests/ReadTests.fs
