[haskell] Refactored everything with a ReaderT pattern

1 files changed, 13 insertions, 9 deletions

diff --git a/haskell/src/SpaceTraders/Database/Systems.hs b/haskell/src/SpaceTraders/Database/Systems.hs
index 5312fd0..f71508e 100644
--- a/haskell/src/SpaceTraders/Database/Systems.hs
+++ b/haskell/src/SpaceTraders/Database/Systems.hs
@@ -5,19 +5,23 @@ module SpaceTraders.Database.Systems
   , getSystems
   ) where
 
+import Control.Monad.Reader
 import Data.Aeson
 import Data.Maybe
 import qualified Database.SQLite.Simple as S
 
-import Data.Text.Encoding (encodeUtf8Builder)
-import Data.ByteString.Builder(toLazyByteString)
-
+import SpaceTraders
+import SpaceTraders.Database.Utils
 import SpaceTraders.Model.System
 
-addSystems :: S.Connection -> [System] -> IO ()
-addSystems conn systems = S.withTransaction conn $ S.executeMany conn "INSERT INTO systems(data) VALUES (json(?));" $ S.Only <$> map encode systems
+addSystems :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => [System] -> m ()
+addSystems systems = do
+  env <- ask
+  let conn = getConn env
+  liftIO $ S.withTransaction conn $ S.executeMany conn "INSERT INTO systems(data) VALUES (json(?));" $ S.Only <$> map encode systems
 
-getSystems :: S.Connection -> IO [System]
-getSystems conn = do
-  ret <- S.query_ conn "SELECT data from systems;"
-  return . catMaybes $ map (decode . toLazyByteString . encodeUtf8Builder . head) ret
+getSystems :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => m [System]
+getSystems = do
+  env <- ask
+  ret <- liftIO $ S.query_ (getConn env) "SELECT data from systems;"
+  return . catMaybes $ map (decodeText . head) ret