From ef0d71e19e1a754a6e5b46a0c64c8f63bbc48bb7 Mon Sep 17 00:00:00 2001
From: Steffen Jost <s.jost@fraport.de>
Date: Mon, 30 Oct 2023 18:01:12 +0100
Subject: [PATCH] chore(firm): add filter for foreign supervisors

---
 messages/uniworx/categories/firm/de-de-formal.msg |  1 +
 messages/uniworx/categories/firm/en-eu.msg        |  3 ++-
 src/Handler/Firm.hs                               | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/messages/uniworx/categories/firm/de-de-formal.msg b/messages/uniworx/categories/firm/de-de-formal.msg
index 786e57dd6..57f5ddecf 100644
--- a/messages/uniworx/categories/firm/de-de-formal.msg
+++ b/messages/uniworx/categories/firm/de-de-formal.msg
@@ -8,3 +8,4 @@ FirmUserActNotify: Mitteilung versenden
 FirmUserActMkSuper: Zum Firmenansprechpartner ernennen
 FilterSupervisor: Hat aktiven Ansprechpartner
 FilterSupervisorCompany fsh@CompanyShorthand: Hat aktiven Ansprechpartner, der #{fsh} angehört
+FilterSupervisorForeign fsh@CompanyShorthand: Hat aktiven Ansprechpartner, der selbst nicht #{fsh} angehört
diff --git a/messages/uniworx/categories/firm/en-eu.msg b/messages/uniworx/categories/firm/en-eu.msg
index a9e105cc3..9cabba5e9 100644
--- a/messages/uniworx/categories/firm/en-eu.msg
+++ b/messages/uniworx/categories/firm/en-eu.msg
@@ -7,4 +7,5 @@ FirmAllActResetSupervision: Reset supervisors for all company associates
 FirmUserActNotify: Send message
 FirmUserActMkSuper: Mark as company supervisor
 FilterSupervisor: Has active supervisor
-FilterSupervisorCompany fsh: Has active company supervisor belonging to #{fsh}
\ No newline at end of file
+FilterSupervisorCompany fsh: Has active company supervisor belonging to #{fsh}
+FilterSupervisorForeign fsh: Has active supervisor not belonging to #{fsh}
\ No newline at end of file
diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index a41699946..bf24fedb1 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -470,11 +470,25 @@ mkFirmUserTable isAdmin cid = do
                   Nothing     -> E.true
                   Just True   -> E.exists    checkSuper
                   Just False  -> E.notExists checkSuper
+          , singletonMap "has-foreign-supervisor" $ FilterColumn $ \row (getLast -> criterion) -> 
+              let checkSuper = do 
+                    usrSpr <- E.from $ E.table @UserSupervisor
+                    E.where_ $ usrSpr E.^. UserSupervisorUser E.==. queryUserUser row E.^. UserId
+                        E.&&.  E.notExists (do
+                                  spr <- E.from $  E.table @UserCompany
+                                  E.where_ $ spr E.^. UserCompanyCompany E.==. E.val cid
+                                    E.&&.    spr E.^. UserCompanyUser    E.==. usrSpr E.^. UserSupervisorSupervisor
+                                )
+              in case criterion of
+                  Nothing     -> E.true
+                  Just True   -> E.exists    checkSuper
+                  Just False  -> E.notExists checkSuper
           ]
         dbtFilterUI mPrev = mconcat
           [ fltrUserNameEmailHdrUI MsgTableCompanyUser mPrev
           , prismAForm (singletonFilter "has-supervisor"         . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterSupervisor)
           , prismAForm (singletonFilter "has-company-supervisor" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI $ MsgFilterSupervisorCompany fsh)
+          , prismAForm (singletonFilter "has-foreign-supervisor" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI $ MsgFilterSupervisorForeign fsh)
           ]
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
         acts :: Map FirmUserAction (AForm Handler FirmUserActionData)