laravel-workflow · rmcdaniel · Feb 21, 2025 · Feb 21, 2025
diff --git a/src/Middleware/ActivityMiddleware.php b/src/Middleware/ActivityMiddleware.php
@@ -41,6 +41,9 @@ public function handle($job, $next): void
                     now()
                         ->format('Y-m-d\TH:i:s.u\Z')
                 );
+            } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $throwable) {
+                $job->storedWorkflow->toWorkflow()
+                    ->fail($throwable);
             } catch (\Spatie\ModelStates\Exceptions\TransitionNotFound) {
                 if ($job->storedWorkflow->toWorkflow()->running()) {
                     $job->release();

diff --git a/tests/Fixtures/TestModelNotFoundWorkflow.php b/tests/Fixtures/TestModelNotFoundWorkflow.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures;
+
+use Workflow\Models\StoredWorkflowLog;
+use Workflow\Workflow;
+
+class TestModelNotFoundWorkflow extends Workflow
+{
+    public $connection = 'redis';
+
+    public $queue = 'default';
+
+    public function execute(StoredWorkflowLog $log)
+    {
+    }
+}
diff --git a/tests/Unit/Middleware/ActivityMiddlewareTest.php b/tests/Unit/Middleware/ActivityMiddlewareTest.php
@@ -5,10 +5,12 @@
 namespace Tests\Unit\Middleware;
 
 use Exception;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
 use Mockery\MockInterface;
 use Tests\Fixtures\TestActivity;
+use Tests\Fixtures\TestModelNotFoundWorkflow;
 use Tests\Fixtures\TestWorkflow;
 use Tests\TestCase;
 use Workflow\Events\ActivityCompleted;
@@ -17,6 +19,7 @@
 use Workflow\Middleware\ActivityMiddleware;
 use Workflow\Models\StoredWorkflow;
 use Workflow\States\WorkflowCompletedStatus;
+use Workflow\States\WorkflowFailedStatus;
 use Workflow\States\WorkflowRunningStatus;
 use Workflow\States\WorkflowWaitingStatus;
 use Workflow\WorkflowStub;
@@ -151,4 +154,76 @@ public function testException(): void
         Event::assertDispatched(ActivityFailed::class);
         Queue::assertPushed(TestWorkflow::class, 1);
     }
+
+    public function testModelNotFoundException(): void
+    {
+        Event::fake();
+        Queue::fake();
+
+        $workflow = WorkflowStub::make(TestWorkflow::class);
+        $workflow->start();
+
+        $storedWorkflow = StoredWorkflow::findOrFail($workflow->id());
+        $storedWorkflow->update([
+            'status' => WorkflowWaitingStatus::class,
+        ]);
+
+        $activity = $this->mock(TestActivity::class);
+        $activity->index = 0;
+        $activity->now = now()
+            ->toDateTimeString();
+        $activity->storedWorkflow = $storedWorkflow;
+
+        $middleware = new ActivityMiddleware();
+
+        try {
+            $middleware->handle($activity, static function ($job) {
+                throw new ModelNotFoundException('test');
+            });
+        } catch (Exception $exception) {
+            $this->assertSame('test', $exception->getMessage());
+        }
+
+        Event::assertDispatched(ActivityStarted::class);
+        Event::assertDispatched(ActivityFailed::class);
+        Queue::assertPushed(TestWorkflow::class, 1);
+
+        $this->assertSame(WorkflowWaitingStatus::class, $workflow->status());
+    }
+
+    public function testModelNotFoundExceptionInNextMethod(): void
+    {
+        Event::fake();
+        Queue::fake();
+
+        $deletedWorkflow = StoredWorkflow::create([
+            'class' => TestWorkflow::class,
+        ]);
+
+        $workflow = WorkflowStub::make(TestModelNotFoundWorkflow::class);
+        $workflow->start($deletedWorkflow);
+
+        $storedWorkflow = StoredWorkflow::findOrFail($workflow->id());
+        $storedWorkflow->update([
+            'status' => WorkflowWaitingStatus::class,
+        ]);
+
+        $deletedWorkflow->delete();
+
+        $activity = $this->mock(TestActivity::class);
+        $activity->index = 0;
+        $activity->now = now()
+            ->toDateTimeString();
+        $activity->storedWorkflow = $storedWorkflow;
+
+        $middleware = new ActivityMiddleware();
+
+        $middleware->handle($activity, static function ($job) {
+            return true;
+        });
+
+        $this->assertSame(WorkflowFailedStatus::class, $workflow->status());
+
+        Queue::assertPushed(TestWorkflow::class, 0);
+    }
 }