WIP

4 files changed, 48 insertions, 48 deletions

diff --git a/server/src/Controller/Category.hs b/server/src/Controller/Category.hs
index 5565b43..37b8357 100644
--- a/server/src/Controller/Category.hs
+++ b/server/src/Controller/Category.hs
@@ -4,31 +4,31 @@ module Controller.Category
   , delete
   ) where
 
-import           Control.Monad.IO.Class    (liftIO)
-import qualified Data.Text.Lazy            as TL
-import           Network.HTTP.Types.Status (badRequest400, ok200)
-import           Web.Scotty                hiding (delete)
+import           Control.Monad.IO.Class      (liftIO)
+import qualified Data.Text.Lazy              as TL
+import           Network.HTTP.Types.Status   (badRequest400, ok200)
+import           Web.Scotty                  hiding (delete)
 
-import           Common.Model              (CategoryId, CreateCategory (..),
-                                            EditCategory (..))
-import qualified Common.Msg                as Msg
+import           Common.Model                (CategoryId, CreateCategory (..),
+                                              EditCategory (..))
+import qualified Common.Msg                  as Msg
 
-import           Json                      (jsonId)
-import qualified Model.Category            as Category
-import qualified Model.PaymentCategory     as PaymentCategory
-import qualified Model.Query               as Query
+import           Json                        (jsonId)
+import qualified Model.Query                 as Query
+import qualified Persistence.Category        as CategoryPersistence
+import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
 
 create :: CreateCategory -> ActionM ()
 create (CreateCategory name color) =
   Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ Category.create name color) >>= jsonId
