Add income

7 files changed, 55 insertions, 17 deletions

diff --git a/common/common.cabal b/common/common.cabal
index 64a3b3e..6c7c779 100644
--- a/common/common.cabal
+++ b/common/common.cabal
@@ -29,6 +29,7 @@ Library
 
   Exposed-modules:
     Common.Model
+    Common.Model.CreateIncomeForm
     Common.Model.CreatePaymentForm
     Common.Model.Email
     Common.Model.Payment
@@ -40,6 +41,7 @@ Library
     Common.Util.Time
     Common.Util.Validation
     Common.Validation.Atomic
+    Common.Validation.Income
     Common.Validation.Payment
     Common.Validation.SignIn
     Common.View.Format
@@ -50,10 +52,10 @@ Library
     Common.Message.Translation
     Common.Model.Category
     Common.Model.CreateCategory
-    Common.Model.CreateIncome
     Common.Model.Currency
     Common.Model.EditCategory
     Common.Model.EditIncome
+    Common.Model.EditIncomeForm
     Common.Model.EditPaymentForm
     Common.Model.Frequency
     Common.Model.Income
diff --git a/common/src/Common/Model.hs b/common/src/Common/Model.hs
index 5b71a84..c9f500b 100644
--- a/common/src/Common/Model.hs
+++ b/common/src/Common/Model.hs
@@ -2,11 +2,12 @@ module Common.Model (module X) where
 
 import           Common.Model.Category          as X
 import           Common.Model.CreateCategory    as X
-import           Common.Model.CreateIncome      as X
+import           Common.Model.CreateIncomeForm  as X
 import           Common.Model.CreatePaymentForm as X
 import           Common.Model.Currency          as X
 import           Common.Model.EditCategory      as X
 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.Frequency         as X
diff --git a/common/src/Common/Model/CreateIncome.hs b/common/src/Common/Model/CreateIncome.hs
deleted file mode 100644
index 644a51c..0000000
--- a/common/src/Common/Model/CreateIncome.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-module Common.Model.CreateIncome
-  ( CreateIncome(..)
-  ) where
-
-import           Data.Aeson         (FromJSON)
-import           Data.Time.Calendar (Day)
-import           GHC.Generics       (Generic)
-
-data CreateIncome = CreateIncome
-  { _createIncome_date   :: Day
-  , _createIncome_amount :: Int
-  } deriving (Show, Generic)
-
-instance FromJSON CreateIncome
diff --git a/common/src/Common/Model/CreateIncomeForm.hs b/common/src/Common/Model/CreateIncomeForm.hs
new file mode 100644
index 0000000..e83bf0a
--- /dev/null
+++ b/common/src/Common/Model/CreateIncomeForm.hs
@@ -0,0 +1,15 @@
+module Common.Model.CreateIncomeForm
+  ( CreateIncomeForm(..)
+  ) where
+
+import           Data.Aeson   (FromJSON, ToJSON)
+import           Data.Text    (Text)
+import           GHC.Generics (Generic)
+
+data CreateIncomeForm = CreateIncomeForm
+  { _createIncomeForm_amount :: Text
+  , _createIncomeForm_date   :: Text
+  } deriving (Show, Generic)
+
+instance FromJSON CreateIncomeForm
+instance ToJSON CreateIncomeForm
diff --git a/common/src/Common/Model/EditIncomeForm.hs b/common/src/Common/Model/EditIncomeForm.hs
new file mode 100644
index 0000000..ff975fc
--- /dev/null
+++ b/common/src/Common/Model/EditIncomeForm.hs
@@ -0,0 +1,18 @@
+module Common.Model.EditIncomeForm
+  ( EditIncomeForm(..)
+  ) where
+
+import           Data.Aeson          (FromJSON, ToJSON)
+import           Data.Text           (Text)
+import           GHC.Generics        (Generic)
+
+import           Common.Model.Income (IncomeId)
+
+data EditIncomeForm = EditIncomeForm
+  { _editIncomeForm_id     :: IncomeId
+  , _editIncomeForm_amount :: Text
+  , _editIncomeForm_date   :: Text
+  } deriving (Show, Generic)
+
+instance FromJSON EditIncomeForm
+instance ToJSON EditIncomeForm
diff --git a/common/src/Common/Validation/Income.hs b/common/src/Common/Validation/Income.hs
new file mode 100644
index 0000000..7a58bab
--- /dev/null
+++ b/common/src/Common/Validation/Income.hs
@@ -0,0 +1,17 @@
+module Common.Validation.Income
+  ( amount
+  , date
+  ) where
+
+import           Data.Text                (Text)
+import           Data.Time.Calendar       (Day)
+import           Data.Validation          (Validation)
+import qualified Data.Validation          as V
+
+import qualified Common.Validation.Atomic as Atomic
+
+amount :: Text -> Validation Text Int
+amount input = V.bindValidation (Atomic.number input) Atomic.nonNullNumber
+
+date :: Text -> Validation Text Day
+date = Atomic.day
diff --git a/common/src/Common/Validation/Payment.hs b/common/src/Common/Validation/Payment.hs
index 1bb00ce..e3c447a 100644
--- a/common/src/Common/Validation/Payment.hs
+++ b/common/src/Common/Validation/Payment.hs
@@ -14,7 +14,6 @@ import           Common.Model             (CategoryId)
 import qualified Common.Msg               as Msg
 import qualified Common.Validation.Atomic as Atomic
 
-
 name :: Text -> Validation Text Text
 name = Atomic.nonEmpty