TicketUpdatedJob enhancement

Author: heloufir

app/Http/Livewire/Kanban.php

@@ -123,7 +123,7 @@ public function onStatusChanged($recordId, $statusId, $fromOrderedIds, $toOrdere
                 ->title(__('Status updated'))
                 ->body(__('The ticket status has been successfully updated'))
                 ->send();
-            TicketUpdatedJob::dispatch($ticket, __('Status'), $before, __(config('system.statuses.' . $ticket->status . '.title') ?? '-'));
+            TicketUpdatedJob::dispatch($ticket, __('Status'), $before, __(config('system.statuses.' . $ticket->status . '.title') ?? '-'), auth()->user());
         } else {
             Notification::make()
                 ->success()

app/Http/Livewire/TicketDetails/Content.php

@@ -79,6 +79,6 @@ public function save(): void
         ]);
         $this->updating = false;
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Content'), htmlspecialchars(strip_tags($before)), htmlspecialchars(strip_tags($this->ticket->content)));
+        TicketUpdatedJob::dispatch($this->ticket, __('Content'), htmlspecialchars(strip_tags($before)), htmlspecialchars(strip_tags($this->ticket->content)), auth()->user());
     }
 }

app/Http/Livewire/TicketDetails/Priority.php

@@ -79,6 +79,6 @@ public function save(): void
         ]);
         $this->updating = false;
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Priority'), $before, __(config('system.priorities.' . $this->ticket->priority . '.title') ?? '-'));
+        TicketUpdatedJob::dispatch($this->ticket, __('Priority'), $before, __(config('system.priorities.' . $this->ticket->priority . '.title') ?? '-'), auth()->user());
     }
 }

app/Http/Livewire/TicketDetails/Responsible.php

@@ -80,7 +80,7 @@ public function save(): void
         $this->updating = false;
         $this->ticket = $this->ticket->refresh();
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Responsible'), $before, ($this->ticket->responsible?->name ?? '-'));
+        TicketUpdatedJob::dispatch($this->ticket, __('Responsible'), $before, ($this->ticket->responsible?->name ?? '-'), auth()->user());
     }
 
     /**

app/Http/Livewire/TicketDetails/Status.php

@@ -78,6 +78,6 @@ public function save(): void
         ]);
         $this->updating = false;
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Status'), $before, __(config('system.statuses.' . $this->ticket->status . '.title') ?? '-'));
+        TicketUpdatedJob::dispatch($this->ticket, __('Status'), $before, __(config('system.statuses.' . $this->ticket->status . '.title') ?? '-'), auth()->user());
     }
 }

app/Http/Livewire/TicketDetails/Title.php

@@ -77,6 +77,6 @@ public function save(): void
         ]);
         $this->updating = false;
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Title'), $before, $this->ticket->title);
+        TicketUpdatedJob::dispatch($this->ticket, __('Title'), $before, $this->ticket->title, auth()->user());
     }
 }

app/Http/Livewire/TicketDetails/Type.php

@@ -78,6 +78,6 @@ public function save(): void
         ]);
         $this->updating = false;
         $this->emit('ticketSaved');
-        TicketUpdatedJob::dispatch($this->ticket, __('Type'), $before, __(config('system.types.' . $this->ticket->type . '.title') ?? '-'));
+        TicketUpdatedJob::dispatch($this->ticket, __('Type'), $before, __(config('system.types.' . $this->ticket->type . '.title') ?? '-'), auth()->user());
     }
 }

app/Jobs/TicketUpdatedJob.php

@@ -7,6 +7,7 @@
 use App\Notifications\CommentCreateNotification;
 use App\Notifications\TicketUpdatedNotification;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -21,18 +22,20 @@ class TicketUpdatedJob implements ShouldQueue
     private string $field;
     private string $before;
     private string $after;
+    private User|Authenticatable $user;
 
     /**
      * Create a new job instance.
      *
      * @return void
      */
-    public function __construct(Ticket $ticket, string $field, string $before, string $after)
+    public function __construct(Ticket $ticket, string $field, string $before, string $after, User|Authenticatable $user)
     {
         $this->ticket = $ticket;
         $this->field = $field;
         $this->before = $before;
         $this->after = $after;
+        $this->user = $user;
     }
 
     /**
@@ -43,14 +46,14 @@ public function __construct(Ticket $ticket, string $field, string $before, strin
     public function handle()
     {
         if ($this->before !== $this->after) {
-            $users = User::whereNull('register_token')->get();
-            foreach ($users as $user) {
+            $users = User::whereNull('register_token')->where('id', '<>', $this->user->id)->get();
+            foreach ($users as $u) {
                 if (
-                    (has_all_permissions($user, 'view-all-tickets') && $this->ticket->owner_id !== $user->id)
+                    (has_all_permissions($u, 'view-all-tickets') && $this->ticket->owner_id !== $u->id)
                     ||
-                    (has_all_permissions($user, 'view-own-tickets') && ($this->ticket->owner_id === $user->id || $this->ticket->responsible_id === $user->id) && $this->ticket->owner_id !== $user->id)
+                    (has_all_permissions($u, 'view-own-tickets') && ($this->ticket->owner_id === $u->id || $this->ticket->responsible_id === $u->id) && $this->ticket->owner_id !== $u->id)
                 ) {
-                    $user->notify(new TicketUpdatedNotification($this->ticket, $this->field, $this->before, $this->after, $user));
+                    $u->notify(new TicketUpdatedNotification($this->ticket, $this->field, $this->before, $this->after, $this->user));
                 }
             }
         }