minor tweaks

Author: tiagof

database/factories/WorkflowTransitionFactory.php

@@ -16,11 +16,11 @@ public function definition(): array
     {
         return [
             /** @phpstan-ignore-next-line */
-            'workflow_id' => WorkflowFactory::new()->create()->id,
+            'workflow_id' => fn() => WorkflowFactory::new()->create()->id,
             /** @phpstan-ignore-next-line */
-            'from_id' => WorkflowStatusFactory::new()->create()->id,
+            'from_id' => fn() => WorkflowStatusFactory::new()->create()->id,
             /** @phpstan-ignore-next-line */
-            'to_id' => WorkflowStatusFactory::new()->create()->id,
+            'to_id' => fn() => WorkflowStatusFactory::new()->create()->id,
             'order' => random_int(1, 999),
         ];
     }

src/Contracts/Workflowable.php

@@ -6,6 +6,8 @@
 
 interface Workflowable
 {
+    public function initWorkflow(int|Workflow $workflow): static;
+
     public function getDefaultWorkflowName(): ?string;
 
     public function getDefaultWorkflow(): ?Workflow;

src/Models/WorkflowStatus.php

@@ -18,7 +18,9 @@ class WorkflowStatus extends Model
 
     public static function findWithName(string $name): ?WorkflowStatus
     {
-        return self::where('name', $name)->first();
+        static $status = [];
+
+        return $status[$name] ?? ($status[$name] = self::where('name', $name)->first());
     }
 
     public function __toString()

src/Traits/HasWorkflows.php

@@ -57,7 +57,9 @@ public function initWorkflow(int|Workflow $workflow): static
     {
         $this->with = array_unique(array_merge($this->with, ['modelStatus']));
 
-        $this->usingWorkflow($workflow);
+        $this->usingWorkflow($workflow)
+            ->loadMissing('modelStatus');
+
         if ($this->modelStatus === null) {
             $this->createModelStatus($workflow, TransitionService::getWorkflowStartStatus($workflow));
         }
@@ -67,12 +69,14 @@ public function initWorkflow(int|Workflow $workflow): static
 
     public function getDefaultWorkflow(): ?Workflow
     {
+        static $workflows = [];
+
         $name = $this->getDefaultWorkflowName();
         if ($name === null) {
             return null;
         }
 
-        return Workflow::where('name', $name)->first();
+        return $workflows[$name] ?? ($workflows[$name] = Workflow::where('name', $name)->first());
     }
 
     /**
@@ -86,6 +90,7 @@ public function getDefaultWorkflowName(): ?string
     public function usingWorkflow(null|int|Workflow $workflow): static
     {
         $this->usingWorkflow = $workflow instanceof Workflow ? $workflow : Workflow::find($workflow);
+
         $this->unsetRelation('modelStatus');
         $this->unsetRelation('modelStatuses');
         $this->unsetRelation('allModelStatus');

tests/Feature/WorkflowTest.php

@@ -17,6 +17,10 @@
     // 2 exits
     WorkflowTransitionFactory::new()->workflow($workflow->id)->from($mid1->to_id)->exit()->create();
     WorkflowTransitionFactory::new()->workflow($workflow->id)->from($mid2->to_id)->exit()->create();
+
+
+    $this->secondaryWorkflow = $workflow = WorkflowFactory::new()->create();
+    WorkflowTransitionFactory::new()->workflow($this->secondaryWorkflow->id)->entry()->create();
 });
 
 test('it has correct relationships', function () {
@@ -50,7 +54,7 @@
     $status = $modelB->getDefaultWorkflow()->entryTransitions->first()->toStatus;
 
     expect($modelB->modelStatus->status)->toEqual($modelB->getStatus())->toEqual($status)
-        ->and($modelB->modelStatus->workflow)->toEqual($modelB->getDefaultWorkflow())
+        ->and($modelB->modelStatus->workflow->id)->toEqual($modelB->getDefaultWorkflow()?->id)
         ->and($modelB->modelStatuses)->toHaveCount(1);
 });
 
@@ -92,6 +96,21 @@
     expect($model->isAllowed($this->mid1))->toBeFalse();
 });
 
+test('it deletes model statuses when model is deleted', function () {
+    ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save();
+    expect(WorkflowModelStatus::count())->toBe(1);
+
+    $model->delete();
+    expect(WorkflowModelStatus::count())->toBe(0);
+});
+
+test('it queries by workflow', function () {
+    ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save();
+
+    expect(WorkflowableModel::query()->inWorkflow($this->workflow->name)->count())->toBe(1)
+    ->and(WorkflowableModel::query()->inWorkflow($this->secondaryWorkflow->name)->count())->toBe(0);
+});
+
 test('it has toString', function () {
     ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save();