refactor StreamDetails type and fix functions accordingly

Author: Jamil Maqdis Anton

src/Append.fs

@@ -15,7 +15,7 @@ and Id =
     | Auto
 
 module append =
-    let appendNewMessage: IStreamStore -> AppendStreamDetails -> MessageDetails -> Async<AppendResult> =
+    let appendNewMessage: IStreamStore -> StreamDetails -> MessageDetails -> Async<AppendResult> =
         fun store streamDetails messageDetails ->
             let toId: Id -> System.Guid =
                 function
@@ -28,16 +28,9 @@ module append =
                     | "" -> NewStreamMessage(toId msg.id, msg.type_, msg.jsonData)
                     | metadata -> NewStreamMessage(toId msg.id, msg.type_, msg.jsonData, metadata)
 
-            let toVersion: Version -> int =
-                function
-                | Version.Any -> ExpectedVersion.Any
-                | Version.EmptyStream -> ExpectedVersion.EmptyStream
-                | Version.NoStream -> ExpectedVersion.NoStream
-                | Version.SpecificVersion version -> version
-
-            let append: IStreamStore -> AppendStreamDetails -> MessageDetails -> Async<AppendResult> =
-                fun store stream msg ->
-                    store.AppendToStream(stream.streamName, toVersion stream.version, createMessage msg)
+            let append: IStreamStore -> StreamDetails -> MessageDetails -> Async<AppendResult> =
+                fun store streamDetails messageDetails ->
+                    store.AppendToStream(streamDetails.streamName, Helpers.toVersion streamDetails.version, createMessage messageDetails)
                     |> Async.AwaitTask
 
             append store streamDetails messageDetails

src/Read.fs

@@ -10,26 +10,28 @@ type ReadingDirection =
     | Backward
 
 module Read =
-    let readFromStreamAsync: IStreamStore -> ReadingDirection -> ReadStreamDetails -> int -> Async<ReadStreamPage> =
+    let readFromStreamAsync: IStreamStore -> ReadingDirection -> StreamDetails -> int -> Async<ReadStreamPage> =
         fun store readingDirection streamDetails msgCount ->
             match readingDirection with
-            | Forward -> store.ReadStreamForwards(streamDetails.streamName, streamDetails.startPosition, msgCount)
-            | Backward -> store.ReadStreamBackwards(streamDetails.streamName, streamDetails.startPosition, msgCount)
+            | Forward ->
+                store.ReadStreamForwards(streamDetails.streamName, Helpers.toVersion streamDetails.version, msgCount)
+            | Backward ->
+                store.ReadStreamBackwards(streamDetails.streamName, Helpers.toVersion streamDetails.version, msgCount)
             |> Async.AwaitTask
 
-    let readFromStreamAsync': IStreamStore -> ReadingDirection -> ReadStreamDetails -> int -> CancellationToken -> Async<ReadStreamPage> =
+    let readFromStreamAsync': IStreamStore -> ReadingDirection -> StreamDetails -> int -> CancellationToken -> Async<ReadStreamPage> =
         fun store readingDirection streamDetails msgCount cancellationToken ->
             match readingDirection with
             | Forward ->
                 store.ReadStreamForwards
-                    (streamDetails.streamName, streamDetails.startPosition, msgCount, cancellationToken)
+                    (streamDetails.streamName, Helpers.toVersion streamDetails.version, msgCount, cancellationToken)
             | Backward ->
                 store.ReadStreamBackwards
-                    (streamDetails.streamName, streamDetails.startPosition, msgCount, cancellationToken)
+                    (streamDetails.streamName, Helpers.toVersion streamDetails.version, msgCount, cancellationToken)
             |> Async.AwaitTask
 
 module ReadExtras =
-    let readStreamMessages: IStreamStore -> ReadingDirection -> ReadStreamDetails -> int -> AsyncResult<List<StreamMessage>, string> =
+    let readStreamMessages: IStreamStore -> ReadingDirection -> StreamDetails -> int -> AsyncResult<List<StreamMessage>, string> =
         fun store readingDirection streamDetails msgCount ->
             Read.readFromStreamAsync store readingDirection streamDetails msgCount
             |> Async.bind (fun readStreamPage ->

src/Types.fs

@@ -1,16 +1,26 @@
 namespace SqlStreamStore.FSharp
 
+open SqlStreamStore.Streams
+
 [<RequireQualifiedAccessAttribute>]
 type Version =
     | Any
     | EmptyStream
     | NoStream
     | SpecificVersion of int
 
-type AppendStreamDetails =
+type StreamDetails =
     { streamName: string
       version: Version }
 
-type ReadStreamDetails =
+type AllStreamDetails =
     { streamName: string
       startPosition: int }
+
+module Helpers =
+    let toVersion: Version -> int =
+        function
+        | Version.Any -> ExpectedVersion.Any
+        | Version.EmptyStream -> ExpectedVersion.EmptyStream
+        | Version.NoStream -> ExpectedVersion.NoStream
+        | Version.SpecificVersion version -> version