From 7529a18ff0ac443e7f9764b5e2d0f57a5d3a850b Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 9 Oct 2019 23:16:00 +0200
Subject: Use common payment validation in the backend

Remove deprecated backend validation
---
 common/src/Common/Model/CreatePayment.hs     | 34 ----------------------------
 common/src/Common/Model/CreatePaymentForm.hs | 21 +++++++++++++++++
 common/src/Common/Model/EditPayment.hs       | 24 --------------------
 common/src/Common/Model/EditPaymentForm.hs   | 23 +++++++++++++++++++
 4 files changed, 44 insertions(+), 58 deletions(-)
 delete mode 100644 common/src/Common/Model/CreatePayment.hs
 create mode 100644 common/src/Common/Model/CreatePaymentForm.hs
 delete mode 100644 common/src/Common/Model/EditPayment.hs
 create mode 100644 common/src/Common/Model/EditPaymentForm.hs

(limited to 'common/src/Common/Model')

diff --git a/common/src/Common/Model/CreatePayment.hs b/common/src/Common/Model/CreatePayment.hs
deleted file mode 100644
index c61423c..0000000
--- a/common/src/Common/Model/CreatePayment.hs
+++ /dev/null
@@ -1,34 +0,0 @@
-module Common.Model.CreatePayment
-  ( CreatePaymentError(..)
-  , CreatePayment(..)
-  ) where
-
-import           Data.Aeson             (FromJSON, ToJSON)
-import           Data.Text              (Text)
-import           Data.Time.Calendar     (Day)
-import           GHC.Generics           (Generic)
-
-import           Common.Model.Category  (CategoryId)
-import           Common.Model.Frequency (Frequency)
-
-data CreatePaymentError = CreatePaymentError
-  { _createPaymentError_name      :: Maybe Text
-  , _createPaymentError_cost      :: Maybe Text
-  , _createPaymentError_date      :: Maybe Text
-  , _createPaymentError_category  :: Maybe Text
-  , _createPaymentError_frequency :: Maybe Text
-  } deriving (Show, Generic)
-
-instance FromJSON CreatePaymentError
-instance ToJSON CreatePaymentError
-
-data CreatePayment = CreatePayment
-  { _createPayment_name      :: Text
-  , _createPayment_cost      :: Int
-  , _createPayment_date      :: Day
-  , _createPayment_category  :: CategoryId
-  , _createPayment_frequency :: Frequency
-  } deriving (Show, Generic)
-
-instance FromJSON CreatePayment
-instance ToJSON CreatePayment
diff --git a/common/src/Common/Model/CreatePaymentForm.hs b/common/src/Common/Model/CreatePaymentForm.hs
new file mode 100644
index 0000000..60c5423
--- /dev/null
+++ b/common/src/Common/Model/CreatePaymentForm.hs
@@ -0,0 +1,21 @@
+module Common.Model.CreatePaymentForm
+  ( CreatePaymentForm(..)
+  ) where
+
+import           Data.Aeson             (FromJSON, ToJSON)
+import           Data.Text              (Text)
+import           GHC.Generics           (Generic)
+
+import           Common.Model.Category  (CategoryId)
+import           Common.Model.Frequency (Frequency)
+
+data CreatePaymentForm = CreatePaymentForm
+  { _createPaymentForm_name      :: Text
+  , _createPaymentForm_cost      :: Text
+  , _createPaymentForm_date      :: Text
+  , _createPaymentForm_category  :: CategoryId
+  , _createPaymentForm_frequency :: Frequency
+  } deriving (Show, Generic)
+
+instance FromJSON CreatePaymentForm
+instance ToJSON CreatePaymentForm
diff --git a/common/src/Common/Model/EditPayment.hs b/common/src/Common/Model/EditPayment.hs
deleted file mode 100644
index 8860b84..0000000
--- a/common/src/Common/Model/EditPayment.hs
+++ /dev/null
@@ -1,24 +0,0 @@
-module Common.Model.EditPayment
-  ( EditPayment(..)
-  ) where
-
-import           Data.Aeson             (FromJSON, ToJSON)
-import           Data.Text              (Text)
-import           Data.Time.Calendar     (Day)
-import           GHC.Generics           (Generic)
-
-import           Common.Model.Category  (CategoryId)
-import           Common.Model.Frequency (Frequency)
-import           Common.Model.Payment   (PaymentId)
-
-data EditPayment = EditPayment
-  { _editPayment_id        :: PaymentId
-  , _editPayment_name      :: Text
-  , _editPayment_cost      :: Int
-  , _editPayment_date      :: Day
-  , _editPayment_category  :: CategoryId
-  , _editPayment_frequency :: Frequency
-  } deriving (Show, Generic)
-
-instance FromJSON EditPayment
-instance ToJSON EditPayment
diff --git a/common/src/Common/Model/EditPaymentForm.hs b/common/src/Common/Model/EditPaymentForm.hs
new file mode 100644
index 0000000..168c9ff
--- /dev/null
+++ b/common/src/Common/Model/EditPaymentForm.hs
@@ -0,0 +1,23 @@
+module Common.Model.EditPaymentForm
+  ( EditPaymentForm(..)
+  ) where
+
+import           Data.Aeson             (FromJSON, ToJSON)
+import           Data.Text              (Text)
+import           GHC.Generics           (Generic)
+
+import           Common.Model.Category  (CategoryId)
+import           Common.Model.Frequency (Frequency)
+import           Common.Model.Payment   (PaymentId)
+
+data EditPaymentForm = EditPaymentForm
+  { _editPaymentForm_id        :: PaymentId
+  , _editPaymentForm_name      :: Text
+  , _editPaymentForm_cost      :: Text
+  , _editPaymentForm_date      :: Text
+  , _editPaymentForm_category  :: CategoryId
+  , _editPaymentForm_frequency :: Frequency
+  } deriving (Show, Generic)
+
+instance FromJSON EditPaymentForm
+instance ToJSON EditPaymentForm
-- 
cgit v1.2.3