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

---
 server/src/Controller/Payment.hs | 58 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 server/src/Controller/Payment.hs

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
new file mode 100644
index 0000000..dc10311
--- /dev/null
+++ b/server/src/Controller/Payment.hs
@@ -0,0 +1,58 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Controller.Payment
+  ( list
+  , create
+  , editOwn
+  , deleteOwn
+  ) where
+
+import Control.Monad.IO.Class (liftIO)
+import Network.HTTP.Types.Status (ok200, badRequest400)
+import Web.Scotty
+
+import Common.Model (PaymentId, User(..), CreatePayment(..), EditPayment(..))
+
+import Json (jsonId)
+import qualified Model.Payment as Payment
+import qualified Model.PaymentCategory as PaymentCategory
+import qualified Model.Query as Query
+import qualified Secure
+
+list :: ActionM ()
+list =
+  Secure.loggedAction (\_ ->
+    (liftIO . Query.run $ Payment.list) >>= 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
+  )
+
+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
+      _ <- if edited
+        then PaymentCategory.save name category >> return ()
+        else return ()
+      return edited
+    if updated
+      then status ok200
+      else status badRequest400
+  )
+
+deleteOwn :: PaymentId -> ActionM ()
+deleteOwn paymentId =
+  Secure.loggedAction (\user -> do
+    deleted <- liftIO . Query.run $ Payment.deleteOwn (_user_id user) paymentId
+    if deleted
+      then status ok200
+      else status badRequest400
+  )
-- 
cgit v1.2.3


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 server/src/Controller/Payment.hs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index dc10311..e4104eb 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -7,16 +7,18 @@ module Controller.Payment
   , deleteOwn
   ) where
 
-import Control.Monad.IO.Class (liftIO)
-import Network.HTTP.Types.Status (ok200, badRequest400)
-import Web.Scotty
-
-import Common.Model (PaymentId, User(..), CreatePayment(..), EditPayment(..))
-
-import Json (jsonId)
-import qualified Model.Payment as Payment
-import qualified Model.PaymentCategory as PaymentCategory
-import qualified Model.Query as Query
+import           Control.Monad.IO.Class    (liftIO)
+import           Network.HTTP.Types.Status (badRequest400, ok200)
+import           Web.Scotty
+
+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 Secure
 
 list :: ActionM ()
-- 
cgit v1.2.3


From 7194cddb28656c721342c2ef604f9f9fb0692960 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 00:20:25 +0100
Subject: Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments
---
 server/src/Controller/Payment.hs | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index e4104eb..c6c874a 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Controller.Payment
   ( list
   , create
-- 
cgit v1.2.3


From a4acc2e84158fa822f88a1d0bdddb470708b5809 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 3 Jan 2018 17:31:20 +0100
Subject: Modify weelky report and payment search interface

- Add payment balance in weekly report
- Show a message and hide pages when the search results in no results
- Go to page 1 when the search is updated / erased
---
 server/src/Controller/Payment.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index c6c874a..f2af6c9 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -22,7 +22,7 @@ import qualified Secure
 list :: ActionM ()
 list =
   Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ Payment.list) >>= json
+    (liftIO . Query.run $ Payment.listActive) >>= json
   )
 
 create :: CreatePayment -> ActionM ()
-- 
cgit v1.2.3


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


From 40b4994797a797b1fa86cafda789a5c488730c6d Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 28 Oct 2018 17:57:58 +0100
Subject: Delete payment

---
 server/src/Controller/Payment.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index e1936f0..4edbf6a 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -18,6 +18,7 @@ import qualified Model.Query                 as Query
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
+import qualified Validation.CreatePayment    as CreatePaymentValidation
 
 list :: ActionM ()
 list =
@@ -26,12 +27,18 @@ list =
   )
 
 create :: CreatePayment -> ActionM ()
-create (CreatePayment name cost date category frequency) =
+create createPayment@(CreatePayment name cost date category frequency) =
   Secure.loggedAction (\user ->
-    (liftIO . Query.run $ do
-      PaymentCategoryPersistence.save name category
-      PaymentPersistence.create (_user_id user) name cost date frequency
-    ) >>= Json.jsonId
+    case CreatePaymentValidation.validate createPayment of
+      Nothing ->
+        (liftIO . Query.run $ do
+          PaymentCategoryPersistence.save name category
+          PaymentPersistence.create (_user_id user) name cost date frequency
+        ) >>= Json.jsonId
+      Just validationError ->
+        do
+          status Status.badRequest400
+          json validationError
   )
 
 editOwn :: EditPayment -> ActionM ()
-- 
cgit v1.2.3


