Fixed #19: Wrong sort calculation when prepending new model to one model

arogachev · Sep 28, 2015 · 2d98b18 · 2d98b18
1 parent 3845c66
commit 2d98b18
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/src/behaviors/numerical/BaseNumericalSortableBehavior.php b/src/behaviors/numerical/BaseNumericalSortableBehavior.php
@@ -271,7 +271,7 @@ protected function resolveConflict($newPosition, $updateCurrentModel = true)
         foreach ($models as $model) {
             $isCurrentModel = $model->primaryKey == $this->model->primaryKey;
 
-            if ($position == $newPosition && $position != $this->getSortableCount()) {
+            if ($position == $newPosition) {
                 $position++;
             }
 

diff --git a/tests/_data/Category.php b/tests/_data/Category.php
@@ -19,7 +19,7 @@ class Category extends ActiveRecord
     public function behaviors()
     {
         return [
-            [
+            'sort' => [
                 'class' => ContinuousNumericalSortableBehavior::className(),
                 'scope' => function ($model) {
                     /* @var $model Category */
@@ -37,6 +37,16 @@ public static function tableName()
         return 'categories';
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            ['name', 'string', 'max' => 255],
+        ];
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */

diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql
@@ -63,5 +63,6 @@ INSERT INTO "categories" ("id", "parent_id", "name", "sort") VALUES (5, NULL, 'C
 INSERT INTO "categories" ("id", "parent_id", "name", "sort") VALUES (6, 2, 'Category 2.1', 1);
 INSERT INTO "categories" ("id", "parent_id", "name", "sort") VALUES (7, 2, 'Category 2.2', 2);
 INSERT INTO "categories" ("id", "parent_id", "name", "sort") VALUES (8, 2, 'Category 2.3', 3);
+INSERT INTO "categories" ("id", "parent_id", "name", "sort") VALUES (9, 8, 'Category 2.3.1', 1);
 
 COMMIT;
diff --git a/tests/unit/ContinuousTest.php b/tests/unit/ContinuousTest.php
@@ -50,6 +50,21 @@ public function testCreatePrependAdded()
         $question->save();
 
         $this->checkQuestion($question, 1, [2, 3, 4, 5, 6]);
+
+        // Prepend to scope with single model
+        $category = new Category();
+        $behaviorConfig = $category->behaviors()['sort'];
+        $behaviorConfig['prependAdded'] = true;
+        $category->detachBehavior('sort');
+        $category->attachBehavior('sort', $behaviorConfig);
+        $category->setAttributes([
+            'parent_id' => 8,
+            'name' => 'Category 2.3.2',
+        ], false);
+        $category->save();
+        $sort = Category::find()->select('sort')->orderBy(['id' => SORT_ASC])->column();
+
+        $this->assertEquals([1, 1, 2, 3, 2, 1, 2, 3, 2, 1], $sort);
     }
 
     public function testUpdate()
@@ -101,7 +116,7 @@ public function testMoveToOtherScope()
         $category->moveAfter(7);
         $sort = Category::find()->select('sort')->orderBy(['id' => SORT_ASC])->column();
 
-        $this->assertEquals([1, 1, 3, 2, 2, 1, 2, 4], $sort);
+        $this->assertEquals([1, 1, 3, 2, 2, 1, 2, 4, 1], $sort);
     }
 
     public function testMoveToPosition()