From fff7336e06ab4c98adda3fea8a86c7d4d4b9b9bb Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 1 Oct 2015 14:10:45 +0200
Subject: Factor job listener

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

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

diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs
index 469f0d3..25b1bb7 100644
--- a/src/server/Model/Payment.hs
+++ b/src/server/Model/Payment.hs
@@ -42,11 +42,12 @@ getUserMonthlyPayments userId =
 
 getMonthlyPayments :: Persist [Entity Payment]
 getMonthlyPayments =
-  selectList
-    [ PaymentDeletedAt P.==. Nothing
-    , PaymentFrequency P.==. Monthly
-    ]
-    [ Desc PaymentCreation ]
+  select $
+    from $ \payment -> do
+    where_ (isNothing (payment ^. PaymentDeletedAt))
+    where_ (payment ^. PaymentFrequency E.==. val Monthly)
+    orderBy [desc (lower_ (payment ^. PaymentName))]
+    return payment
 
 getJsonPayment :: Entity Payment -> P.Payment
 getJsonPayment paymentEntity =
-- 
cgit v1.2.3