removed autoopen for eventstore

murocast · Feb 17, 2020 · 27b7a05 · 27b7a05
1 parent 4ac87fc
commit 27b7a05
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/src/Server/EventStore.fs b/src/Server/EventStore.fs
@@ -3,7 +3,6 @@ namespace Castos
 open System
 open EventStore.ClientAPI
 
-[<AutoOpen>]
 module EventStore =
     type StreamId = StreamId of string
     type StreamVersion = StreamVersion of int

diff --git a/src/Server/FeedCompositions.fs b/src/Server/FeedCompositions.fs
@@ -45,12 +45,6 @@ module FeedCompositions =
     let private allFeedsEvents eventStore =
         allEventsFromStreamsStartsWith eventStore "feed-"
 
-    let private allFeedAddedEvents eventStore =
-        eventStore.GetEvents (StreamId("latest-feeds"))
-
-    let private allEpisodeAddedEvents eventStore =
-        eventStore.GetEvents (StreamId("latest-feeds"))
-
     let private getFeedStreamId id =
         sprintf "feed-%A" id
 

diff --git a/src/Server/Server.fs b/src/Server/Server.fs
@@ -7,7 +7,6 @@ open Microsoft.Extensions.Logging
 open Saturn
 open System.IO
 
-open Castos.EventStore
 open Castos
 open Castos.Auth
 open Castos.SmapiCompositions

diff --git a/src/Server/UserCompositions.fs b/src/Server/UserCompositions.fs
@@ -17,7 +17,7 @@ type AddUserRendition =
 
 let private streamId = sprintf "users"
 
-let private storeUsersEvent eventStore (version, event) =
+let private storeUsersEvent eventStore event =
     storeEvent eventStore (fun _ -> streamId) event
 
 let getUsersComposition eventStore =
@@ -30,12 +30,10 @@ let getUserComposition eventStore email =
     | Failure m -> fail m
 
 let addUserComposition eventStore (rendition:AddUserRendition) =
-    (StreamVersion 0, UserAdded {
-       Id = Guid.NewGuid() |> UserId
-       Email = rendition.EMail
-       Password = rendition.Password
-       //TODO: Hash and Salt
-    }) |> storeUsersEvent eventStore
+    UserAdded { Id = Guid.NewGuid() |> UserId
+                Email = rendition.EMail
+                Password = rendition.Password } //TODO: Hash and Salt
+    |> storeUsersEvent eventStore
 
     ok ("added user")