From 50fb8fa48d1c4881da20b4ecf6d68a772301e713 Mon Sep 17 00:00:00 2001
From: Joris
Date: Tue, 30 Oct 2018 18:04:58 +0100
Subject: Update table when adding or removing a payment

---
 server/src/Controller/Payment.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 4edbf6a..fb7fcb2 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -12,8 +12,6 @@ import           Web.Scotty
 import           Common.Model                (CreatePayment (..),
                                               EditPayment (..), PaymentId,
                                               User (..))
-
-import qualified Json
 import qualified Model.Query                 as Query
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
@@ -34,7 +32,7 @@ create createPayment@(CreatePayment name cost date category frequency) =
         (liftIO . Query.run $ do
           PaymentCategoryPersistence.save name category
           PaymentPersistence.create (_user_id user) name cost date frequency
-        ) >>= Json.jsonId
+        ) >>= json
       Just validationError ->
         do
           status Status.badRequest400
-- 
cgit v1.2.3


From bc81084933f8ec1bfe6c2834defd12243117fdd9 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 5 Aug 2019 21:53:30 +0200
Subject: Use updated payment categories from payment add in payment’s table

---
 server/src/Controller/Payment.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index fb7fcb2..e82fd49 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -10,6 +10,7 @@ import qualified Network.HTTP.Types.Status   as Status
 import           Web.Scotty
 
 import           Common.Model                (CreatePayment (..),
+                                              CreatedPayment (..),
                                               EditPayment (..), PaymentId,
                                               User (..))
 import qualified Model.Query                 as Query
@@ -30,8 +31,9 @@ create createPayment@(CreatePayment name cost date category frequency) =
     case CreatePaymentValidation.validate createPayment of
       Nothing ->
         (liftIO . Query.run $ do
-          PaymentCategoryPersistence.save name category
-          PaymentPersistence.create (_user_id user) name cost date frequency
+          pc <- PaymentCategoryPersistence.save name category
+          p <- PaymentPersistence.create (_user_id user) name cost date frequency
+          return $ CreatedPayment p pc
         ) >>= json
       Just validationError ->
         do
-- 
cgit v1.2.3


From fb8f0fe577e28dae69903413b761da50586e0099 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 10 Aug 2019 14:53:41 +0200
Subject: Remove payment category if unused after a payment is deleted

---
 server/src/Controller/Payment.hs | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index e82fd49..3d857be 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,18 +1,18 @@
 module Controller.Payment
   ( list
   , create
-  , editOwn
-  , deleteOwn
+  , edit
+  , delete
   ) where
 
 import           Control.Monad.IO.Class      (liftIO)
 import qualified Network.HTTP.Types.Status   as Status
-import           Web.Scotty
+import           Web.Scotty                  hiding (delete)
 
 import           Common.Model                (CreatePayment (..),
                                               CreatedPayment (..),
-                                              EditPayment (..), PaymentId,
-                                              User (..))
+                                              EditPayment (..), Payment (..),
+                                              PaymentId, User (..))
 import qualified Model.Query                 as Query
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
@@ -41,11 +41,11 @@ create createPayment@(CreatePayment name cost date category frequency) =
           json validationError
   )
 
-editOwn :: EditPayment -> ActionM ()
-editOwn (EditPayment paymentId name cost date category frequency) =
+edit :: EditPayment -> ActionM ()
+edit (EditPayment paymentId name cost date category frequency) =
   Secure.loggedAction (\user -> do
     updated <- liftIO . Query.run $ do
-      edited <- PaymentPersistence.editOwn (_user_id user) paymentId name cost date frequency
+      edited <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
       _ <- if edited
         then PaymentCategoryPersistence.save name category >> return ()
         else return ()
@@ -55,11 +55,20 @@ editOwn (EditPayment paymentId name cost date category frequency) =
       else status Status.badRequest400
   )
 
-deleteOwn :: PaymentId -> ActionM ()
-deleteOwn paymentId =
+delete :: PaymentId -> ActionM ()
+delete paymentId =
   Secure.loggedAction (\user -> do
-    deleted <- liftIO . Query.run $ PaymentPersistence.deleteOwn (_user_id user) paymentId
-    if deleted
-      then status Status.ok200
-      else status Status.badRequest400
+    deleted <- liftIO . Query.run $ do
+      payment <- PaymentPersistence.find paymentId
+      case payment of
+        Just p | _payment_user p == _user_id user -> do
+          PaymentPersistence.delete (_user_id user) paymentId
+          PaymentCategoryPersistence.deleteIfUnused (_payment_name p)
+          return True
+        _ ->
+          return False
+    if deleted then
+      status Status.ok200
+    else
+      status Status.badRequest400
   )
-- 
cgit v1.2.3


From 2d79ab0e0a11f55255fc21a5dfab1598d3beeba3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 11 Aug 2019 22:40:09 +0200
Subject: Add payment clone

