From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 common/src/Common/Model/Payment.hs | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 common/src/Common/Model/Payment.hs

(limited to 'common/src/Common/Model/Payment.hs')

diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs
new file mode 100644
index 0000000..804b501
--- /dev/null
+++ b/common/src/Common/Model/Payment.hs
@@ -0,0 +1,33 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Common.Model.Payment
+  ( PaymentId
+  , Payment(..)
+  ) where
+
+import Data.Aeson (FromJSON, ToJSON)
+import Data.Int (Int64)
+import Data.Text (Text)
+import Data.Time (UTCTime)
+import Data.Time.Calendar (Day)
+import GHC.Generics (Generic)
+
+import Common.Model.Frequency
+import Common.Model.User (UserId)
+
+type PaymentId = Int64
+
+data Payment = Payment
+  { _payment_id :: PaymentId
+  , _payment_user :: UserId
+  , _payment_name :: Text
+  , _payment_cost :: Int
+  , _payment_date :: Day
+  , _payment_frequency :: Frequency
+  , _payment_createdAt :: UTCTime
+  , _payment_editedAt :: Maybe UTCTime
+  , _payment_deletedAt :: Maybe UTCTime
+  } deriving (Show, Generic)
+
+instance FromJSON Payment
+instance ToJSON Payment
-- 
cgit v1.2.3


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 common/src/Common/Model/Payment.hs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'common/src/Common/Model/Payment.hs')

diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs
index 804b501..4741058 100644
--- a/common/src/Common/Model/Payment.hs
+++ b/common/src/Common/Model/Payment.hs
@@ -5,27 +5,27 @@ module Common.Model.Payment
   , Payment(..)
   ) where
 
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Text (Text)
-import Data.Time (UTCTime)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
+import           Data.Aeson             (FromJSON, ToJSON)
+import           Data.Int               (Int64)
+import           Data.Text              (Text)
+import           Data.Time              (UTCTime)
+import           Data.Time.Calendar     (Day)
+import           GHC.Generics           (Generic)
 
-import Common.Model.Frequency
-import Common.Model.User (UserId)
+import           Common.Model.Frequency
+import           Common.Model.User      (UserId)
 
 type PaymentId = Int64
 
 data Payment = Payment
-  { _payment_id :: PaymentId
-  , _payment_user :: UserId
-  , _payment_name :: Text
-  , _payment_cost :: Int
-  , _payment_date :: Day
+  { _payment_id        :: PaymentId
+  , _payment_user      :: UserId
+  , _payment_name      :: Text
+  , _payment_cost      :: Int
+  , _payment_date      :: Day
   , _payment_frequency :: Frequency
   , _payment_createdAt :: UTCTime
-  , _payment_editedAt :: Maybe UTCTime
+  , _payment_editedAt  :: Maybe UTCTime
   , _payment_deletedAt :: Maybe UTCTime
   } deriving (Show, Generic)
 
-- 
cgit v1.2.3


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
---
 common/src/Common/Model/Payment.hs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'common/src/Common/Model/Payment.hs')

diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs
index 4741058..37a090d 100644
--- a/common/src/Common/Model/Payment.hs
+++ b/common/src/Common/Model/Payment.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
-
 module Common.Model.Payment
   ( PaymentId
   , Payment(..)
-- 
cgit v1.2.3


From c0ea63f8c1a8c7123b78798cec99726b113fb1f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 18:08:28 +0100
Subject: Optimize and refactor payments

---
 common/src/Common/Model/Payment.hs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'common/src/Common/Model/Payment.hs')

diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs
index 37a090d..c232fc7 100644
--- a/common/src/Common/Model/Payment.hs
+++ b/common/src/Common/Model/Payment.hs
@@ -10,6 +10,7 @@ import           Data.Time              (UTCTime)
 import           Data.Time.Calendar     (Day)
 import           GHC.Generics           (Generic)
 
+import           Common.Model.Category  (CategoryId)
 import           Common.Model.Frequency
 import           Common.Model.User      (UserId)
 
@@ -21,6 +22,7 @@ data Payment = Payment
   , _payment_name      :: Text
   , _payment_cost      :: Int
   , _payment_date      :: Day
+  , _payment_category  :: CategoryId
   , _payment_frequency :: Frequency
   , _payment_createdAt :: UTCTime
   , _payment_editedAt  :: Maybe UTCTime
-- 
cgit v1.2.3


From e622e8fdd2e40b4306b5cc724d8dfb76bf976242 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 25 Nov 2019 08:17:59 +0100
Subject: Remove Loadable2

---
 common/src/Common/Model/Payment.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/src/Common/Model/Payment.hs')

diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs
index c232fc7..733a145 100644
--- a/common/src/Common/Model/Payment.hs
+++ b/common/src/Common/Model/Payment.hs
@@ -27,7 +27,7 @@ data Payment = Payment
   , _payment_createdAt :: UTCTime
   , _payment_editedAt  :: Maybe UTCTime
   , _payment_deletedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
+  } deriving (Eq, Show, Generic)
 
 instance FromJSON Payment
 instance ToJSON Payment
-- 
cgit v1.2.3