Merge pull request #5 from efureev/add-sorting-restrictions

Add sorting restrictions and rework Sortable booting

Author: efureev

src/Sorting/Model/Sortable.php

@@ -32,7 +32,7 @@ trait Sortable
      *
      * @return void
      */
-    protected static function defaultSortableBooting()
+    protected static function bootSortable()
     {
         if (static::$sortingGlobalScope) {
             static::addGlobalScope(
@@ -91,14 +91,20 @@ protected function normalizeSortingPosition($sortingPosition)
      */
     protected function formDefaultSQL(): string
     {
+        $where = '';
+        $defaultSortingRestrictions = $this->getDefaultSortingRestrictionsSql();
+        if ($defaultSortingRestrictions) {
+            $where .= "WHERE {$defaultSortingRestrictions}";
+        }
+
         return <<<SQL
 (SELECT
       CASE
         WHEN MAX(sorting_position) IS NOT NULL 
             THEN MAX(sorting_position) + 1
         ELSE 1
       END
-FROM {$this->getTable()})
+FROM {$this->getTable()} {$where})
 SQL;
     }
 
@@ -136,6 +142,15 @@ public function downInSorting(int $steps)
         return $this;
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    protected function forSortingRestrictions(Builder $query): Builder
+    {
+        return $query;
+    }
+
     /**
      * @param int $oldPosition
      * @param int $newPosition
@@ -173,8 +188,10 @@ function (Blueprint $blueprint) {
      */
     protected function incrementInReorder(int $oldPosition, int $newPosition): void
     {
-        static::where('sorting_position', '>=', $newPosition)
-            ->where('sorting_position', '<', $oldPosition)
+        $this->forSortingRestrictions(
+            static::where('sorting_position', '>=', $newPosition)
+                ->where('sorting_position', '<', $oldPosition)
+        )
             ->increment('sorting_position');
     }
 
@@ -184,8 +201,18 @@ protected function incrementInReorder(int $oldPosition, int $newPosition): void
      */
     protected function decrementInReorder(int $oldPosition, int $newPosition): void
     {
-        static::where('sorting_position', '<=', $newPosition)
-            ->where('sorting_position', '>', $oldPosition)
+        $this->forSortingRestrictions(
+            static::where('sorting_position', '<=', $newPosition)
+                ->where('sorting_position', '>', $oldPosition)
+        )
             ->decrement('sorting_position');
     }
+
+    /**
+     * @return string
+     */
+    protected function getDefaultSortingRestrictionsSql(): string
+    {
+        return '';
+    }
 }

tests/Functional/CasterTraitTest.php

@@ -89,9 +89,7 @@ public function testCreateAndGetWithFillArrayParams(): void
                 'str'       => 'string',
                 'str_empty' => 'string empty',
                 'int'       => 7,
-                'config'    => [
-                    'key' => 2,
-                ],
+                'config'    => ['key' => 2],
                 'params'    => [
                     'key'       => 1,
                     'config'    => ['test' => 'value'],
@@ -140,9 +138,7 @@ public function testCreateAndGetWithClassParams(): void
             [
                 'str_empty' => null,
                 'config'    => [
-                    'key' => [
-                        'key' => 2,
-                    ],
+                    'key' => ['key' => 2],
                 ],
                 'params'    => new Params(
                     [

tests/Functional/PgArrayTraitTest.php

@@ -4,7 +4,6 @@
 
 namespace Php\Support\Laravel\Tests\Functional;
 
-
 use Php\Support\Laravel\Tests\TestClasses\Models\PgArrayModel;
 
 class PgArrayTraitTest extends AbstractFunctionalTestCase
@@ -70,5 +69,4 @@ protected function setUp(): void
 
         $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
     }
-
 }

tests/Functional/UuidTraitTest.php

@@ -12,7 +12,6 @@
 use Php\Support\Laravel\Tests\TestClasses\Models\TestModel;
 use Php\Support\Laravel\Tests\TestClasses\Policies\TestModelPolicy;
 
-
 class AuthorizedTest extends AbstractTestCase
 {
     protected function setUp(): void
@@ -80,9 +79,7 @@ public function it_will_return_false_if_the_gate_returns_false()
 
         $user  = factory(User::class)->create();
         $model = factory(TestModel::class)->create(
-            [
-                'user_id' => 2,
-            ]
+            ['user_id' => 2]
         );
 
         $this->assertFalse($rule->passes('attribute', '1'));
@@ -92,9 +89,7 @@ public function it_will_return_false_if_the_gate_returns_false()
     public function it_passes_attribute_ability_and_class_name_to_the_validation_message()
     {
         Lang::addLines(
-            [
-                'messages.authorized' => ':attribute :ability and :className',
-            ],
+            ['messages.authorized' => ':attribute :ability and :className'],
             Lang::getLocale(),
             'laravelSupport'
         );

tests/Rules/AuthorizedTest.php

@@ -7,7 +7,6 @@
 use Php\Support\Laravel\Rules\Delimited;
 use Php\Support\Laravel\Tests\AbstractTestCase;
 
-
 class DelimitedTest extends AbstractTestCase
 {
     /**