- fix double notifications (#511)

blumilksoftware · Dec 5, 2024 · a6960ea · a6960ea
1 parent 5dae013
commit a6960ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/Actions/VacationRequest/ApproveAction.php b/app/Actions/VacationRequest/ApproveAction.php
@@ -35,7 +35,10 @@ public function execute(VacationRequest $vacationRequest, ?User $user = null): v
 
     protected function notify(VacationRequest $vacationRequest): void
     {
-        $users = Permission::findByName("receiveVacationRequestStatusChangedNotification")->users()->get();
+        $users = Permission::findByName("receiveVacationRequestStatusChangedNotification")
+            ->users()
+            ->where("id", "!=", $vacationRequest->user->id)
+            ->get();
 
         foreach ($users as $user) {
             $user->notify(new VacationRequestStatusChangedNotification($vacationRequest, $user));

diff --git a/app/Actions/VacationRequest/CancelAction.php b/app/Actions/VacationRequest/CancelAction.php
@@ -35,7 +35,10 @@ public function execute(VacationRequest $vacationRequest, User $user): void
 
     protected function notify(VacationRequest $vacationRequest): void
     {
-        $users = Permission::findByName("receiveVacationRequestStatusChangedNotification")->users()->get();
+        $users = Permission::findByName("receiveVacationRequestStatusChangedNotification")
+            ->users()
+            ->where("id", "!=", $vacationRequest->user->id)
+            ->get();
 
         foreach ($users as $user) {
             $user->notify(new VacationRequestStatusChangedNotification($vacationRequest, $user));