1 files changed, 13 insertions, 8 deletions
diff --git a/server/src/Controller/Income.hs b/server/src/Controller/Income.hs
index b40976b..236e032 100644
--- a/server/src/Controller/Income.hs
+++ b/server/src/Controller/Income.hs
@@ -11,11 +11,12 @@ import qualified Network.HTTP.Types.Status as Status
 import           Web.Scotty                hiding (delete)
 
 import           Common.Model              (CreateIncomeForm (..),
-                                            EditIncome (..), IncomeId,
+                                            EditIncomeForm (..), IncomeId,
                                             User (..))
 
 import qualified Controller.Helper         as ControllerHelper
 import           Model.CreateIncome        (CreateIncome (..))
+import           Model.EditIncome          (EditIncome (..))
 import qualified Model.Query               as Query
 import qualified Persistence.Income        as IncomePersistence
 import qualified Secure
@@ -40,13 +41,17 @@ create form =
     ) >>= ControllerHelper.jsonOrBadRequest
   )
 
-edit :: EditIncome -> ActionM ()
-edit (EditIncome incomeId date amount) =
-  Secure.loggedAction (\user -> do
-    updated <- liftIO . Query.run $ IncomePersistence.edit (_user_id user) incomeId date amount
-    if updated
-      then status Status.ok200
-      else status Status.badRequest400
+edit :: EditIncomeForm -> ActionM ()
+edit form =
+  Secure.loggedAction (\user ->
+    (liftIO . Query.run $ do
+      case IncomeValidation.editIncome form of
+        Success (EditIncome incomeId amount date) -> do
+          Right <$> (IncomePersistence.edit (_user_id user) incomeId date amount)
+
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
 delete :: IncomeId -> ActionM ()