Show payment header infos

5 files changed, 49 insertions, 16 deletions

diff --git a/common/src/Common/Model.hs b/common/src/Common/Model.hs
index bc626d5..fdeac36 100644
--- a/common/src/Common/Model.hs
+++ b/common/src/Common/Model.hs
@@ -10,6 +10,7 @@ import           Common.Model.EditIncome        as X
 import           Common.Model.EditIncomeForm    as X
 import           Common.Model.EditPaymentForm   as X
 import           Common.Model.Email             as X
+import           Common.Model.ExceedingPayer    as X
 import           Common.Model.Frequency         as X
 import           Common.Model.Income            as X
 import           Common.Model.IncomeHeader      as X
@@ -19,6 +20,7 @@ import           Common.Model.InitResult        as X
 import           Common.Model.Payer             as X
 import           Common.Model.Payment           as X
 import           Common.Model.PaymentCategory   as X
+import           Common.Model.PaymentHeader     as X
 import           Common.Model.PaymentPage       as X
 import           Common.Model.SavedPayment      as X
 import           Common.Model.SignInForm        as X
diff --git a/common/src/Common/Model/ExceedingPayer.hs b/common/src/Common/Model/ExceedingPayer.hs
new file mode 100644
index 0000000..171b6ff
--- /dev/null
+++ b/common/src/Common/Model/ExceedingPayer.hs
@@ -0,0 +1,16 @@
+module Common.Model.ExceedingPayer
+  ( ExceedingPayer(..)
+  ) where
+
+import           Data.Aeson        (FromJSON, ToJSON)
+import           GHC.Generics      (Generic)
+
+import           Common.Model.User (UserId)
+
+data ExceedingPayer = ExceedingPayer
+  { _exceedingPayer_userId :: UserId
+  , _exceedingPayer_amount :: Int
+  } deriving (Show, Generic)
+
+instance FromJSON ExceedingPayer
+instance ToJSON ExceedingPayer
diff --git a/common/src/Common/Model/Payer.hs b/common/src/Common/Model/Payer.hs
index 3c816c8..39a5788 100644
--- a/common/src/Common/Model/Payer.hs
+++ b/common/src/Common/Model/Payer.hs
@@ -1,19 +1,19 @@
 module Common.Model.Payer
-  ( ExceedingPayer(..)
-  , getExceedingPayers
+  ( getExceedingPayers
   , useIncomesFrom
   , cumulativeIncomesSince
   ) where
 
-import qualified Data.List            as List
-import qualified Data.Maybe           as Maybe
-import           Data.Time            (NominalDiffTime, UTCTime (..))
-import qualified Data.Time            as Time
-import           Data.Time.Calendar   (Day)
+import qualified Data.List                   as List
+import qualified Data.Maybe                  as Maybe
+import           Data.Time                   (NominalDiffTime, UTCTime (..))
+import qualified Data.Time                   as Time
+import           Data.Time.Calendar          (Day)
 
-import           Common.Model.Income  (Income (..))
-import           Common.Model.Payment (Payment (..))
-import           Common.Model.User    (User (..), UserId)
+import           Common.Model.ExceedingPayer (ExceedingPayer (..))
+import           Common.Model.Income         (Income (..))
+import           Common.Model.Payment        (Payment (..))
+import           Common.Model.User           (User (..), UserId)
 
 data Payer = Payer
   { _payer_userId             :: UserId
@@ -29,11 +29,6 @@ data PostPaymentPayer = PostPaymentPayer
   , _postPaymentPayer_ratio             :: Float
   }
 
-data ExceedingPayer = ExceedingPayer
-  { _exceedingPayer_userId :: UserId
-  , _exceedingPayer_amount :: Int
-  } deriving (Show)
-
 getExceedingPayers :: UTCTime -> [User] -> [Income] -> [Payment] -> [ExceedingPayer]
 getExceedingPayers currentTime users incomes payments =
   let userIds = map _user_id users
diff --git a/common/src/Common/Model/PaymentHeader.hs b/common/src/Common/Model/PaymentHeader.hs
new file mode 100644
index 0000000..a522cd8
--- /dev/null
+++ b/common/src/Common/Model/PaymentHeader.hs
@@ -0,0 +1,18 @@
+module Common.Model.PaymentHeader
+  ( PaymentHeader(..)
+  ) where
+
+import           Data.Aeson                  (FromJSON, ToJSON)
+import           Data.Map                    (Map)
+import           GHC.Generics                (Generic)
+
+import           Common.Model.ExceedingPayer (ExceedingPayer)
+import           Common.Model.User           (UserId)
+
+data PaymentHeader = PaymentHeader
+  { _paymentHeader_exceedingPayers :: [ExceedingPayer]
+  , _paymentHeader_repartition     :: Map UserId Int
+  } deriving (Show, Generic)
+
+instance FromJSON PaymentHeader
+instance ToJSON PaymentHeader
diff --git a/common/src/Common/Model/PaymentPage.hs b/common/src/Common/Model/PaymentPage.hs
index 31039c7..76c7511 100644
--- a/common/src/Common/Model/PaymentPage.hs
+++ b/common/src/Common/Model/PaymentPage.hs
@@ -7,9 +7,11 @@ import           GHC.Generics                 (Generic)
 
 import           Common.Model.Payment         (Payment)
 import           Common.Model.PaymentCategory (PaymentCategory)
+import           Common.Model.PaymentHeader   (PaymentHeader)
 
 data PaymentPage = PaymentPage
-  { _paymentPage_payments          :: [Payment]
+  { _paymentPage_header            :: PaymentHeader
+  , _paymentPage_payments          :: [Payment]
   , _paymentPage_paymentCategories :: [PaymentCategory]
   , _paymentPage_totalCount        :: Int
   } deriving (Show, Generic)