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/Income.hs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 common/src/Common/Model/Income.hs

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

diff --git a/common/src/Common/Model/Income.hs b/common/src/Common/Model/Income.hs
new file mode 100644
index 0000000..280812f
--- /dev/null
+++ b/common/src/Common/Model/Income.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Common.Model.Income
+  ( IncomeId
+  , Income(..)
+  ) where
+
+import Data.Aeson (FromJSON, ToJSON)
+import Data.Int (Int64)
+import Data.Time (UTCTime)
+import Data.Time.Calendar (Day)
+import GHC.Generics (Generic)
+
+import Common.Model.User (UserId)
+
+type IncomeId = Int64
+
+data Income = Income
+  { _income_id :: IncomeId
+  , _income_userId :: UserId
+  , _income_date :: Day
+  , _income_amount :: Int
+  , _income_createdAt :: UTCTime
+  , _income_editedAt :: Maybe UTCTime
+  , _income_deletedAt :: Maybe UTCTime
+  } deriving (Show, Generic)
+
+instance FromJSON Income
+instance ToJSON Income
-- 
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/Income.hs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/common/src/Common/Model/Income.hs b/common/src/Common/Model/Income.hs
index 280812f..10b4cf2 100644
--- a/common/src/Common/Model/Income.hs
+++ b/common/src/Common/Model/Income.hs
@@ -5,23 +5,23 @@ module Common.Model.Income
   , Income(..)
   ) where
 
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Time (UTCTime)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
+import           Data.Aeson         (FromJSON, ToJSON)
+import           Data.Int           (Int64)
+import           Data.Time          (UTCTime)
+import           Data.Time.Calendar (Day)
+import           GHC.Generics       (Generic)
 
-import Common.Model.User (UserId)
+import           Common.Model.User  (UserId)
 
 type IncomeId = Int64
 
 data Income = Income
-  { _income_id :: IncomeId
-  , _income_userId :: UserId
-  , _income_date :: Day
-  , _income_amount :: Int
+  { _income_id        :: IncomeId
+  , _income_userId    :: UserId
+  , _income_date      :: Day
+  , _income_amount    :: Int
   , _income_createdAt :: UTCTime
-  , _income_editedAt :: Maybe UTCTime
+  , _income_editedAt  :: Maybe UTCTime
   , _income_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/Income.hs | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/common/src/Common/Model/Income.hs b/common/src/Common/Model/Income.hs
index 10b4cf2..0423704 100644
--- a/common/src/Common/Model/Income.hs
+++ b/common/src/Common/Model/Income.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
-
 module Common.Model.Income
   ( IncomeId
   , Income(..)
-- 
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/Income.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/common/src/Common/Model/Income.hs b/common/src/Common/Model/Income.hs
index 0423704..57d07f1 100644
--- a/common/src/Common/Model/Income.hs
+++ b/common/src/Common/Model/Income.hs
@@ -21,7 +21,7 @@ data Income = Income
   , _income_createdAt :: UTCTime
   , _income_editedAt  :: Maybe UTCTime
   , _income_deletedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
+  } deriving (Eq, Show, Generic)
 
 instance FromJSON Income
 instance ToJSON Income
-- 
cgit v1.2.3