WIP

1 files changed, 29 insertions, 26 deletions

diff --git a/server/src/View/Mail/WeeklyReport.hs b/server/src/View/Mail/WeeklyReport.hs
index 5418880..7e88d98 100644
--- a/server/src/View/Mail/WeeklyReport.hs
+++ b/server/src/View/Mail/WeeklyReport.hs
@@ -2,28 +2,28 @@ module View.Mail.WeeklyReport
   ( mail
   ) where
 
-import           Data.List          (sortOn)
-import           Data.Map           (Map)
-import qualified Data.Map           as M
-import           Data.Maybe         (catMaybes, fromMaybe)
-import           Data.Monoid        ((<>))
-import           Data.Text          (Text)
-import qualified Data.Text          as T
-import           Data.Time.Clock    (UTCTime)
+import           Data.List             (sortOn)
+import           Data.Map              (Map)
+import qualified Data.Map              as M
+import           Data.Maybe            (catMaybes, fromMaybe)
+import           Data.Monoid           ((<>))
+import           Data.Text             (Text)
+import qualified Data.Text             as T
+import           Data.Time.Clock       (UTCTime)
 
-import           Common.Model       (ExceedingPayer (..), Income (..),
-                                     Payment (..), User (..), UserId)
-import qualified Common.Model       as CM
-import qualified Common.Msg         as Msg
-import qualified Common.View.Format as Format
+import           Common.Model          (ExceedingPayer (..), Income (..),
+                                        Payment (..), User (..), UserId)
+import qualified Common.Model          as CM
+import qualified Common.Msg            as Msg
+import qualified Common.View.Format    as Format
 
-import           Conf               (Conf)
-import qualified Conf               as Conf
-import qualified Model.Income       ()
-import           Model.Mail         (Mail (Mail))
-import qualified Model.Mail         as M
-import           Model.Payment      ()
-import           Resource           (Status (..), groupByStatus, statuses)
+import           Conf                  (Conf)
+import qualified Conf                  as Conf
+import           Model.IncomeResource  (IncomeResource (..))
+import           Model.Mail            (Mail (Mail))
+import qualified Model.Mail            as M
+import           Model.PaymentResource (PaymentResource (..))
+import           Resource              (Status (..), groupByStatus, statuses)
 
 mail :: Conf -> [User] -> [Payment] -> [Income] -> UTCTime -> UTCTime -> Mail
 mail conf users payments incomes start end =
@@ -42,8 +42,11 @@ body :: Conf -> [User] -> [Payment] -> [Income] -> UTCTime -> UTCTime -> Text
 body conf users payments incomes start end =
   T.intercalate "\n" $
     [ exceedingPayers conf end users incomes (filter (null . _payment_deletedAt) payments)
-    , operations conf users (groupByStatus start end payments) (groupByStatus start end incomes)
+    , operations conf users paymentsGroupedByStatus incomesGroupedByStatus
     ]
+      where
+        paymentsGroupedByStatus = groupByStatus start end . map PaymentResource $ payments
+        incomesGroupedByStatus = groupByStatus start end . map IncomeResource $ incomes
 
 exceedingPayers :: Conf -> UTCTime -> [User] -> [Income] -> [Payment] -> Text
 exceedingPayers conf time users incomes payments =
@@ -58,7 +61,7 @@ exceedingPayers conf time users incomes payments =
       , "\n"
       ]
 
-operations :: Conf -> [User] -> Map Status [Payment] -> Map Status [Income] -> Text
+operations :: Conf -> [User] -> Map Status [PaymentResource] -> Map Status [IncomeResource] -> Text
 operations conf users paymentsByStatus incomesByStatus =
   if M.null paymentsByStatus && M.null incomesByStatus
     then
@@ -69,7 +72,7 @@ operations conf users paymentsByStatus incomesByStatus =
         , map (\s -> incomeSection s conf users <$> M.lookup s incomesByStatus) statuses
         ]
 
-paymentSection :: Status -> Conf -> [User] -> [Payment] -> Text
+paymentSection :: Status -> Conf -> [User] -> [PaymentResource] -> Text
 paymentSection status conf users payments =
   section sectionTitle sectionItems
   where count = length payments
@@ -77,7 +80,7 @@ paymentSection status conf users payments =
           Created -> if count > 1 then Msg.WeeklyReport_PaymentsCreated count else Msg.WeeklyReport_PaymentCreated count
           Edited -> if count > 1 then Msg.WeeklyReport_PaymentsEdited count else Msg.WeeklyReport_PaymentEdited count
           Deleted -> if count > 1 then Msg.WeeklyReport_PaymentsDeleted count else Msg.WeeklyReport_PaymentDeleted count
-        sectionItems = map (payedFor status conf users) . sortOn _payment_date $ payments
+        sectionItems = map (payedFor status conf users) . sortOn _payment_date . map (\(PaymentResource p) -> p) $ payments
 
 payedFor :: Status -> Conf -> [User] -> Payment -> Text
 payedFor status conf users payment =
@@ -89,7 +92,7 @@ payedFor status conf users payment =
         for = _payment_name payment
         at = Format.longDay $ _payment_date payment
 
-incomeSection :: Status -> Conf -> [User] -> [Income] -> Text
+incomeSection :: Status -> Conf -> [User] -> [IncomeResource] -> Text
 incomeSection status conf users incomes =
   section sectionTitle sectionItems
   where count = length incomes
@@ -97,7 +100,7 @@ incomeSection status conf users incomes =
           Created -> if count > 1 then Msg.WeeklyReport_IncomesCreated count else Msg.WeeklyReport_IncomeCreated count
           Edited -> if count > 1 then Msg.WeeklyReport_IncomesEdited count else Msg.WeeklyReport_IncomeEdited count
           Deleted -> if count > 1 then Msg.WeeklyReport_IncomesDeleted count else Msg.WeeklyReport_IncomeDeleted count
-        sectionItems = map (isPayedFrom status conf users) . sortOn _income_date $ incomes
+        sectionItems = map (isPayedFrom status conf users) . sortOn _income_date . map (\(IncomeResource i) -> i) $ incomes
 
 isPayedFrom :: Status -> Conf -> [User] -> Income -> Text
 isPayedFrom status conf users income =