Merge pull request #8 from skoro/fix-model-defaultparentkey

Fix - Allow to override tree parent key in the model

Author: cklei-carly

src/Concern/InteractWithTree.php

@@ -91,7 +91,8 @@ public function updateTree(?array $list = null): array
             $records = $this->getRecords()->keyBy(fn ($record) => $record->getAttributeValue($record->getKeyName()));
 
             $unnestedArr = [];
-            $this->unnestArray($unnestedArr, $list, Utils::defaultParentId());
+            $defaultParentId = Utils::defaultParentId();
+            $this->unnestArray($unnestedArr, $list, $defaultParentId);
             $unnestedArrData = collect($unnestedArr)
                 ->map(fn (array $data, $id) => ['data' => $data, 'model' => $records->get($id)])
                 ->filter(fn (array $arr) => !is_null($arr['model']));
@@ -101,6 +102,7 @@ public function updateTree(?array $list = null): array
                     if ($model instanceof Model) {
                         $parentColumnName = method_exists($model, 'determineParentColumnName') ? $model->determineParentColumnName() : Utils::parentColumnName();
                         $orderColumnName = method_exists($model, 'determineOrderColumnName') ? $model->determineOrderColumnName() : Utils::orderColumnName();
+                        $newParentId = $newParentId === $defaultParentId && method_exists($model, 'defaultParentKey') ? $model::defaultParentKey() : $newParentId;
 
                         $model->{$parentColumnName} = $newParentId;
                         $model->{$orderColumnName} = $newOrder;

src/Concern/ModelTree.php

@@ -27,7 +27,7 @@ public function initializeModelTree()
     public static function bootModelTree()
     {
         static::saving(function(Model $model) {
-            if (empty($model->{$model->determineParentColumnName()}) || $model->{$model->determineParentColumnName()} === 0) {
+            if (empty($model->{$model->determineParentColumnName()}) || $model->{$model->determineParentColumnName()} === -1) {
                 $model->{$model->determineParentColumnName()} = static::defaultParentKey();
             }
             if (empty($model->{$model->determineOrderColumnName()}) || $model->{$model->determineOrderColumnName()} === 0) {