Optimize default condition order logic

Add default order and sorts unit tests

src/ConditionsGeneratorTrait.php

@@ -221,20 +221,22 @@ protected function handlePaginate()
             Arr::forget($this->inputArgs, 'paginator.sorts');
         }
         $sorts = collect(array_values(array_unique($sorts)))->filter();
-        $sorts = collect($this->order())->merge($sorts);
+        $sorts = collect($sorts)->merge($this->order());
         $orders = [];
         foreach ($sorts as $sort) {
             if (is_string($sort)) {
                 if (! starts_with($sort, ['+', '-'])) {
                     continue;
                 }
-                $orders[substr($sort, 1)] = strpos($sort, '+') === 0 ? 'asc' : 'desc';
+                $field = substr($sort, 1);
+                $orders[$field] = !array_key_exists($field, $orders) && strpos($sort, '+') === 0 ? 'asc' : 'desc';
             }
 
             if ($sort instanceof Expression) {
                 $orders[] = $sort;
             }
         }
+
         $this->appendConditions(['order' => $orders]);
 
         return $this;

tests/Unit/AdvancedSearchTrait/GetCountTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use Tests\DBTestCase;
 use Tests\Utils\Models\User;

tests/Unit/AdvancedSearchTrait/GetListQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use Tests\DBTestCase;
 use Tests\Utils\Models\User;

tests/Unit/AdvancedSearchTrait/GetListTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use Tests\DBTestCase;
 use Tests\Utils\Models\User;

tests/Unit/AdvancedSearchTrait/MakeComboQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use MatrixLab\LaravelAdvancedSearch\ModelScope;
 use Tests\DBTestCase;

tests/Unit/AdvancedSearchTrait/OrderSearchTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use MatrixLab\LaravelAdvancedSearch\ModelScope;
 use Tests\DBTestCase;

tests/Unit/AdvancedSearchTrait/SimpleLikeSearchTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use Tests\DBTestCase;
 use Tests\Utils\Models\User;

tests/Unit/AdvancedSearchTrait/SortOutWhereConditionsProTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use Tests\DBTestCase;
 use Tests\Utils\Models\User;

tests/Unit/AdvancedSearchTrait/WhereSearchTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\AdvancedSearchTrait;
 
 use MatrixLab\LaravelAdvancedSearch\ModelScope;
 use Tests\DBTestCase;

tests/Unit/ConditionGeneratorTrait/HandlePaginate.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Unit\ConditionGeneratorTrait;
+
+use Illuminate\Support\Arr;
+use Tests\DBTestCase;
+use Tests\Utils\FakeRequest;
+use Tests\Utils\Models\User;
+
+class HandlePaginate extends DBTestCase
+{
+    public function test_sorts()
+    {
+        $fakeRequest = new FakeRequest();
+        $conditions = $fakeRequest->getConditions([
+            'paginator' => [
+                'sorts' => [
+                    '+rank',
+                    '-id',
+                ],
+            ],
+        ]);
+
+        $this->assertEquals([
+            'rank' => 'asc',
+            'id' => 'desc',
+        ], Arr::get($conditions, 'order'));
+    }
+
+    public function test_order()
+    {
+        $fakeRequest = new FakeRequest();
+        $conditions = $fakeRequest->getConditions([]);
+
+        $this->assertEquals([
+            'id' => 'asc',
+        ], Arr::get($conditions, 'order'));
+    }
+}

tests/Utils/FakeRequest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Utils;
+
+use MatrixLab\LaravelAdvancedSearch\ConditionsGeneratorTrait;
+
+class FakeRequest
+{
+    use ConditionsGeneratorTrait;
+
+    protected function order()
+    {
+        return '+id';
+    }
+}