Merge pull request #77 from TheDragonCode/3.x

Fixed status sorting

Author: andrey-helldar

src/Helpers/Sorter.php

@@ -20,6 +20,17 @@ public function byKeys(array $items): array
         return Arr::ksort($items, $this->callback());
     }
 
+    public function byRan(array $actions, array $completed): array
+    {
+        foreach ($this->byValues($actions) as $value) {
+            if (! in_array($value, $completed, true)) {
+                $completed[] = $value;
+            }
+        }
+
+        return $completed;
+    }
+
     protected function callback(): Closure
     {
         return function (string $a, string $b): int {

src/Processors/Status.php

@@ -41,13 +41,18 @@ protected function showCaption(): void
 
     protected function showStatus(array $actions, array $completed): void
     {
-        foreach ($actions as $action) {
+        foreach ($this->merge($actions, array_keys($completed)) as $action) {
             $status = $this->getStatusFor($completed, $action);
 
             $this->notification->twoColumn($action, $status);
         }
     }
 
+    protected function merge(array $actions, array $completed): array
+    {
+        return $this->sorter->byRan($actions, $completed);
+    }
+
     protected function getData(): array
     {
         $files     = $this->getFiles($this->options->path);

tests/Commands/MigrateTest.php

@@ -547,7 +547,6 @@ public function testSorting(): void
         $files[] = date('Y_m_d_His_') . 'test6';
         $this->artisan(Names::MAKE, ['name' => 'test6'])->assertExitCode(0);
 
-        $this->assertDatabaseCount($this->table, 0);
         $this->artisan(Names::MIGRATE)->assertExitCode(0);
         $this->assertDatabaseCount($this->table, 6);
 

tests/Helpers/SorterTest.php

@@ -13,20 +13,20 @@ public function testByValues(): void
     {
         $expected = [
             '2022_10_13_013321_test1',
-            'foo/2022_10_13_013321_test2',
-            'bar/2022_10_13_013321_test3',
-            'foo/2022_10_13_013321_test4',
-            'bar/2022_10_13_013321_test5',
-            '2022_10_13_013321_test6',
+            'foo/2022_10_13_013322_test2',
+            'bar/2022_10_13_013323_test3',
+            'foo/2022_10_13_013324_test4',
+            'bar/2022_10_13_013325_test5',
+            '2022_10_13_013326_test6',
         ];
 
         $values = [
             '2022_10_13_013321_test1',
-            '2022_10_13_013321_test6',
-            'bar/2022_10_13_013321_test3',
-            'bar/2022_10_13_013321_test5',
-            'foo/2022_10_13_013321_test2',
-            'foo/2022_10_13_013321_test4',
+            '2022_10_13_013326_test6',
+            'bar/2022_10_13_013323_test3',
+            'bar/2022_10_13_013325_test5',
+            'foo/2022_10_13_013322_test2',
+            'foo/2022_10_13_013324_test4',
         ];
 
         $this->assertSame($expected, $this->sorter()->byValues($values));
@@ -36,25 +36,54 @@ public function testByKeys(): void
     {
         $expected = [
             '2022_10_13_013321_test1'     => 1,
-            'foo/2022_10_13_013321_test2' => 2,
-            'bar/2022_10_13_013321_test3' => 3,
-            'foo/2022_10_13_013321_test4' => 4,
-            'bar/2022_10_13_013321_test5' => 5,
-            '2022_10_13_013321_test6'     => 6,
+            'foo/2022_10_13_013322_test2' => 2,
+            'bar/2022_10_13_013323_test3' => 3,
+            'foo/2022_10_13_013324_test4' => 4,
+            'bar/2022_10_13_013325_test5' => 5,
+            '2022_10_13_013326_test6'     => 6,
         ];
 
         $values = [
             '2022_10_13_013321_test1'     => 1,
-            '2022_10_13_013321_test6'     => 6,
-            'bar/2022_10_13_013321_test3' => 3,
-            'bar/2022_10_13_013321_test5' => 5,
-            'foo/2022_10_13_013321_test2' => 2,
-            'foo/2022_10_13_013321_test4' => 4,
+            '2022_10_13_013326_test6'     => 6,
+            'bar/2022_10_13_013323_test3' => 3,
+            'bar/2022_10_13_013325_test5' => 5,
+            'foo/2022_10_13_013322_test2' => 2,
+            'foo/2022_10_13_013324_test4' => 4,
         ];
 
         $this->assertSame($expected, $this->sorter()->byKeys($values));
     }
 
+    public function testByRan(): void
+    {
+        $actions = [
+            '2022_10_13_013321_test1',
+            'foo/2022_10_13_013322_test2',
+            'bar/2022_10_13_013323_test3',
+            'foo/2022_10_13_013324_test4',
+            'bar/2022_10_13_013325_test5',
+            '2022_10_13_013326_test6',
+        ];
+
+        $completed = [
+            '2022_10_13_013321_test1',
+            'foo/2022_10_13_013324_test4',
+            'bar/2022_10_13_013325_test5',
+        ];
+
+        $expected = [
+            '2022_10_13_013321_test1',
+            'foo/2022_10_13_013324_test4',
+            'bar/2022_10_13_013325_test5',
+            'foo/2022_10_13_013322_test2',
+            'bar/2022_10_13_013323_test3',
+            '2022_10_13_013326_test6',
+        ];
+
+        $this->assertSame($expected, $this->sorter()->byRan($actions, $completed));
+    }
+
     protected function sorter(): Sorter
     {
         return new Sorter();

tests/TestCase.php

@@ -3,7 +3,9 @@
 namespace Tests;
 
 use DragonCode\LaravelActions\Concerns\Anonymous;
+use DragonCode\LaravelActions\Repositories\ActionRepository;
 use DragonCode\LaravelActions\ServiceProvider;
+use Illuminate\Container\Container;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
@@ -44,4 +46,9 @@ protected function table(): Builder
     {
         return DB::table($this->table);
     }
+
+    protected function repository(): ActionRepository
+    {
+        return Container::getInstance()->make(ActionRepository::class);
+    }
 }