---
 server/src/Controller/Payment.hs | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 3d857be..c700240 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -10,9 +10,9 @@ import qualified Network.HTTP.Types.Status   as Status
 import           Web.Scotty                  hiding (delete)
 
 import           Common.Model                (CreatePayment (..),
-                                              CreatedPayment (..),
                                               EditPayment (..), Payment (..),
-                                              PaymentId, User (..))
+                                              PaymentId, SavedPayment (..),
+                                              User (..))
 import qualified Model.Query                 as Query
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
@@ -33,7 +33,7 @@ create createPayment@(CreatePayment name cost date category frequency) =
         (liftIO . Query.run $ do
           pc <- PaymentCategoryPersistence.save name category
           p <- PaymentPersistence.create (_user_id user) name cost date frequency
-          return $ CreatedPayment p pc
+          return $ SavedPayment p pc
         ) >>= json
       Just validationError ->
         do
@@ -44,15 +44,20 @@ create createPayment@(CreatePayment name cost date category frequency) =
 edit :: EditPayment -> ActionM ()
 edit (EditPayment paymentId name cost date category frequency) =
   Secure.loggedAction (\user -> do
-    updated <- liftIO . Query.run $ do
-      edited <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
-      _ <- if edited
-        then PaymentCategoryPersistence.save name category >> return ()
-        else return ()
-      return edited
-    if updated
-      then status Status.ok200
-      else status Status.badRequest400
+    result <- liftIO . Query.run $ do
+      editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
+      case editedPayment of
+        Just p -> do
+          pc <- PaymentCategoryPersistence.save name category
+          PaymentCategoryPersistence.deleteIfUnused name
+          return $ Just (p, pc)
+        Nothing ->
+          return Nothing
+    case result of
+      Just (p, pc) ->
+        json $ SavedPayment p pc
+      Nothing ->
+        status Status.badRequest400
   )
 
 delete :: PaymentId -> ActionM ()
-- 
cgit v1.2.3


From f4c5df9e1b1afddeb5a482d4fbe654d0b321159c Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 6 Oct 2019 19:28:54 +0200
Subject: Make payment edition to work on the frontend

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

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index c700240..38c1c19 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -47,10 +47,10 @@ edit (EditPayment paymentId name cost date category frequency) =
     result <- liftIO . Query.run $ do
       editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
       case editedPayment of
-        Just p -> do
+        Just (old, new) -> do
           pc <- PaymentCategoryPersistence.save name category
-          PaymentCategoryPersistence.deleteIfUnused name
-          return $ Just (p, pc)
+          PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
+          return $ Just (new, pc)
         Nothing ->
           return Nothing
     case result of
-- 
cgit v1.2.3


From 7529a18ff0ac443e7f9764b5e2d0f57a5d3a850b Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 9 Oct 2019 23:16:00 +0200
Subject: Use common payment validation in the backend

Remove deprecated backend validation
---
 server/src/Controller/Payment.hs | 73 ++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 38c1c19..ba9d1ba 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -6,18 +6,25 @@ module Controller.Payment
   ) where
 
 import           Control.Monad.IO.Class      (liftIO)
+import           Data.Validation             (Validation (Failure, Success))
 import qualified Network.HTTP.Types.Status   as Status
 import           Web.Scotty                  hiding (delete)
 
-import           Common.Model                (CreatePayment (..),
-                                              EditPayment (..), Payment (..),
-                                              PaymentId, SavedPayment (..),
-                                              User (..))
+import           Common.Model                (Category (..),
+                                              CreatePaymentForm (..),
+                                              EditPaymentForm (..),
+                                              Payment (..), PaymentId,
+                                              SavedPayment (..), User (..))
+import qualified Common.Msg                  as Msg
+import qualified Controller.Helper           as ControllerHelper
+import           Model.CreatePayment         (CreatePayment (..))
+import           Model.EditPayment           (EditPayment (..))
 import qualified Model.Query                 as Query
+import qualified Persistence.Category        as CategoryPersistence
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
-import qualified Validation.CreatePayment    as CreatePaymentValidation
+import qualified Validation.Payment          as PaymentValidation
 
 list :: ActionM ()
 list =
@@ -25,39 +32,39 @@ list =
     (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
   )
 
