From 8c24464a4bd0a486cd0ddf846d3b5a323a7aaa9a Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 4 Oct 2015 20:48:32 +0200 Subject: Using incomes to compute a fair computation to designate the payer --- src/server/Model/Payment.hs | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/server/Model/Payment.hs') diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs index 25b1bb7..233cafa 100644 --- a/src/server/Model/Payment.hs +++ b/src/server/Model/Payment.hs @@ -4,13 +4,11 @@ module Model.Payment , getMonthlyPayments , createPayment , deleteOwnPayment - , getTotalPayments , getPaymentsCount ) where import Data.Text (Text) import Data.Time.Clock (getCurrentTime) -import Data.Maybe (catMaybes) import Control.Monad.IO.Class (liftIO) @@ -22,7 +20,6 @@ import qualified Database.Esqueleto as E import Model.Database import Model.Frequency import qualified Model.Json.Payment as P -import qualified Model.Json.TotalPayment as TP getPunctualPayments :: Int -> Int -> Persist [P.Payment] getPunctualPayments page perPage = do @@ -80,23 +77,6 @@ deleteOwnPayment user paymentId = do Nothing -> return False -getTotalPayments :: Persist [TP.TotalPayment] -getTotalPayments = do - values <- select $ - from $ \payment -> do - where_ (isNothing (payment ^. PaymentDeletedAt)) - where_ (payment ^. PaymentFrequency E.==. val Punctual) - groupBy (payment ^. PaymentUserId) - return (payment ^. PaymentUserId, sum_ (payment ^. PaymentCost)) - return $ catMaybes . map (getTotalPayment . unValueTuple) $ values - -getTotalPayment :: (UserId, Maybe Int) -> Maybe TP.TotalPayment -getTotalPayment (userId, Just cost) = Just (TP.TotalPayment userId cost) -getTotalPayment (_, Nothing) = Nothing - -unValueTuple :: (Value a, Value b) -> (a, b) -unValueTuple (Value a, Value b) = (a, b) - getPaymentsCount :: Persist Int getPaymentsCount = unValue . head <$> -- cgit v1.2.3