From f07e3610bb1e197d4d52cefbeeb476ae14b15607 Mon Sep 17 00:00:00 2001
From: Richard McDaniel <richard.lee.mcdaniel@gmail.com>
Date: Fri, 21 Feb 2025 20:12:33 +0000
Subject: [PATCH] Fix deleted models

---
 src/Middleware/ActivityMiddleware.php         |  3 +
 tests/Fixtures/TestModelNotFoundWorkflow.php  | 19 +++++
 .../Middleware/ActivityMiddlewareTest.php     | 75 +++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 tests/Fixtures/TestModelNotFoundWorkflow.php

diff --git a/src/Middleware/ActivityMiddleware.php b/src/Middleware/ActivityMiddleware.php
index f769722..3f6ea4f 100644
--- 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
new file mode 100644
index 0000000..94d5d48
--- /dev/null
+++ 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
index 9c387a4..b9e94d2 100644
--- 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);
+    }
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/laravel-workflow/laravel-workflow/pull/209.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/laravel-workflow/laravel-workflow/pull/209.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/laravel-workflow/laravel-workflow/pull/209.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/laravel-workflow/laravel-workflow/pull/209.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>