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 ---------
 server/src/Controller/Statistics.hs | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 server/src/Controller/Statistics.hs

(limited to 'server/src/Controller')

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)
-  )
diff --git a/server/src/Controller/Statistics.hs b/server/src/Controller/Statistics.hs
new file mode 100644
index 0000000..500c93c
--- /dev/null
+++ b/server/src/Controller/Statistics.hs
@@ -0,0 +1,21 @@
+module Controller.Statistics
+  ( paymentsAndIncomes
+  ) where
+
+import           Control.Monad.IO.Class (liftIO)
+import           Web.Scotty             (ActionM)
+import qualified Web.Scotty             as S
+
+import qualified Model.Query            as Query
+import qualified Persistence.Income     as IncomePersistence
+import qualified Persistence.Payment    as PaymentPersistence
+import qualified Secure
+import qualified Statistics
+
+paymentsAndIncomes :: ActionM ()
+paymentsAndIncomes =
+  Secure.loggedAction (\_ -> do
+    payments <- liftIO $ Query.run PaymentPersistence.listAllPunctual
+    incomes <- liftIO $ Query.run IncomePersistence.listAll
+    S.json (Statistics.paymentsAndIncomes payments incomes)
+  )
-- 
cgit v1.2.3