From 577a2fb45d8274f26677275f9fc892ac64afa3e6 Mon Sep 17 00:00:00 2001
From: Steffen Jost <s.jost@fraport.de>
Date: Thu, 23 Nov 2023 18:29:12 +0100
Subject: [PATCH] refactor(firm): FirmAllR messaging no longer works now What
 did change? Nothing here is essential?!

---
 src/Handler/Firm.hs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index 5014bec27..bbb69ad23 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -437,7 +437,7 @@ resultAllCompanyDefaultReroutes   :: Lens' AllCompanyTableData Bool
 resultAllCompanyDefaultReroutes   = _dbrOutput . _4 . _unValue
 
 
-mkFirmAllTable :: Bool -> UserId -> DB (FormResult (FirmAllActionData, Set CompanyId), Widget)
+mkFirmAllTable :: Bool -> UserId -> DB (FormResult (FirmActionData, Set CompanyId), Widget)
 mkFirmAllTable isAdmin uid = do
   -- now <- liftIO getCurrentTime
   let
@@ -554,12 +554,12 @@ mkFirmAllTable isAdmin uid = do
           , prismAForm (singletonFilter "company-postal"     . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterFirmExtern)
           ]
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
-        acts :: Map FirmAllAction (AForm Handler FirmAllActionData)
+        acts :: Map FirmAction (AForm Handler FirmActionData)
         acts = mconcat
-          [ singletonMap FirmAllActNotify           $ pure FirmAllActNotifyData
-          , singletonMap FirmAllActResetSupervision $      FirmAllActResetSupervisionData
-              <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFirmAllActResetSuperKeep)         (Just $ Just False)
-              <*> aopt checkBoxField                                      (fslI MsgFirmAllActResetMutualSupervision) (Just $ Just True )
+          [ singletonMap FirmActNotify           $ pure FirmActNotifyData
+          , singletonMap FirmActResetSupervision $      FirmActResetSupervisionData
+              <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFirmActResetSuperKeep)         (Just $ Just False)
+              <*> aopt checkBoxField                                      (fslI MsgFirmActResetMutualSupervision) (Just $ Just True )
           ]
 
         dbtParams = DBParamsForm
@@ -583,8 +583,8 @@ mkFirmAllTable isAdmin uid = do
         dbtCsvDecode = Nothing
         dbtExtraReps = []
 
-    postprocess :: FormResult (First FirmAllActionData, DBFormResult CompanyId Bool AllCompanyTableData)
-                -> FormResult (      FirmAllActionData, Set CompanyId)
+    postprocess :: FormResult (First FirmActionData, DBFormResult CompanyId Bool AllCompanyTableData)
+                -> FormResult (      FirmActionData, Set CompanyId)
     postprocess inp = do
         (First (Just act), cmpMap) <- inp
         let cmpSet = Map.keysSet . Map.filter id $ getDBFormResult (const False) cmpMap
@@ -606,9 +606,9 @@ postFirmAllR = do
   formResult firmRes $ \case    
     (_, fids) | null fids -> addMessageI Error MsgNoCompanySelected
 
-    (FirmAllActResetSupervisionData{..}, fids) -> do
+    (FirmActResetSupervisionData{..}, fids) -> do
       runDB $ do
-        delSupers <- if firmAllActResetKeepOldSupers == Just False
+        delSupers <- if firmActResetKeepOldSupers == Just False
           then E.deleteCount $ do
                 spr <- E.from $ E.table @UserSupervisor
                 E.where_ $ E.exists $ do
@@ -616,11 +616,11 @@ postFirmAllR = do
                   E.where_ $ usr E.^. UserCompanyCompany `E.in_` E.vals fids
                       E.&&.  usr E.^. UserCompanyUser E.==. spr E.^. UserSupervisorUser 
           else return 0 
-        newSupers <- addDefaultSupervisorsAll (firmAllActResetMutualSupervision /= Just False) fids         
+        newSupers <- addDefaultSupervisorsAll (firmActResetMutualSupervision /= Just False) fids         
         addMessageI Info $ MsgFirmResetSupervision delSupers newSupers
       reloadKeepGetParams FirmAllR -- reload to reflect changes
 
-    (FirmAllActNotifyData          , Set.toList -> fids) -> do
+    (FirmActNotifyData          , Set.toList -> fids) -> do
       usrs <- runDB $ E.select $ E.distinct $ do
         (usr :& uc) <- E.from $ E.table @User `E.innerJoin` E.table @UserCompany `E.on` (\(emp :& uc) -> emp E.^. UserId E.==. uc E.^. UserCompanyUser)
         E.where_ $ uc E.^. UserCompanyCompany `E.in_` E.valList fids
@@ -818,8 +818,8 @@ mkFirmUserTable isAdmin cid = do
         acts = mconcat
           [ singletonMap FirmUserActNotify      $ pure FirmUserActNotifyData
           , singletonMap FirmUserActResetSupervision $ FirmUserActResetSupervisionData
-              <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFirmAllActResetSuperKeep)         (Just $ Just False)
-              -- <*> aopt checkBoxField                                      (fslI MsgFirmAllActResetMutualSupervision) (Just $ Just True )
+              <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFirmActResetSuperKeep)         (Just $ Just False)
+              -- <*> aopt checkBoxField                                      (fslI MsgFirmActResetMutualSupervision) (Just $ Just True )
           , singletonMap FirmUserActMkSuper $ FirmUserActMkSuperData
               <$> aopt checkBoxField (fslI MsgTableIsDefaultReroute) (Just $ Just True)
           ]
@@ -848,7 +848,7 @@ mkFirmUserTable isAdmin cid = do
         let s = Map.keysSet . Map.filter id $ getDBFormResult (const False) m
         return (act, s)
 
-    -- resultDBTableValidator :: PSValidator (MForm Handler) (FormResult (First FirmAllActionData, DBFormResult CompanyId Bool FirmAllActionData))
+    -- resultDBTableValidator :: PSValidator (MForm Handler) (FormResult (First FirmActionData, DBFormResult CompanyId Bool FirmActionData))
     resultDBTableValidator = def
       & defaultSorting  [SortAscBy "user-name"]
   over _1 postprocess <$> dbTable resultDBTableValidator resultDBTable