-create :: CreatePayment -> ActionM ()
-create createPayment@(CreatePayment name cost date category frequency) =
+create :: CreatePaymentForm -> ActionM ()
+create form =
   Secure.loggedAction (\user ->
-    case CreatePaymentValidation.validate createPayment of
-      Nothing ->
-        (liftIO . Query.run $ do
+    (liftIO . Query.run $ do
+      cs <- map _category_id <$> CategoryPersistence.list
+      case PaymentValidation.createPayment cs form of
+        Success (CreatePayment name cost date category frequency) -> do
           pc <- PaymentCategoryPersistence.save name category
           p <- PaymentPersistence.create (_user_id user) name cost date frequency
-          return $ SavedPayment p pc
-        ) >>= json
-      Just validationError ->
-        do
-          status Status.badRequest400
-          json validationError
+          return . Right $ SavedPayment p pc
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
-edit :: EditPayment -> ActionM ()
-edit (EditPayment paymentId name cost date category frequency) =
-  Secure.loggedAction (\user -> do
-    result <- liftIO . Query.run $ do
-      editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
-      case editedPayment of
-        Just (old, new) -> do
-          pc <- PaymentCategoryPersistence.save name category
-          PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
-          return $ Just (new, pc)
-        Nothing ->
-          return Nothing
-    case result of
-      Just (p, pc) ->
-        json $ SavedPayment p pc
-      Nothing ->
-        status Status.badRequest400
+edit :: EditPaymentForm -> ActionM ()
+edit form =
+  Secure.loggedAction (\user ->
+    (liftIO . Query.run $ do
+      cs <- map _category_id <$> CategoryPersistence.list
+      case PaymentValidation.editPayment cs form of
+        Success (EditPayment paymentId name cost date category frequency) -> do
+          editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
+          case editedPayment of
+            Just (old, new) -> do
+              pc <- PaymentCategoryPersistence.save name category
+              PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
+              return . Right $ SavedPayment new pc
+            Nothing ->
+              return . Left $ Msg.get Msg.Error_PaymentEdit
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
 delete :: PaymentId -> ActionM ()
-- 
cgit v1.2.3


From 602c52acfcfa494b07fec05c20b317b60ea8a6f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Oct 2019 21:31:57 +0200
Subject: Load init data per page with AJAX

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

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index ba9d1ba..30b63ff 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,5 +1,6 @@
 module Controller.Payment
   ( list
+  , listPaymentCategories
   , create
   , edit
   , delete
@@ -32,6 +33,12 @@ list =
     (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
   )
 
+listPaymentCategories :: ActionM ()
+listPaymentCategories =
+  Secure.loggedAction (\_ ->
+    (liftIO . Query.run $ PaymentCategoryPersistence.list) >>= json
+  )
+
 create :: CreatePaymentForm -> ActionM ()
 create form =
   Secure.loggedAction (\user ->
-- 
cgit v1.2.3


From f4f24158a46d8c0975f1b8813bbdbbeebad8c108 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 6 Nov 2019 19:44:15 +0100
Subject: Show the payment table with server side paging

---
 server/src/Controller/Payment.hs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 30b63ff..01702cb 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,5 +1,6 @@
 module Controller.Payment
-  ( list
+  ( deprecatedList
+  , list
   , listPaymentCategories
   , create
   , edit
@@ -15,6 +16,7 @@ import           Common.Model                (Category (..),
                                               CreatePaymentForm (..),
                                               EditPaymentForm (..),
                                               Payment (..), PaymentId,
+                                              PaymentPage (..),
                                               SavedPayment (..), User (..))
 import qualified Common.Msg                  as Msg
 import qualified Controller.Helper           as ControllerHelper
@@ -27,12 +29,23 @@ import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
 import qualified Validation.Payment          as PaymentValidation
 
-list :: ActionM ()
-list =
+deprecatedList :: ActionM ()
+deprecatedList =
   Secure.loggedAction (\_ ->
     (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
   )
 
+list :: Int -> Int -> ActionM ()
+list page perPage =
+  Secure.loggedAction (\_ ->
+    (liftIO . Query.run $ do
+      count <- PaymentPersistence.count
+      payments <- PaymentPersistence.listActivePage page perPage
+      paymentCategories <- PaymentCategoryPersistence.list
+      return $ PaymentPage payments paymentCategories count
+    ) >>= json
+  )
+
 listPaymentCategories :: ActionM ()
 listPaymentCategories =
   Secure.loggedAction (\_ ->
-- 
cgit v1.2.3


From 4dc84dbda7ba3ea60d13e6f81eeec556974b7c72 Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 7 Nov 2019 07:59:41 +0100
Subject: Show payment header infos

---
 server/src/Controller/Payment.hs | 54 +++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 17 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 01702cb..f685f2e 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,6 +1,5 @@
 module Controller.Payment
-  ( deprecatedList
-  , list
+  ( list
   , listPaymentCategories
   , create
   , edit
@@ -8,48 +7,69 @@ module Controller.Payment
   ) where
 
 import           Control.Monad.IO.Class      (liftIO)
+import qualified Data.Map                    as M
+import qualified Data.Time.Clock             as Clock
 import           Data.Validation             (Validation (Failure, Success))
 import qualified Network.HTTP.Types.Status   as Status
-import           Web.Scotty                  hiding (delete)
+import           Web.Scotty                  (ActionM)
+import qualified Web.Scotty                  as S
 
 import           Common.Model                (Category (..),
                                               CreatePaymentForm (..),
                                               EditPaymentForm (..),
-                                              Payment (..), PaymentId,
-                                              PaymentPage (..),
+                                              Frequency (Punctual),
+                                              Payment (..), PaymentHeader (..),
+                                              PaymentId, PaymentPage (..),
                                               SavedPayment (..), User (..))
+import qualified Common.Model                as CM
 import qualified Common.Msg                  as Msg
 import qualified Controller.Helper           as ControllerHelper
 import           Model.CreatePayment         (CreatePayment (..))
 import           Model.EditPayment           (EditPayment (..))
 import qualified Model.Query                 as Query
 import qualified Persistence.Category        as CategoryPersistence
+import qualified Persistence.Income          as IncomePersistence
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
+import qualified Persistence.User            as UserPersistence
 import qualified Secure
+import qualified Util.List                   as L
 import qualified Validation.Payment          as PaymentValidation
 
-deprecatedList :: ActionM ()
-deprecatedList =
-  Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
-  )
-
 list :: Int -> Int -> ActionM ()
 list page perPage =
-  Secure.loggedAction (\_ ->
+  Secure.loggedAction (\_ -> do
+    currentTime <- liftIO Clock.getCurrentTime
     (liftIO . Query.run $ do
       count <- PaymentPersistence.count
       payments <- PaymentPersistence.listActivePage page perPage
       paymentCategories <- PaymentCategoryPersistence.list
-      return $ PaymentPage payments paymentCategories count
-    ) >>= json
+
+      users <- UserPersistence.list
+      incomes <- IncomePersistence.listAll
+      allPayments <- PaymentPersistence.listActive Punctual
+
+      let exceedingPayers = CM.getExceedingPayers currentTime users incomes allPayments
+
+          repartition =
+            M.fromList
+              . map (\(u, xs) -> (u, sum . map snd $ xs))
+              . L.groupBy fst
+              . map (\p -> (_payment_user p, _payment_cost p))
+              $ allPayments
+
+          header = PaymentHeader
+            { _paymentHeader_exceedingPayers = exceedingPayers
+            , _paymentHeader_repartition     = repartition
+            }
+
+      return $ PaymentPage header payments paymentCategories count) >>= S.json
   )
 
 listPaymentCategories :: ActionM ()
 listPaymentCategories =
   Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ PaymentCategoryPersistence.list) >>= json
+    (liftIO . Query.run $ PaymentCategoryPersistence.list) >>= S.json
   )
 
 create :: CreatePaymentForm -> ActionM ()
@@ -100,7 +120,7 @@ delete paymentId =
         _ ->
           return False
     if deleted then
-      status Status.ok200
+      S.status Status.ok200
     else
-      status Status.badRequest400
+      S.status Status.badRequest400
   )
-- 
cgit v1.2.3


From c0ea63f8c1a8c7123b78798cec99726b113fb1f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 18:08:28 +0100
Subject: Optimize and refactor payments

---
 server/src/Controller/Payment.hs | 137 +++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 76 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index f685f2e..d4d086e 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -1,75 +1,70 @@
 module Controller.Payment
   ( list
-  , listPaymentCategories
   , create
   , edit
   , delete
+  , searchCategory
   ) where
 
-import           Control.Monad.IO.Class      (liftIO)
-import qualified Data.Map                    as M
-import qualified Data.Time.Clock             as Clock
-import           Data.Validation             (Validation (Failure, Success))
-import qualified Network.HTTP.Types.Status   as Status
-import           Web.Scotty                  (ActionM)
-import qualified Web.Scotty                  as S
+import           Control.Monad.IO.Class (liftIO)
+import qualified Data.Map               as M
+import qualified Data.Maybe             as Maybe
+import           Data.Text              (Text)
+import qualified Data.Time.Calendar     as Calendar
+import qualified Data.Time.Clock        as Clock
+import           Data.Validation        (Validation (Failure, Success))
+import           Web.Scotty             (ActionM)
+import qualified Web.Scotty             as S
 
-import           Common.Model                (Category (..),
-                                              CreatePaymentForm (..),
-                                              EditPaymentForm (..),
-                                              Frequency (Punctual),
-                                              Payment (..), PaymentHeader (..),
-                                              PaymentId, PaymentPage (..),
-                                              SavedPayment (..), User (..))
-import qualified Common.Model                as CM
-import qualified Common.Msg                  as Msg
-import qualified Controller.Helper           as ControllerHelper
-import           Model.CreatePayment         (CreatePayment (..))
-import           Model.EditPayment           (EditPayment (..))
-import qualified Model.Query                 as Query
-import qualified Persistence.Category        as CategoryPersistence
-import qualified Persistence.Income          as IncomePersistence
-import qualified Persistence.Payment         as PaymentPersistence
-import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
-import qualified Persistence.User            as UserPersistence
+import           Common.Model           (Category (..), CreatePaymentForm (..),
+                                         EditPaymentForm (..), Frequency,
+                                         PaymentHeader (..), PaymentId,
+                                         PaymentPage (..), User (..))
+import qualified Common.Msg             as Msg
+
+import qualified Controller.Helper      as ControllerHelper
+import           Model.CreatePayment    (CreatePayment (..))
+import           Model.EditPayment      (EditPayment (..))
+import qualified Model.Query            as Query
+import qualified Payer                  as Payer
+import qualified Persistence.Category   as CategoryPersistence
+import qualified Persistence.Income     as IncomePersistence
+import qualified Persistence.Payment    as PaymentPersistence
+import qualified Persistence.User       as UserPersistence
 import qualified Secure
-import qualified Util.List                   as L
-import qualified Validation.Payment          as PaymentValidation
+import qualified Validation.Payment     as PaymentValidation
 
-list :: Int -> Int -> ActionM ()
-list page perPage =
+list :: Frequency -> Int -> Int -> Text -> ActionM ()
+list frequency page perPage search =
   Secure.loggedAction (\_ -> do
     currentTime <- liftIO Clock.getCurrentTime
     (liftIO . Query.run $ do
-      count <- PaymentPersistence.count
-      payments <- PaymentPersistence.listActivePage page perPage
-      paymentCategories <- PaymentCategoryPersistence.list
+      count <- PaymentPersistence.count frequency search
+      payments <- PaymentPersistence.listActivePage frequency page perPage search
 
       users <- UserPersistence.list
-      incomes <- IncomePersistence.listAll
-      allPayments <- PaymentPersistence.listActive Punctual
+      incomes <- IncomePersistence.listAll -- TODO optimize
+
+      paymentRange <- PaymentPersistence.getRange
+
+      searchRepartition <-
+        case paymentRange of
+          Just (from, to) ->
+            PaymentPersistence.repartition frequency search from (Calendar.addDays 1 to)
+          Nothing ->
+            return M.empty
 
-      let exceedingPayers = CM.getExceedingPayers currentTime users incomes allPayments
+      (preIncomeRepartition, postIncomeRepartition) <-
+        PaymentPersistence.getPreAndPostPaymentRepartition paymentRange users
 
-          repartition =
-            M.fromList
-              . map (\(u, xs) -> (u, sum . map snd $ xs))
-              . L.groupBy fst
-              . map (\p -> (_payment_user p, _payment_cost p))
-              $ allPayments
+      let exceedingPayers = Payer.getExceedingPayers currentTime users incomes preIncomeRepartition postIncomeRepartition (fst <$> paymentRange)
 
           header = PaymentHeader
             { _paymentHeader_exceedingPayers = exceedingPayers
-            , _paymentHeader_repartition     = repartition
+            , _paymentHeader_repartition     = searchRepartition
             }
 
-      return $ PaymentPage header payments paymentCategories count) >>= S.json
-  )
-
-listPaymentCategories :: ActionM ()
-listPaymentCategories =
-  Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ PaymentCategoryPersistence.list) >>= S.json
+      return $ PaymentPage page header payments count) >>= S.json
   )
 
 create :: CreatePaymentForm -> ActionM ()
@@ -78,10 +73,8 @@ create form =
     (liftIO . Query.run $ do
       cs <- map _category_id <$> CategoryPersistence.list
       case PaymentValidation.createPayment cs form of
-        Success (CreatePayment name cost date category frequency) -> do
-          pc <- PaymentCategoryPersistence.save name category
-          p <- PaymentPersistence.create (_user_id user) name cost date frequency
-          return . Right $ SavedPayment p pc
+        Success (CreatePayment name cost date category frequency) ->
+          Right <$> PaymentPersistence.create (_user_id user) name cost date category frequency
         Failure validationError ->
           return $ Left validationError
     ) >>= ControllerHelper.jsonOrBadRequest
@@ -94,14 +87,11 @@ edit form =
       cs <- map _category_id <$> CategoryPersistence.list
       case PaymentValidation.editPayment cs form of
         Success (EditPayment paymentId name cost date category frequency) -> do
-          editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
-          case editedPayment of
-            Just (old, new) -> do
-              pc <- PaymentCategoryPersistence.save name category
-              PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
-              return . Right $ SavedPayment new pc
-            Nothing ->
-              return . Left $ Msg.get Msg.Error_PaymentEdit
+          editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date category frequency
+          if Maybe.isJust editedPayment then
+            return . Right $ editedPayment
+          else
+            return . Left $ Msg.get Msg.Error_PaymentEdit
         Failure validationError ->
           return $ Left validationError
     ) >>= ControllerHelper.jsonOrBadRequest
@@ -109,18 +99,13 @@ edit form =
 
 delete :: PaymentId -> ActionM ()
 delete paymentId =
-  Secure.loggedAction (\user -> do
-    deleted <- liftIO . Query.run $ do
-      payment <- PaymentPersistence.find paymentId
-      case payment of
-        Just p | _payment_user p == _user_id user -> do
-          PaymentPersistence.delete (_user_id user) paymentId
-          PaymentCategoryPersistence.deleteIfUnused (_payment_name p)
-          return True
-        _ ->
-          return False
-    if deleted then
-      S.status Status.ok200
-    else
-      S.status Status.badRequest400
+  Secure.loggedAction (\user ->
+    liftIO . Query.run $ PaymentPersistence.delete (_user_id user) paymentId
+  )
+
+searchCategory :: Text -> ActionM ()
+searchCategory paymentName =
+  Secure.loggedAction (\_ -> do
+    (liftIO $ Query.run (PaymentPersistence.searchCategory paymentName))
+      >>= S.json
   )
-- 
cgit v1.2.3


From 3c67fcf1d524811a18f0c4db3ef6eed1270b9a12 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 19:55:22 +0100
Subject: Hide date from monthly payments

---
 server/src/Controller/Payment.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index d4d086e..c860810 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -64,7 +64,7 @@ list frequency page perPage search =
             , _paymentHeader_repartition     = searchRepartition
             }
 
-      return $ PaymentPage page header payments count) >>= S.json
+      return $ PaymentPage page frequency header payments count) >>= S.json
   )
 
 create :: CreatePaymentForm -> ActionM ()
-- 
cgit v1.2.3


From 54628c70cb33de5e4309c35b9f6b57bbe9f7a07b Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Nov 2019 16:19:53 +0100
Subject: Compute cumulative income with a DB query

---
 server/src/Controller/Payment.hs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index c860810..42a4436 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -11,7 +11,6 @@ import qualified Data.Map               as M
 import qualified Data.Maybe             as Maybe
 import           Data.Text              (Text)
 import qualified Data.Time.Calendar     as Calendar
-import qualified Data.Time.Clock        as Clock
 import           Data.Validation        (Validation (Failure, Success))
 import           Web.Scotty             (ActionM)
 import qualified Web.Scotty             as S
@@ -36,16 +35,23 @@ import qualified Validation.Payment     as PaymentValidation
 
 list :: Frequency -> Int -> Int -> Text -> ActionM ()
 list frequency page perPage search =
-  Secure.loggedAction (\_ -> do
-    currentTime <- liftIO Clock.getCurrentTime
+  Secure.loggedAction (\_ ->
     (liftIO . Query.run $ do
       count <- PaymentPersistence.count frequency search
       payments <- PaymentPersistence.listActivePage frequency page perPage search
 
       users <- UserPersistence.list
-      incomes <- IncomePersistence.listAll -- TODO optimize
 
       paymentRange <- PaymentPersistence.getRange
+      incomeDefinedForAll <- IncomePersistence.definedForAll (_user_id <$> users)
+
+      cumulativeIncome <-
+        case (incomeDefinedForAll, paymentRange) of
+          (Just incomeStart, Just (paymentStart, paymentEnd))  ->
+            IncomePersistence.getCumulativeIncome (max incomeStart paymentStart) paymentEnd
+
+          _ ->
+            return M.empty
 
       searchRepartition <-
         case paymentRange of
@@ -57,7 +63,7 @@ list frequency page perPage search =
       (preIncomeRepartition, postIncomeRepartition) <-
         PaymentPersistence.getPreAndPostPaymentRepartition paymentRange users
 
-      let exceedingPayers = Payer.getExceedingPayers currentTime users incomes preIncomeRepartition postIncomeRepartition (fst <$> paymentRange)
+      let exceedingPayers = Payer.getExceedingPayers users cumulativeIncome preIncomeRepartition postIncomeRepartition
 
           header = PaymentHeader
             { _paymentHeader_exceedingPayers = exceedingPayers
-- 
cgit v1.2.3


From 316bda10c6bec8b5ccc9e23f1f677c076205f046 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 8 Dec 2019 11:39:37 +0100
Subject: Add category page

---
 server/src/Controller/Payment.hs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 42a4436..d6aa34f 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -8,7 +8,6 @@ module Controller.Payment
 
 import           Control.Monad.IO.Class (liftIO)
 import qualified Data.Map               as M
-import qualified Data.Maybe             as Maybe
 import           Data.Text              (Text)
 import qualified Data.Time.Calendar     as Calendar
 import           Data.Validation        (Validation (Failure, Success))
@@ -77,30 +76,30 @@ create :: CreatePaymentForm -> ActionM ()
 create form =
   Secure.loggedAction (\user ->
     (liftIO . Query.run $ do
-      cs <- map _category_id <$> CategoryPersistence.list
+      cs <- map _category_id <$> CategoryPersistence.listAll
       case PaymentValidation.createPayment cs form of
         Success (CreatePayment name cost date category frequency) ->
           Right <$> PaymentPersistence.create (_user_id user) name cost date category frequency
         Failure validationError ->
           return $ Left validationError
-    ) >>= ControllerHelper.jsonOrBadRequest
+    ) >>= ControllerHelper.okOrBadRequest
   )
 
 edit :: EditPaymentForm -> ActionM ()
 edit form =
   Secure.loggedAction (\user ->
     (liftIO . Query.run $ do
-      cs <- map _category_id <$> CategoryPersistence.list
+      cs <- map _category_id <$> CategoryPersistence.listAll
       case PaymentValidation.editPayment cs form of
         Success (EditPayment paymentId name cost date category frequency) -> do
-          editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date category frequency
-          if Maybe.isJust editedPayment then
-            return . Right $ editedPayment
+          isSuccess <- PaymentPersistence.edit (_user_id user) paymentId name cost date category frequency
+          return $ if isSuccess then
+            Right ()
           else
-            return . Left $ Msg.get Msg.Error_PaymentEdit
+            Left $ Msg.get Msg.Error_PaymentEdit
         Failure validationError ->
           return $ Left validationError
-    ) >>= ControllerHelper.jsonOrBadRequest
+    ) >>= ControllerHelper.okOrBadRequest
   )
 
 delete :: PaymentId -> ActionM ()
-- 
cgit v1.2.3


From 47c2a4d6b68c54eed5f7b45671b1ccaf8c0db200 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 20 Jan 2020 19:47:23 +0100
Subject: Show payment stats

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

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index d6aa34f..80c717f 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -4,6 +4,7 @@ module Controller.Payment
   , edit
   , delete
   , searchCategory
+  , statistics
   ) where
 
 import           Control.Monad.IO.Class (liftIO)
@@ -30,6 +31,7 @@ import qualified Persistence.Income     as IncomePersistence
 import qualified Persistence.Payment    as PaymentPersistence
 import qualified Persistence.User       as UserPersistence
 import qualified Secure
+import qualified Statistics
 import qualified Validation.Payment     as PaymentValidation
 
 list :: Frequency -> Int -> Int -> Text -> ActionM ()
@@ -114,3 +116,10 @@ searchCategory paymentName =
     (liftIO $ Query.run (PaymentPersistence.searchCategory paymentName))
       >>= S.json
   )
+
+statistics :: ActionM ()
+statistics =
+  Secure.loggedAction (\_ -> do
+    payments <- liftIO $ Query.run PaymentPersistence.listAllPunctual
+    S.json (Statistics.compute payments)
+  )
-- 
cgit v1.2.3


From 79e1d8b0099d61b580a499311f1714b1b7eb07b5 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 27 Jan 2020 22:07:18 +0100
Subject: Show total incom by month in statistics

---
 server/src/Controller/Payment.hs | 9 ---------
 1 file changed, 9 deletions(-)

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

diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 80c717f..d6aa34f 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -4,7 +4,6 @@ module Controller.Payment
   , edit
   , delete
   , searchCategory
-  , statistics
   ) where
 
 import           Control.Monad.IO.Class (liftIO)
@@ -31,7 +30,6 @@ import qualified Persistence.Income     as IncomePersistence
 import qualified Persistence.Payment    as PaymentPersistence
 import qualified Persistence.User       as UserPersistence
 import qualified Secure
-import qualified Statistics
 import qualified Validation.Payment     as PaymentValidation
 
 list :: Frequency -> Int -> Int -> Text -> ActionM ()
@@ -116,10 +114,3 @@ searchCategory paymentName =
     (liftIO $ Query.run (PaymentPersistence.searchCategory paymentName))
       >>= S.json
   )
-
-statistics :: ActionM ()
-statistics =
-  Secure.loggedAction (\_ -> do
-    payments <- liftIO $ Query.run PaymentPersistence.listAllPunctual
-    S.json (Statistics.compute payments)
-  )
-- 
cgit v1.2.3