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/Main.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 5ac68db..d7b9b93 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 import           Control.Applicative           (liftA3)
 import           Control.Monad.IO.Class        (liftIO)
 
@@ -9,6 +7,8 @@ import qualified Network.Wai.Middleware.Gzip   as W
 import           Network.Wai.Middleware.Static
 import           Web.Scotty
 
+import           Common.Model                  (Frequency (..), Payment (..))
+
 import qualified Conf
 import qualified Controller.Category           as Category
 import qualified Controller.Income             as Income
@@ -35,7 +35,8 @@ main = do
       time <- liftIO Time.getCurrentTime
       (users, incomes, payments) <- liftIO . Query.run $
         liftA3 (,,) UserM.list IncomeM.list PaymentM.list
-      let exceedingPayers = getOrderedExceedingPayers time users incomes payments
+      let punctualPayments = filter ((==) Punctual . _payment_frequency) payments
+          exceedingPayers = getOrderedExceedingPayers time users incomes punctualPayments
       text . LT.pack . show $ exceedingPayers
 
     get "/" $ do
-- 
cgit v1.2.3