- multiple guard fix

- new tests added
AuroraWebSoftware · Nov 4, 2023 · e106b0f · e106b0f
1 parent 6c3af80
commit e106b0f
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 17 deletions.
diff --git a/README-todo.md b/README-todo.md
@@ -8,8 +8,10 @@ https://github.com/sebdesign/laravel-state-machine
 - history testleri
 - kanban boards
 - test coverage %90
-
-
+- geçişlerde veya fail’lerde event’lerin dispatch edilmesi
+- eğer hiç guard yoksa geçemiyor. geçebilmeli
+- drop column testleri
+- metadata ların kayıt edilip edilememesi test yazılması
 
 ## in progress
 - arflow facade'ı içine

diff --git a/README.md b/README.md
@@ -371,8 +371,8 @@ docker-compose up -d
 ```shell
 composer format
 composer analyse
+composer test
 composer test-coverage
-composer analyse
 ```
 
 

diff --git a/src/Collections/TransitionGuardResultCollection.php b/src/Collections/TransitionGuardResultCollection.php
@@ -16,21 +16,28 @@ class TransitionGuardResultCollection extends Collection
 
     public function allowed(): bool
     {
-        $allowed = false;
+        foreach ($this as $collection) {
+
+            /**
+             * @var Collection<int, TransitionGuardResultDTO> $collection
+             */
+            $allowed = true;
+            foreach ($collection as $transitionGuardResultDTO) {
+
+                /**
+                 * @var TransitionGuardResultDTO $transitionGuardResultDTO
+                 */
+                if ($transitionGuardResultDTO->status == TransitionGuardResultDTO::DISALLOWED) {
+                    $allowed = false;
+                }
+            }
 
-        $this->each(
-            function (Collection $collection) use (&$allowed) {
-                $collection->each(
-                    function (TransitionGuardResultDTO $transitionGuardResultDTO) use (&$allowed) {
-                        if ($transitionGuardResultDTO->status == TransitionGuardResultDTO::ALLOWED) {
-                            $allowed = true;
-                        }
-                    }
-                );
+            if ($allowed) {
+                return true;
             }
-        );
+        }
 
-        return $allowed;
+        return false;
     }
 
     /**

diff --git a/tests/Models/Stateable.php b/tests/Models/Stateable.php
@@ -12,6 +12,6 @@ class Stateable extends Model implements StateableModelContract
 
     public static function supportedWorkflows(): array
     {
-        return ['workflow1', 'workflow3'];
+        return ['workflow1', 'workflow3', 'workflow4'];
     }
 }
diff --git a/tests/PackageTest.php b/tests/PackageTest.php
@@ -94,6 +94,32 @@
                         'states' => ['todo', 'in_progress', 'done', 'cancelled'],
                         'initial_state' => 'todo',
                     ],
+                    'workflow4' => [
+                        'states' => ['todo', 'in_progress', 'done'],
+                        'initial_state' => 'todo',
+                        'transitions' => [
+                            'transtion1' => [
+                                'from' => ['todo'],
+                                'to' => 'in_progress',
+                                'guards' => [],
+                                'actions' => [],
+                                'success_metadata' => ['asd' => 'asd'],
+                                'success_jobs' => [TestTransitionSuccessJob::class],
+                            ],
+                            'transtion2' => [
+                                'from' => ['todo'],
+                                'to' => ['done'],
+                                'guards' => [
+                                    [TestDisallowedTransitionGuard::class, ['permission' => 'represtative_approval']],
+                                ],
+                                'actions' => [
+                                    [TestSuccessTransitionAction::class, ['a' => 'b']],
+                                ],
+                                'success_metadata' => ['asd' => 'asd'],
+                                'success_jobs' => [],
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ]
@@ -206,7 +232,7 @@
     $modelInstance->applyWorkflow($workflow);
     $resultCollection = $modelInstance->transitionGuardResults($toState);
     $this->assertEquals($resultCollection->count(), 2);
-    $this->assertEquals($resultCollection->allowed(), TransitionGuardResultDTO::ALLOWED);
+    $this->assertEquals($resultCollection->allowed(), true);
 
     $resultCollection->get('transtion1')
         ->each(fn (TransitionGuardResultDTO $item) => expect($item->allowed())->toBeTrue());
@@ -373,3 +399,24 @@
         ->toContain('todo', 'in_progress', 'done', 'cancelled', 'in_review', 'on_going')
         ->toHaveCount(6);
 });
+
+it('can transition to an non-guarded and non actioned state', function () {
+    Queue::fake();
+
+    $name = 'name100';
+    $workflow = 'workflow4';
+    $toState = 'in_progress';
+
+    /**
+     * @var StateableModelContract & Model $modelInstance
+     */
+    $modelInstance = Stateable::create(
+        ['name' => $name]
+    );
+
+    $modelInstance->applyWorkflow($workflow);
+    $modelInstance->transitionTo($toState);
+
+    expect($modelInstance->currentState())->toEqual($toState);
+    Queue::assertPushed(TestTransitionSuccessJob::class);
+});