Fix default order bug.

matrix-lab · Jul 16, 2020 · b43f069 · b43f069
1 parent 11ef4d4
commit b43f069
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/ConditionsGeneratorTrait.php b/src/ConditionsGeneratorTrait.php
@@ -229,7 +229,9 @@ protected function handlePaginate()
                     continue;
                 }
                 $field = substr($sort, 1);
-                $orders[$field] = !array_key_exists($field, $orders) && strpos($sort, '+') === 0 ? 'asc' : 'desc';
+                if (! array_key_exists($field, $orders)) {
+                    $orders[$field] = strpos($sort, '+') === 0 ? 'asc' : 'desc';
+                }
             }
 
             if ($sort instanceof Expression) {

diff --git a/tests/Unit/ConditionGeneratorTrait/HandlePaginate.php b/tests/Unit/ConditionGeneratorTrait/HandlePaginate.php
@@ -27,6 +27,20 @@ public function test_sorts()
         ], Arr::get($conditions, 'order'));
     }
 
+    public function test_over_default_sort()
+    {
+        $fakeRequest = new FakeRequest();
+        $conditions = $fakeRequest->getConditions([
+            'paginator' => [
+                'sort' => '-id',
+            ],
+        ]);
+
+        $this->assertEquals([
+            'id' => 'desc',
+        ], Arr::get($conditions, 'order'));
+    }
+
     public function test_order()
     {
         $fakeRequest = new FakeRequest();