2 files changed, 57 insertions, 33 deletions

diff --git a/server/src/Controller/Helper.hs b/server/src/Controller/Helper.hs
new file mode 100644
index 0000000..fd0d2bb
--- /dev/null
+++ b/server/src/Controller/Helper.hs
@@ -0,0 +1,17 @@
+module Controller.Helper
+  ( jsonOrBadRequest
+  ) where
+
+import           Data.Aeson                (ToJSON)
+import           Data.Text                 (Text)
+import qualified Data.Text.Lazy            as LT
+import qualified Network.HTTP.Types.Status as Status
+import           Web.Scotty                (ActionM)
+import qualified Web.Scotty                as S
+
+jsonOrBadRequest :: forall a. (ToJSON a) => Either Text a -> ActionM ()
+jsonOrBadRequest (Left message) = do
+  S.status Status.badRequest400
+  S.text (LT.fromStrict message)
+jsonOrBadRequest (Right a) =
+  S.json a
diff --git a/server/src/Controller/Payment.hs b/server/src/Controller/Payment.hs
index 38c1c19..ba9d1ba 100644
--- a/server/src/Controller/Payment.hs
+++ b/server/src/Controller/Payment.hs
@@ -6,18 +6,25 @@ module Controller.Payment
   ) where
 
 import           Control.Monad.IO.Class      (liftIO)
+import           Data.Validation             (Validation (Failure, Success))
 import qualified Network.HTTP.Types.Status   as Status
 import           Web.Scotty                  hiding (delete)
 
-import           Common.Model                (CreatePayment (..),
-                                              EditPayment (..), Payment (..),
-                                              PaymentId, SavedPayment (..),
-                                              User (..))
+import           Common.Model                (Category (..),
+                                              CreatePaymentForm (..),
+                                              EditPaymentForm (..),
+                                              Payment (..), PaymentId,
+                                              SavedPayment (..), User (..))
+import qualified Common.Msg                  as Msg
+import qualified Controller.Helper           as ControllerHelper
+import           Model.CreatePayment         (CreatePayment (..))
+import           Model.EditPayment           (EditPayment (..))
 import qualified Model.Query                 as Query
+import qualified Persistence.Category        as CategoryPersistence
 import qualified Persistence.Payment         as PaymentPersistence
 import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
 import qualified Secure
-import qualified Validation.CreatePayment    as CreatePaymentValidation
+import qualified Validation.Payment          as PaymentValidation
 
 list :: ActionM ()
 list =
@@ -25,39 +32,39 @@ list =
     (liftIO . Query.run $ PaymentPersistence.listActive) >>= json
   )
 
-create :: CreatePayment -> ActionM ()
-create createPayment@(CreatePayment name cost date category frequency) =
+create :: CreatePaymentForm -> ActionM ()
+create form =
   Secure.loggedAction (\user ->
-    case CreatePaymentValidation.validate createPayment of
-      Nothing ->
-        (liftIO . Query.run $ do
+    (liftIO . Query.run $ do
+      cs <- map _category_id <$> CategoryPersistence.list
+      case PaymentValidation.createPayment cs form of
+        Success (CreatePayment name cost date category frequency) -> do
           pc <- PaymentCategoryPersistence.save name category
           p <- PaymentPersistence.create (_user_id user) name cost date frequency
-          return $ SavedPayment p pc
-        ) >>= json
-      Just validationError ->
-        do
-          status Status.badRequest400
-          json validationError
+          return . Right $ SavedPayment p pc
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
-edit :: EditPayment -> ActionM ()
-edit (EditPayment paymentId name cost date category frequency) =
-  Secure.loggedAction (\user -> do
-    result <- liftIO . Query.run $ do
-      editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
-      case editedPayment of
-        Just (old, new) -> do
-          pc <- PaymentCategoryPersistence.save name category
-          PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
-          return $ Just (new, pc)
-        Nothing ->
-          return Nothing
-    case result of
-      Just (p, pc) ->
-        json $ SavedPayment p pc
-      Nothing ->
-        status Status.badRequest400
+edit :: EditPaymentForm -> ActionM ()
+edit form =
+  Secure.loggedAction (\user ->
+    (liftIO . Query.run $ do
+      cs <- map _category_id <$> CategoryPersistence.list
+      case PaymentValidation.editPayment cs form of
+        Success (EditPayment paymentId name cost date category frequency) -> do
+          editedPayment <- PaymentPersistence.edit (_user_id user) paymentId name cost date frequency
+          case editedPayment of
+            Just (old, new) -> do
+              pc <- PaymentCategoryPersistence.save name category
+              PaymentCategoryPersistence.deleteIfUnused (_payment_name old)
+              return . Right $ SavedPayment new pc
+            Nothing ->
+              return . Left $ Msg.get Msg.Error_PaymentEdit
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
 delete :: PaymentId -> ActionM ()