Breakdown AppendStream, ReadStream record types to respective variables. Refactored accordingly

Author: Jamil Maqdis Anton

src/Append.fs

@@ -1,5 +1,6 @@
 namespace SqlStreamStore.FSharp
 
+open SqlStreamStore.FSharp
 open SqlStreamStore.Streams
 
 module Append =
@@ -21,19 +22,19 @@ module Append =
         | AppendVersion.NoStream -> ExpectedVersion.NoStream
         | AppendVersion.SpecificVersion version -> version
 
-    let appendNewMessage: SqlStreamStore.IStreamStore -> AppendStreamDetails -> MessageDetails -> Async<AppendResult> =
-        fun store streamDetails messageDetails ->
+    let appendNewMessage: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> MessageDetails -> Async<AppendResult> =
+        fun store streamName appendVersion messageDetails ->
             store.AppendToStream
-                (StreamId(streamDetails.streamName),
-                 fromAppendVersion streamDetails.version,
+                (StreamId(streamName),
+                 fromAppendVersion appendVersion,
                  [| newStreamMessageFromMessageDetails messageDetails |])
             |> Async.AwaitTask
 
-    let appendNewMessages: SqlStreamStore.IStreamStore -> AppendStreamDetails -> List<MessageDetails> -> Async<AppendResult> =
-        fun store streamDetails messages ->
+    let appendNewMessages: SqlStreamStore.IStreamStore -> StreamName -> AppendVersion -> List<MessageDetails> -> Async<AppendResult> =
+        fun store streamName appendVersion messages ->
             store.AppendToStream
-                (StreamId(streamDetails.streamName),
-                 fromAppendVersion streamDetails.version,
+                (StreamId(streamName),
+                 fromAppendVersion appendVersion,
                  messages
                  |> List.map newStreamMessageFromMessageDetails
                  |> List.toArray)

src/Read.fs

@@ -22,31 +22,31 @@ module Read =
                 store.ReadAllBackwards(startPositionInclusive, msgCount, prefetchJson, cancellationToken)
             |> Async.AwaitTask
 
-    let readFromStreamAsync: SqlStreamStore.IStreamStore -> ReadingDirection -> ReadStreamDetails -> MessageCount -> Async<ReadStreamPage> =
-        fun store readingDirection readStreamDetails msgCount ->
+    let readFromStreamAsync: SqlStreamStore.IStreamStore -> ReadingDirection -> StreamName -> ReadVersion -> MessageCount -> Async<ReadStreamPage> =
+        fun store readingDirection streamName readVersion msgCount ->
             match readingDirection with
             | ReadingDirection.Forward ->
                 store.ReadStreamForwards
-                    (StreamId(readStreamDetails.streamName), fromReadVersion readStreamDetails.version, msgCount)
+                    (StreamId(streamName), fromReadVersion readVersion, msgCount)
             | ReadingDirection.Backward ->
                 store.ReadStreamBackwards
-                    (StreamId(readStreamDetails.streamName), fromReadVersion readStreamDetails.version, msgCount)
+                    (StreamId(streamName), fromReadVersion readVersion, msgCount)
             |> Async.AwaitTask
 
-    let readFromStreamAsync': SqlStreamStore.IStreamStore -> ReadingDirection -> ReadStreamDetails -> MessageCount -> bool -> CancellationToken -> Async<ReadStreamPage> =
-        fun store readingDirection readStreamDetails msgCount prefetchJson cancellationToken ->
+    let readFromStreamAsync': 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(readStreamDetails.streamName),
-                     fromReadVersion readStreamDetails.version,
+                    (StreamId(streamName),
+                     fromReadVersion readVersion,
                      msgCount,
                      prefetchJson,
                      cancellationToken)
             | ReadingDirection.Backward ->
                 store.ReadStreamBackwards
-                    (StreamId(readStreamDetails.streamName),
-                     fromReadVersion readStreamDetails.version,
+                    (StreamId(streamName),
+                     fromReadVersion readVersion,
                      msgCount,
                      prefetchJson,
                      cancellationToken)

src/Types.fs

@@ -11,6 +11,7 @@ type MessageDetails =
       jsonData: string
       jsonMetadata: string }
 
+type StreamName = string
 
 [<RequireQualifiedAccessAttribute>]
 type AppendVersion =
@@ -19,14 +20,6 @@ type AppendVersion =
     | NoStream
     | SpecificVersion of int
 
-type AppendStreamDetails =
-    { streamName: string
-      version: AppendVersion }
-
-type ReadStreamDetails =
-    { streamName: string
-      version: ReadVersion }
-
 and ReadVersion = uint
 
 type StartPositionInclusive = int64