From 33b85b7f12798f5762d940ed5c30f775cdd7b751 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 28 Jan 2018 12:13:09 +0100
Subject: WIP

---
 server/src/Controller/Payment.hs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'server/src/Controller/Payment.hs')

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
   )
-- 
cgit v1.2.3