From 4fa7385154852cbf838e8ce841a74de5501df46c Mon Sep 17 00:00:00 2001
From: Steffen Jost <s.jost@fraport.de>
Date: Fri, 17 Nov 2023 18:55:03 +0100
Subject: [PATCH] fix build

---
 src/Handler/Firm.hs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index c55eee0fb..a37f59caa 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -735,15 +735,14 @@ postFirmUsersR fsh = do
 
   formResult fusrRes $ \case    
     (_, uids) | null uids -> addMessageI Error MsgUtilEmptyChoice
-    (FirmUserActMkSuperData{..}, uids) -> do 
-      nrMkSuper <- runDB $ updateWhereCount [UserCompanyUser <-. uids, UserCompanyCompany ==. cid] [UserCompanySupervisor =. True, UserCompanySupervisorReroute =. firmUserActMkSuperReroute]
+    (FirmUserActMkSuperData{..}, Set.toList -> uids) -> do 
+      nrMkSuper <- runDB $ updateWhereCount [UserCompanyUser <-. uids, UserCompanyCompany ==. cid] [UserCompanySupervisor =. True, UserCompanySupervisorReroute =. (firmUserActMkSuperReroute == Just True)]
       addMessageI Info $ MsgASReqSetSupers nrMkSuper Nothing
       reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes
     (FirmUserActNotifyData , uids) -> do
       cuids <- traverse encrypt $ Set.toList uids :: Handler [CryptoUUIDUser]
       redirect (FirmCommR fsh, [(toPathPiece GetRecipient, toPathPiece cID) | cID <- cuids])
-    (FirmUserActResetSupervisionData{..}, Set.toList -> uids') -> do
-      let uids = fromList uids' -- guaranteed to be non-empty due to first case clause
+    (FirmUserActResetSupervisionData{..}, set2NonEmpty (error "Unexpected empty user list in getFirmUserR action handler.") -> uids) -> do  -- set guaranteed to be non-empty due to first case clause
       runDB $ do
         delSupers <- if firmUserActResetKeepOldSupers == Just False
           then deleteSupervisors uids
@@ -946,11 +945,11 @@ postFirmSupersR fsh = do
 
   formResult fsprRes $ \case
     (_, uids) | null uids -> addMessageI Error MsgUtilEmptyChoice
-    (FirmSuperActRMSuperDefData, uids) -> do 
+    (FirmSuperActRMSuperDefData, Set.toList -> uids) -> do 
       nrRmSuper <- runDB $ updateWhereCount [UserCompanyUser <-. uids, UserCompanyCompany ==. cid] [UserCompanySupervisor =. False, UserCompanySupervisorReroute =. False]
       addMessageI Info $ MsgRemoveDefaultSupervisors nrRmSuper
       reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes
-    (FirmSuperActRMSuperAllData, uids) -> addMessage Info $ text2Html $ "Make "  <> tshow (length uids) <> " default and active supervisors. TODO"
+    (FirmSuperActRMSuperAllData, uids) -> addMessage Warning $ text2Html $ "TODO Make "  <> tshow (length uids) <> " default and active supervisors. TODO"
     (FirmSuperActNotifyData    , uids) -> do 
       cuids <- traverse encrypt $ Set.toList uids :: Handler [CryptoUUIDUser]
       redirect (FirmCommR fsh, [(toPathPiece GetRecipient, toPathPiece cID) | cID <- cuids])