Add exception for deleting member

app/Lib/Events/JobFailed.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Lib\Events;
+
+class JobFailed extends JobEvent
+{
+}

app/Lib/JobMiddleware/WithJobState.php

@@ -2,16 +2,19 @@
 
 namespace App\Lib\JobMiddleware;
 
+use App\Lib\Events\JobFailed;
 use App\Lib\Events\JobFinished;
 use App\Lib\Events\JobStarted;
 use Closure;
 use Lorisleiva\Actions\Decorators\JobDecorator;
+use Throwable;
 
 class WithJobState
 {
 
     public JobStarted $beforeMessage;
     public JobFinished $afterMessage;
+    public JobFailed $failedMessage;
 
     private function __construct(public string $channel)
     {
@@ -36,9 +39,17 @@ class WithJobState
         return $this;
     }
 
+    public function failed(string $message): self
+    {
+        $this->failedMessage = JobFailed::on($this->channel)->withMessage($message);
+
+        return $this;
+    }
+
     public function shouldReload(): self
     {
         $this->afterMessage->shouldReload();
+        $this->failedMessage->shouldReload();
 
         return $this;
     }
@@ -46,7 +57,14 @@ class WithJobState
     public function handle(JobDecorator $job, Closure $next): void
     {
         event($this->beforeMessage);
+
+        try {
             $next($job);
+        } catch (Throwable $e) {
+            event($this->failedMessage);
+            throw $e;
+        }
+
         event($this->afterMessage);
     }
 }

app/Member/Actions/MemberDeleteAction.php

@@ -43,6 +43,7 @@ class MemberDeleteAction
             WithJobState::make('member')
                 ->before('Lösche Mitglied ' . $member->fullname)
                 ->after('Mitglied ' . $member->fullname . ' gelöscht')
+                ->failed('Löschen von ' . $member->fullname . ' fehlgeschlagen.')
                 ->shouldReload(),
         ];
     }

resources/js/composables/useIndex.js

@@ -61,9 +61,9 @@ export function useIndex(props, siteName) {
         };
     }
 
-    function handleJobEvent(event) {
+    function handleJobEvent(event, type = 'success') {
         if (event.message) {
-            toast.success(event.message);
+            toast[type](event.message);
         }
         if (event.reload) {
             reload(false);
@@ -73,7 +73,8 @@ export function useIndex(props, siteName) {
     window.Echo.channel('jobs').listen('\\App\\Lib\\Events\\ClientMessage', (e) => handleJobEvent(e));
     window.Echo.channel(siteName)
         .listen('\\App\\Lib\\Events\\JobStarted', (e) => handleJobEvent(e))
-        .listen('\\App\\Lib\\Events\\JobFinished', (e) => handleJobEvent(e));
+        .listen('\\App\\Lib\\Events\\JobFinished', (e) => handleJobEvent(e))
+        .listen('\\App\\Lib\\Events\\JobFailed', (e) => handleJobEvent(e, 'error'));
     onBeforeUnmount(() => window.Echo.leave(siteName));
     onBeforeUnmount(() => window.Echo.leave('jobs'));
 

tests/Feature/Member/DeleteTest.php

@@ -4,16 +4,18 @@ namespace Tests\Feature\Member;
 
 use App\Course\Models\Course;
 use App\Course\Models\CourseMember;
-use App\Lib\Events\ClientMessage;
+use App\Lib\Events\JobFailed;
 use App\Lib\Events\JobFinished;
 use App\Lib\Events\JobStarted;
 use App\Member\Actions\MemberDeleteAction;
 use App\Member\Actions\NamiDeleteMemberAction;
 use App\Member\Member;
+use Exception;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
+use Throwable;
 
 class DeleteTest extends TestCase
 {
@@ -76,4 +78,21 @@ class DeleteTest extends TestCase
         Event::assertDispatched(JobStarted::class, fn ($event) => $event->broadcastOn()->name === 'member' && $event->message === 'Lösche Mitglied Max Muster' && $event->reload === false);
         Event::assertDispatched(JobFinished::class, fn ($event) => $event->message === 'Mitglied Max Muster gelöscht' && $event->reload === true);
     }
+
+    public function testItFiresEventWhenDeletingFailed(): void
+    {
+        Event::fake([JobStarted::class, JobFinished::class, JobFailed::class]);
+        $this->login()->loginNami();
+        $member = Member::factory()->defaults()->create(['firstname' => 'Max', 'lastname' => 'Muster']);
+        MemberDeleteAction::partialMock()->shouldReceive('handle')->andThrow(new Exception('sorry'));
+
+        try {
+            MemberDeleteAction::dispatch($member->id);
+        } catch (Throwable) {
+        }
+
+        Event::assertDispatched(JobStarted::class, fn ($event) => $event->broadcastOn()->name === 'member' && $event->message === 'Lösche Mitglied Max Muster' && $event->reload === false);
+        Event::assertDispatched(JobFailed::class, fn ($event) => $event->message === 'Löschen von Max Muster fehlgeschlagen.' && $event->reload === true);
+        Event::assertNotDispatched(JobFinished::class);
+    }
 }