From c0ea63f8c1a8c7123b78798cec99726b113fb1f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 18:08:28 +0100
Subject: Optimize and refactor payments

---
 server/src/Controller/Category.hs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'server/src/Controller/Category.hs')

diff --git a/server/src/Controller/Category.hs b/server/src/Controller/Category.hs
index e536caa..8fbc8c8 100644
--- a/server/src/Controller/Category.hs
+++ b/server/src/Controller/Category.hs
@@ -5,19 +5,18 @@ module Controller.Category
   , delete
   ) where
 
-import           Control.Monad.IO.Class      (liftIO)
-import qualified Data.Text.Lazy              as TL
-import           Network.HTTP.Types.Status   (badRequest400, ok200)
-import           Web.Scotty                  hiding (delete)
+import           Control.Monad.IO.Class    (liftIO)
+import qualified Data.Text.Lazy            as TL
+import           Network.HTTP.Types.Status (badRequest400, ok200)
+import           Web.Scotty                hiding (delete)
 
-import           Common.Model                (CategoryId, CreateCategory (..),
-                                              EditCategory (..))
-import qualified Common.Msg                  as Msg
+import           Common.Model              (CategoryId, CreateCategory (..),
+                                            EditCategory (..))
+import qualified Common.Msg                as Msg
 
-import           Json                        (jsonId)
-import qualified Model.Query                 as Query
-import qualified Persistence.Category        as CategoryPersistence
-import qualified Persistence.PaymentCategory as PaymentCategoryPersistence
+import           Json                      (jsonId)
+import qualified Model.Query               as Query
+import qualified Persistence.Category      as CategoryPersistence
 import qualified Secure
 
 list :: ActionM ()
@@ -45,10 +44,8 @@ delete :: CategoryId -> ActionM ()
 delete categoryId =
   Secure.loggedAction (\_ -> do
     deleted <- liftIO . Query.run $ do
-      paymentCategories <- PaymentCategoryPersistence.listByCategory categoryId
-      if null paymentCategories
-        then CategoryPersistence.delete categoryId
-        else return False
+      -- TODO: delete only if no payment has this category
+      CategoryPersistence.delete categoryId
     if deleted
       then
         status ok200
-- 
cgit v1.2.3