Added fixTree method

Author: lazychaser

CHANGELOG.markdown

@@ -1,3 +1,7 @@
+### 3.1.0
+
+*   Added `fixTree` method for fixing `lft`/`rgt` values based on parenting
+
 ### 3.0.0
 
 *   Support Laravel 5.1.9

src/Node.php

@@ -1196,15 +1196,15 @@ public function getBounds()
     /**
      * @param $value
      */
-    protected function setLft($value)
+    public function setLft($value)
     {
         $this->setAttribute($this->getLftName(), $value);
     }
 
     /**
      * @param $value
      */
-    protected function setRgt($value)
+    public function setRgt($value)
     {
         $this->setAttribute($this->getRgtName(), $value);
     }

src/QueryBuilder.php

@@ -2,13 +2,10 @@
 
 namespace Kalnoy\Nestedset;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Query\Builder as Query;
 use LogicException;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Database\Query\Grammars\Grammar;
-use Illuminate\Database\Query\Processors\Processor;
 use Illuminate\Database\Query\Expression;
 
 class QueryBuilder extends Builder {
@@ -579,4 +576,59 @@ public function countErrors()
 
         return (array)$query->first();
     }
+
+    /**
+     * Fixes the tree based on parentage info.
+     *
+     * Requires at least one root node. This will not update nodes with invalid parent.
+     *
+     * @return int The number of fixed nodes.
+     */
+    public function fixTree()
+    {
+        $columns = [
+            $this->model->getKeyName(),
+            $this->model->getParentIdName(),
+            $this->model->getLftName(),
+            $this->model->getRgtName(),
+        ];
+
+        $nodes = $this->defaultOrder()->get($columns)->groupBy($this->model->getParentIdName());
+
+        $this->reorderNodes($nodes, $fixed);
+
+        return $fixed;
+    }
+
+    /**
+     * @param Collection $models
+     * @param int $fixed
+     * @param $parentId
+     * @param int $cut
+     *
+     * @return int
+     */
+    protected function reorderNodes(Collection $models, &$fixed, $parentId = null, $cut = 1)
+    {
+        /** @var Node $model */
+        foreach ($models->get($parentId, []) as $model)
+        {
+            $model->setLft($cut);
+
+            $cut = $this->reorderNodes($models, $fixed, $model->getKey(), $cut + 1);
+
+            $model->setRgt($cut);
+
+            if ($model->isDirty())
+            {
+                $model->save();
+
+                $fixed++;
+            }
+
+            ++$cut;
+        }
+
+        return $cut;
+    }
 }

tests/NodeTest.php

@@ -70,7 +70,7 @@ public function assertTreeNotBroken($table = 'categories')
 
     public function dumpTree($items = null)
     {
-        if ( ! $items) $items = Category::withTrashed()->get();
+        if ( ! $items) $items = Category::withTrashed()->defaultOrder()->get();
 
         foreach ($items as $item)
         {
@@ -616,6 +616,17 @@ public function testMultipleDeletionsDoNotBrakeTree()
 
         $this->assertTreeNotBroken();
     }
+
+    public function testTreeIsFixed()
+    {
+        Category::where('id', '=', 5)->update([ '_lft' => 14 ]);
+        Category::where('id', '=', 8)->update([ 'parent_id' => 2 ]);
+
+        $fixed = Category::fixTree();
+
+        $this->assertTrue($fixed > 0);
+        $this->assertTreeNotBroken();
+    }
 }
 
 function all($items)