Temporary fix for issue etrepat#112

Author: sebdesign

src/Baum/Node.php

@@ -461,6 +461,16 @@ public static function buildTree($nodeList) {
     return with(new static)->makeTree($nodeList);
   }
 
+  /**
+   * Pass it a nested array of ID's to re-order the tree in the DB.
+   *
+   * @param   array|\Illuminate\Support\Contracts\ArrayableInterface
+   * @return  boolean
+   */
+  public static function rebuildTree($nodeList) {
+    return with(new static)->updateTree($nodeList);
+  }
+
   /**
    * Query scope which extracts a certain node object from the current query
    * expression.
@@ -1228,6 +1238,20 @@ public function makeTree($nodeList) {
     return $mapper->map($nodeList);
   }
 
+  /**
+   * Maps the provided tree structure into the database using the current node
+   * as the parent. The provided tree structure will be inserted/updated as the
+   * descendancy subtree of the current node instance.
+   *
+   * @param   array|\Illuminate\Support\Contracts\ArrayableInterface
+   * @return  boolean
+   */
+  public function updateTree($nodeList) {
+    $mapper = new SetMapper($this);
+
+    return $mapper->updateMap($nodeList);
+  }
+
   /**
    * Main move method. Here we handle all node movements with the corresponding
    * lft/rgt index updates.

src/Baum/SetMapper.php

@@ -53,6 +53,61 @@ public function map($nodeList) {
     });
   }
 
+  /**
+   * Update a tree structure in the database. Unguards & wraps in transaction.
+   *
+   * @param   array|\Illuminate\Support\Contracts\ArrayableInterface
+   * @return  boolean
+   */
+  public function updateMap($nodeList) {
+    $self = $this;
+
+    return $this->wrapInTransaction(function() use ($self, $nodeList) {
+      forward_static_call(array(get_class($self->node), 'unguard'));
+      $result = true;
+      try {
+        $flattenTree = $this->flattenNestable($nodeList);
+        foreach ($flattenTree as $branch) {
+          $self->node->flushEventListeners();
+          $model = $self->node->find($branch['id']);
+          $model->fill($branch);
+          $model->save();
+        }
+      } catch (\Exception $e) {
+          $result = false;
+      }
+      forward_static_call(array(get_class($self->node), 'reguard'));
+      return $result;
+    });
+  }
+
+  /**
+   * Flattens an array to contain 'id', 'lft', 'rgt', 'depth', 'parent_id' as a valid tree
+   * @param $nestableArray
+   * @param null $parent_id
+   * @param int $depth
+   * @return array
+   */
+  private $bound = 0;
+  public function flattenNestable($nestableArray, $parent_id = null, $depth = 0)
+  {
+    $return = array();
+    foreach ($nestableArray as $subArray) {
+      $returnSubSubArray = array();
+      $lft = ++$this->bound;
+      if (isset($subArray['children'])) {
+        $returnSubSubArray = $this->flattenNestable($subArray['children'], $subArray['id'], ($depth + 1));
+        $rgt = $this->bound + 1;
+        ++$this->bound;
+      } else {
+        $rgt = ++$this->bound;
+      }
+      $return[] = array('id' => $subArray['id'], 'parent_id' => $parent_id, 'depth' => $depth, 'lft' => $lft, 'rgt' => $rgt);
+      $return = array_merge($return, $returnSubSubArray);
+    }
+    return $return;
+  }
+
   /**
    * Maps a tree structure into the database without unguarding nor wrapping
    * inside a transaction.

tests/suite/Category/CategoryTreeMapperTest.php

@@ -6,6 +6,7 @@ class CategoryTreeMapperTest extends BaumTestCase {
 
   public function setUp() {
     with(new CategoryMigrator)->up();
+    Category::boot();
   }
 
   public function testBuildTree() {
@@ -29,6 +30,48 @@ public function testBuildTree() {
     $this->assertArraysAreEqual($tree, array_ints_keys(hmap($hierarchy, array('id', 'name'))));
   }
 
+  public function testBuildTreeAndUpdate() {
+    $tree = array(
+      array('id' => 1, 'name' => 'A'),
+      array('id' => 2, 'name' => 'B'),
+      array('id' => 3, 'name' => 'C', 'children' => array(
+        array('id' => 4, 'name' => 'C.1', 'children' => array(
+          array('id' => 5, 'name' => 'C.1.1'),
+          array('id' => 6, 'name' => 'C.1.2')
+        )),
+        array('id' => 7, 'name' => 'C.2'),
+        array('id' => 8, 'name' => 'C.3')
+      )),
+      array('id' => 9, 'name' => 'D')
+    );
+    $this->assertTrue(Category::buildTree($tree));
+    $this->assertTrue(Category::isValid());
+
+    $hierarchy = Category::all()->toHierarchy()->toArray();
+    $this->assertArraysAreEqual($tree, array_ints_keys(hmap($hierarchy, array('id', 'name'))));
+
+    // Now try and update the already existing tree
+    $tree = array(
+      array('id' => 9),
+      array('id' => 8),
+      array('id' => 7, 'children' => array(
+        array('id' => 6, 'children' => array(
+          array('id' => 5),
+          array('id' => 4)
+        )),
+        array('id' => 3),
+        array('id' => 2)
+      )),
+      array('id' => 1)
+    );
+
+    $this->assertTrue(Category::rebuildTree($tree));
+    $this->assertTrue(Category::isValid());
+
+    $hierarchy = Category::all()->toHierarchy()->toArray();
+    $this->assertArraysAreEqual($tree, array_ints_keys(hmap($hierarchy, array('id'))));
+  }
+
   public function testBuildTreePrunesAndInserts() {
     $tree = array(
       array('id' => 1, 'name' => 'A'),