Fix active

Author: rmcdaniel

src/Models/StoredWorkflow.php

@@ -127,8 +127,12 @@ public function active(): self
         $active = $this->fresh();
 
         if ($active->status::class === WorkflowContinuedStatus::class) {
-            $active = $this->activeWorkflow()
+            $continued = $this->activeWorkflow()
                 ->first();
+
+            if ($continued !== null) {
+                $active = $continued;
+            }
         }
 
         return $active;

tests/Feature/ContinueAsNewBatchWorkflowTest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature;
+
+use Tests\Fixtures\TestBatchContinueAsNewWorkflow;
+use Tests\TestCase;
+use Workflow\States\WorkflowCompletedStatus;
+use Workflow\WorkflowStub;
+
+final class ContinueAsNewBatchWorkflowTest extends TestCase
+{
+    public function testBatchActivitiesWithContinueAsNew(): void
+    {
+        $workflow = WorkflowStub::make(TestBatchContinueAsNewWorkflow::class);
+
+        $workflow->start(20);
+
+        while ($workflow->running());
+
+        $this->assertEquals(WorkflowCompletedStatus::class, $workflow->status());
+        $this->assertIsArray($workflow->output());
+        $this->assertCount(20, $workflow->output());
+    }
+}

tests/Fixtures/ProcessRecordActivity.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures;
+
+use Workflow\Activity;
+
+class ProcessRecordActivity extends Activity
+{
+    public function execute(): array
+    {
+        return [
+            'status' => 'done',
+        ];
+    }
+}

tests/Fixtures/TestBatchContinueAsNewWorkflow.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures;
+
+use Workflow\ActivityStub;
+use Workflow\Workflow;
+use Workflow\WorkflowStub;
+
+class TestBatchContinueAsNewWorkflow extends Workflow
+{
+    public function execute(int $maxResults = 20, array $results = [])
+    {
+        while (count($results) < $maxResults) {
+            $activities = [
+                ActivityStub::make(ProcessRecordActivity::class),
+                ActivityStub::make(ProcessRecordActivity::class),
+                ActivityStub::make(ProcessRecordActivity::class),
+                ActivityStub::make(ProcessRecordActivity::class),
+            ];
+
+            $results = array_merge($results, yield ActivityStub::all($activities));
+
+            return yield WorkflowStub::continueAsNew($maxResults, $results);
+        }
+
+        return $results;
+    }
+}