Merge pull request #370 from jhandel/HierarchicalSecurity

Fix to handle deactivating "older" warrants when a new one is issued.
Ansteorra · Mar 4, 2025 · dbd177d · dbd177d
2 parents 276d900 + 14b886f
commit dbd177d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/app/src/Services/WarrantManager/DefaultWarrantManager.php b/app/src/Services/WarrantManager/DefaultWarrantManager.php
@@ -168,6 +168,24 @@ public function approve($warrant_roster_id, $approver_id): ServiceResult
                     $warrantRosterTable->getConnection()->rollback();
                     return new ServiceResult(false, "Failed to acivate warrants in Roster");
                 }
+                //expire current warrants for the same entity_type entity_id member_id
+                $warrantTable->updateAll(
+                    [
+                        'status' => Warrant::DEACTIVATED_STATUS,
+                        'expires_on' => $warrant->start_on,
+                        'revoked_reason' => "New Warrant Approved",
+                        'revoker_id' => $approver_id
+                    ],
+                    [
+                        'entity_type' => $warrant->entity_type,
+                        'entity_id' => $warrant->entity_id,
+                        'member_id' => $warrant->member_id,
+                        'status' => Warrant::CURRENT_STATUS,
+                        'expires_on >=' => $warrant->start_on,
+                        'start_on <=' => $warrant->start_on,
+                        'id !=' => $warrant->id
+                    ]
+                );
                 $vars = [
                     "memberScaName" => $warrant->member->sca_name,
                     "warrantName" => $warrant->name,
@@ -415,4 +433,4 @@ protected function declineWarrant($warrantTable, $warrant, $rejecter_id, $reason
         }
         return new ServiceResult(true);
     }
-}
+}
diff --git a/app/templates/email/text/notify_of_warrant.php b/app/templates/email/text/notify_of_warrant.php
@@ -5,5 +5,7 @@
 
 If this warrant is for an office that extends passed this warrant date, new warrants will be issued as needed.
 
+This new warrant supersedes any previous warrants issued for for the subjects this warrant covers.
+
 Thank you
 <?= $siteAdminSignature ?>.