From 898e7ed11ab0958fcdaf65b99b33f7b04787630a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Sep 2017 22:14:48 +0200
Subject: Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.
---
 src/server/Controller/Income.hs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

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

diff --git a/src/server/Controller/Income.hs b/src/server/Controller/Income.hs
index 18394d0..148b713 100644
--- a/src/server/Controller/Income.hs
+++ b/src/server/Controller/Income.hs
@@ -11,26 +11,25 @@ import Network.HTTP.Types.Status (ok200, badRequest400)
 import qualified Data.Text.Lazy as TL
 import Web.Scotty
 
+import qualified Common.Message as Message
+import qualified Common.Message.Key as Key
+import Common.Model (CreateIncome(..), EditIncome(..), IncomeId, User(..))
+
 import Json (jsonId)
-import Model.Income (IncomeId)
 import qualified Model.Income as Income
-import qualified Model.Json.CreateIncome as Json
-import qualified Model.Json.EditIncome as Json
-import qualified Model.Message.Key as Key
 import qualified Model.Query as Query
-import qualified Model.User as User
 import qualified Secure
 
-create :: Json.CreateIncome -> ActionM ()
-create (Json.CreateIncome date amount) =
+create :: CreateIncome -> ActionM ()
+create (CreateIncome date amount) =
   Secure.loggedAction (\user ->
-    (liftIO . Query.run $ Income.create (User.id user) date amount) >>= jsonId
+    (liftIO . Query.run $ Income.create (_user_id user) date amount) >>= jsonId
   )
 
-editOwn :: Json.EditIncome -> ActionM ()
-editOwn (Json.EditIncome incomeId date amount) =
+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 $ Income.editOwn (_user_id user) incomeId date amount
     if updated
       then status ok200
       else status badRequest400
@@ -45,5 +44,5 @@ deleteOwn incomeId =
         status ok200
       else do
         status badRequest400
-        text . TL.pack . show $ Key.IncomeNotDeleted
+        text . TL.fromStrict $ Message.get Key.Income_NotDeleted
   )
-- 
cgit v1.2.3


From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 src/server/Controller/Income.hs | 48 -----------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 src/server/Controller/Income.hs

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

diff --git a/src/server/Controller/Income.hs b/src/server/Controller/Income.hs
deleted file mode 100644
index 148b713..0000000
--- a/src/server/Controller/Income.hs
+++ /dev/null
@@ -1,48 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Controller.Income
-  ( create
-  , editOwn
-  , deleteOwn
-  ) where
-
-import Control.Monad.IO.Class (liftIO)
-import Network.HTTP.Types.Status (ok200, badRequest400)
-import qualified Data.Text.Lazy as TL
-import Web.Scotty
-
-import qualified Common.Message as Message
-import qualified Common.Message.Key as Key
-import Common.Model (CreateIncome(..), EditIncome(..), IncomeId, User(..))
-
-import Json (jsonId)
-import qualified Model.Income as Income
-import qualified Model.Query as Query
-import qualified Secure
-
-create :: CreateIncome -> ActionM ()
-create (CreateIncome date amount) =
-  Secure.loggedAction (\user ->
-    (liftIO . Query.run $ Income.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
-    if updated
-      then status ok200
-      else status badRequest400
-  )
-
-deleteOwn :: IncomeId -> ActionM ()
-deleteOwn incomeId =
-  Secure.loggedAction (\user -> do
-    deleted <- liftIO . Query.run $ Income.deleteOwn user incomeId
-    if deleted
-      then
-        status ok200
-      else do
-        status badRequest400
-        text . TL.fromStrict $ Message.get Key.Income_NotDeleted
-  )
-- 
cgit v1.2.3