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
---
 server/src/Validation/Atomic.hs        | 32 --------------------------------
 server/src/Validation/CreatePayment.hs | 25 -------------------------
 server/src/Validation/Payment.hs       | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 57 deletions(-)
 delete mode 100644 server/src/Validation/Atomic.hs
 delete mode 100644 server/src/Validation/CreatePayment.hs
 create mode 100644 server/src/Validation/Payment.hs

(limited to 'server/src/Validation')

diff --git a/server/src/Validation/Atomic.hs b/server/src/Validation/Atomic.hs
deleted file mode 100644
index 7a7351a..0000000
--- a/server/src/Validation/Atomic.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-module Validation.Atomic
-  ( nonEmpty
-  , nonNullNumber
-  -- , number
-  ) where
-
-import           Data.Text  (Text)
-import qualified Data.Text  as T
-
-import qualified Common.Msg as Msg
-
-nonEmpty :: Text -> Maybe Text
-nonEmpty str =
-  if T.null str
-    then Just $ Msg.get Msg.Form_NonEmpty
-    else Nothing
-
-nonNullNumber :: Int -> Maybe Text
-nonNullNumber n =
-  if n == 0
-     then Just $ Msg.get Msg.Form_NonNullNumber
-     else Nothing
-
--- number :: (Int -> Bool) -> Text -> Maybe Int
--- number numberForm str =
---   case reads (T.unpack str) :: [(Int, String)] of
---     (num, _) : _ ->
---       if numberForm num
---         then Just num
---         else Nothing
---     _ ->
---       Nothing
diff --git a/server/src/Validation/CreatePayment.hs b/server/src/Validation/CreatePayment.hs
deleted file mode 100644
index fbcdb7c..0000000
--- a/server/src/Validation/CreatePayment.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-module Validation.CreatePayment
-  ( validate
-  ) where
-
-import           Data.Maybe                 (catMaybes)
-
-import           Common.Model.CreatePayment (CreatePayment (..),
-                                             CreatePaymentError (..))
-import qualified Validation.Atomic          as Atomic
-
-validate :: CreatePayment -> Maybe CreatePaymentError
-validate p =
-  if not . null . catMaybes $ [ nameError, costError ]
-    then Just createPaymentError
-    else Nothing
-  where
-    nameError = Atomic.nonEmpty . _createPayment_name $ p
-    costError = Atomic.nonNullNumber . _createPayment_cost $ p
-    createPaymentError = CreatePaymentError
-      { _createPaymentError_name      = nameError
-      , _createPaymentError_cost      = costError
-      , _createPaymentError_date      = Nothing
-      , _createPaymentError_category  = Nothing
-      , _createPaymentError_frequency = Nothing
-      }
diff --git a/server/src/Validation/Payment.hs b/server/src/Validation/Payment.hs
new file mode 100644
index 0000000..20e370e
--- /dev/null
+++ b/server/src/Validation/Payment.hs
@@ -0,0 +1,33 @@
+module Validation.Payment
+  ( createPayment
+  , editPayment
+  ) where
+
+import           Data.Text                 (Text)
+import           Data.Validation           (Validation)
+import qualified Data.Validation           as V
+
+import           Common.Model              (CategoryId, CreatePaymentForm (..),
+                                            EditPaymentForm (..))
+import qualified Common.Validation.Payment as PaymentValidation
+import           Model.CreatePayment       (CreatePayment (..))
+import           Model.EditPayment         (EditPayment (..))
+
+createPayment :: [CategoryId] -> CreatePaymentForm -> Validation Text CreatePayment
+createPayment categories form =
+  CreatePayment
+    <$> PaymentValidation.name (_createPaymentForm_name form)
+    <*> PaymentValidation.cost (_createPaymentForm_cost form)
+    <*> PaymentValidation.date (_createPaymentForm_date form)
+    <*> PaymentValidation.category categories (_createPaymentForm_category form)
+    <*> V.Success (_createPaymentForm_frequency form)
+
+editPayment :: [CategoryId] -> EditPaymentForm -> Validation Text EditPayment
+editPayment categories form =
+  EditPayment
+    <$> V.Success (_editPaymentForm_id form)
+    <*> PaymentValidation.name (_editPaymentForm_name form)
+    <*> PaymentValidation.cost (_editPaymentForm_cost form)
+    <*> PaymentValidation.date (_editPaymentForm_date form)
+    <*> PaymentValidation.category categories (_editPaymentForm_category form)
+    <*> V.Success (_editPaymentForm_frequency form)
-- 
cgit v1.2.3