+    (liftIO . Query.run $ CategoryPersistence.create name color) >>= jsonId
   )
 
 edit :: EditCategory -> ActionM ()
 edit (EditCategory categoryId name color) =
   Secure.loggedAction (\_ -> do
-    updated <- liftIO . Query.run $ Category.edit categoryId name color
+    updated <- liftIO . Query.run $ CategoryPersistence.edit categoryId name color
     if updated
       then status ok200
       else status badRequest400
@@ -38,9 +38,9 @@ delete :: CategoryId -> ActionM ()
 delete categoryId =
   Secure.loggedAction (\_ -> do
     deleted <- liftIO . Query.run $ do
-      paymentCategories <- PaymentCategory.listByCategory categoryId
+      paymentCategories <- PaymentCategoryPersistence.listByCategory categoryId
       if null paymentCategories
-        then Category.delete categoryId
+        then CategoryPersistence.delete categoryId
         else return False
     if deleted
       then
diff --git a/server/src/Controller/Income.hs b/server/src/Controller/Income.hs
index 19f0cfc..3f623e5 100644
--- a/server/src/Controller/Income.hs
+++ b/server/src/Controller/Income.hs
@@ -14,20 +14,20 @@ import           Common.Model              (CreateIncome (..), EditIncome (..),
 import qualified Common.Msg                as Msg
 
 import           Json                      (jsonId)
-import qualified Model.Income              as Income
 import qualified Model.Query               as Query
+import qualified Persistence.Income        as IncomePersistence
 import qualified Secure
 
 create :: CreateIncome -> ActionM ()
 create (CreateIncome date amount) =
   Secure.loggedAction (\user ->
-    (liftIO . Query.run $ Income.create (_user_id user) date amount) >>= jsonId
+    (liftIO . Query.run $ IncomePersistence.create (_user_id user) date amount) >>= jsonId
   )
 
 editOwn :: EditIncome -> ActionM ()
 editOwn (EditIncome incomeId date amount) =
   Secure.loggedAction (\user -> do
-    updated <- liftIO . Query.run $ Income.editOwn (_user_id user) incomeId date amount
+    updated <- liftIO . Query.run $ IncomePersistence.editOwn (_user_id user) incomeId date amount
     if updated
       then status ok200
       else status badRequest400
@@ -36,7 +36,7 @@ editOwn (EditIncome incomeId date amount) =
 deleteOwn :: IncomeId -> ActionM ()
 deleteOwn incomeId =
   Secure.loggedAction (\user -> do
-    deleted <- liftIO . Query.run $ Income.deleteOwn user incomeId
+    deleted <- liftIO . Query.run $ IncomePersistence.deleteOwn user incomeId
     if deleted
       then
         status ok200
diff --git a/server/src/Controller/Index.hs b/server/src/Controller/Index.hs
index 9a3e2b7..f942540 100644
--- a/server/src/Controller/Index.hs
+++ b/server/src/Controller/Index.hs
@@ -23,11 +23,11 @@ import qualified Common.Msg                as Msg
 
 import           Conf                      (Conf (..))
 import qualified LoginSession
-import           Model.Init                (getInit)
 import qualified Model.Query               as Query
 import qualified Model.SignIn              as SignIn
-import qualified Model.User                as User
-import           Secure                    (getUserFromToken)
+import qualified Persistence.Init          as InitPersistence
+import qualified Persistence.User          as UserPersistence
+import qualified Secure
 import qualified SendMail
 import qualified Text.Email.Validate       as Email
 import qualified View.Mail.SignIn          as SignIn
@@ -39,16 +39,16 @@ get conf = do
     mbLoggedUser <- getLoggedUser
     case mbLoggedUser of
       Nothing ->
-        return . InitEmpty . Right $ Nothing
+        return InitEmpty
       Just user ->
-        liftIO . Query.run . fmap InitSuccess $ getInit user conf
+        liftIO . Query.run . fmap InitSuccess $ InitPersistence.getInit user conf
   S.html $ page initResult
 
 askSignIn :: Conf -> SignIn -> ActionM ()
 askSignIn conf (SignIn email) =
   if Email.isValid (TE.encodeUtf8 email)
     then do
-      maybeUser <- liftIO . Query.run $ User.get email
+      maybeUser <- liftIO . Query.run $ UserPersistence.get email
       case maybeUser of
         Just user -> do
           token <- liftIO . Query.run $ SignIn.createSignInToken email
@@ -71,7 +71,7 @@ trySignIn conf token = do
   userOrError <- validateSignIn conf token
   case userOrError of
     Left errorKey ->
-      S.html $ page (InitEmpty . Left . Msg.get $ errorKey)
+      S.html $ page (InitError $ Msg.get errorKey)
     Right _ ->
       S.redirect "/"
 
@@ -100,7 +100,7 @@ validateSignIn conf textToken = do
                       LoginSession.put conf (SignIn.token signIn)
                       mbUser <- liftIO . Query.run $ do
                         SignIn.signInTokenToUsed . SignIn.id $ signIn
-                        User.get . SignIn.email $ signIn
+                        UserPersistence.get . SignIn.email $ signIn
                       return $ case mbUser of
                         Nothing   -> Left Msg.Secure_Unauthorized
                         Just user -> Right user
@@ -112,7 +112,7 @@ getLoggedUser = do
     Nothing ->
       return Nothing
     Just token -> do
-      liftIO . Query.run . getUserFromToken $ token
+      liftIO . Query.run . Secure.getUserFromToken $ token
 
 signOut :: Conf -> ActionM ()
 signOut conf = LoginSession.delete conf >> S.status ok200
diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index f2af6c9..e1936f0 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -5,54 +5,54 @@ module Controller.Payment
   , deleteOwn
   ) where
 
-import           Control.Monad.IO.Class    (liftIO)
-import           Network.HTTP.Types.Status (badRequest400, ok200)
+import           Control.Monad.IO.Class      (liftIO)
+import qualified Network.HTTP.Types.Status   as Status
 import           Web.Scotty
 
-import           Common.Model              (CreatePayment (..),
-                                            EditPayment (..), PaymentId,
-                                            User (..))
+import           Common.Model                (CreatePayment (..),
+                                              EditPayment (..), PaymentId,
+                                              User (..))
 
-import           Json                      (jsonId)
-import qualified Model.Payment             as Payment
-import qualified Model.PaymentCategory     as PaymentCategory
-import qualified Model.Query               as Query
+import qualified Json
+import qualified Model.Query                 as Query
+import qualified Persistence.Payment         as PaymentPersistence
+import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
 
 list :: ActionM ()
 list =
   Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ Payment.listActive) >>= json
+    (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
   )
 
 create :: CreatePayment -> ActionM ()
 create (CreatePayment name cost date category frequency) =
   Secure.loggedAction (\user ->
     (liftIO . Query.run $ do
-      PaymentCategory.save name category
-      Payment.create (_user_id user) name cost date frequency
-    ) >>= jsonId
+      PaymentCategoryPersistence.save name category
+      PaymentPersistence.create (_user_id user) name cost date frequency
+    ) >>= Json.jsonId
   )
 
 editOwn :: EditPayment -> ActionM ()
 editOwn (EditPayment paymentId name cost date category frequency) =
   Secure.loggedAction (\user -> do
     updated <- liftIO . Query.run $ do
-      edited <- Payment.editOwn (_user_id user) paymentId name cost date frequency
+      edited <- PaymentPersistence.editOwn (_user_id user) paymentId name cost date frequency
       _ <- if edited
-        then PaymentCategory.save name category >> return ()
+        then PaymentCategoryPersistence.save name category >> return ()
         else return ()
       return edited
     if updated
-      then status ok200
-      else status badRequest400
+      then status Status.ok200
+      else status Status.badRequest400
   )
 
 deleteOwn :: PaymentId -> ActionM ()
 deleteOwn paymentId =
   Secure.loggedAction (\user -> do
-    deleted <- liftIO . Query.run $ Payment.deleteOwn (_user_id user) paymentId
+    deleted <- liftIO . Query.run $ PaymentPersistence.deleteOwn (_user_id user) paymentId
     if deleted
-      then status ok200
-      else status badRequest400
+      then status Status.ok200
+      else status Status.badRequest400
   )