Added workflowId to ActivityCompleted and ActivityFailed (laravel-workflow#160)

jbardnz · web-flow · commit 71a86949b09b · 2024-01-30T22:54:23.000-06:00
* Added workflowId to ActivityFailed event

* Added workflowId to ActivityCompleted event
diff --git a/src/Events/ActivityCompleted.php b/src/Events/ActivityCompleted.php
@@ -13,6 +13,7 @@ class ActivityCompleted
     use InteractsWithSockets;
 
     public function __construct(
+        public int|string $workflowId,
         public string $activityId,
         public string $output,
         public string $timestamp,
diff --git a/src/Events/ActivityFailed.php b/src/Events/ActivityFailed.php
@@ -13,6 +13,7 @@ class ActivityFailed
     use InteractsWithSockets;
 
     public function __construct(
+        public int|string $workflowId,
         public string $activityId,
         public string $output,
         public string $timestamp,
diff --git a/src/Middleware/WorkflowMiddleware.php b/src/Middleware/WorkflowMiddleware.php
@@ -44,7 +44,13 @@ public function handle($job, $next): void
             try {
                 $job->storedWorkflow->toWorkflow()
                     ->next($job->index, $job->now, $job::class, $result);
-                ActivityCompleted::dispatch($uuid, json_encode($result), now()->format('Y-m-d\TH:i:s.u\Z'));
+                ActivityCompleted::dispatch(
+                    $job->storedWorkflow->id,
+                    $uuid,
+                    json_encode($result),
+                    now()
+                        ->format('Y-m-d\TH:i:s.u\Z')
+                );
             } catch (\Spatie\ModelStates\Exceptions\TransitionNotFound) {
                 if ($job->storedWorkflow->toWorkflow()->running()) {
                     $job->release();
@@ -54,7 +60,7 @@ public function handle($job, $next): void
             $file = new SplFileObject($throwable->getFile());
             $iterator = new LimitIterator($file, max(0, $throwable->getLine() - 4), 7);
 
-            ActivityFailed::dispatch($uuid, json_encode([
+            ActivityFailed::dispatch($job->storedWorkflow->id, $uuid, json_encode([
                 'class' => get_class($throwable),
                 'message' => $throwable->getMessage(),
                 'code' => $throwable->getCode(),
diff --git a/tests/Unit/Listeners/MonitorActivityCompletedTest.php b/tests/Unit/Listeners/MonitorActivityCompletedTest.php
@@ -33,7 +33,7 @@ public function testHandle(): void
             "rest/v1/activities?id=eq.{$activityId}" => Http::response(),
         ]);
 
-        $event = new ActivityCompleted($activityId, 'output', 'time');
+        $event = new ActivityCompleted(1, $activityId, 'output', 'time');
         $listener = new MonitorActivityCompleted();
         $listener->handle($event);
 
diff --git a/tests/Unit/Listeners/MonitorActivityFailedTest.php b/tests/Unit/Listeners/MonitorActivityFailedTest.php
@@ -33,7 +33,7 @@ public function testHandle(): void
             "rest/v1/activities?id=eq.{$activityId}" => Http::response(),
         ]);
 
-        $event = new ActivityFailed($activityId, 'output', 'time');
+        $event = new ActivityFailed(1, $activityId, 'output', 'time');
         $listener = new MonitorActivityFailed();
         $listener->handle($event);
 
