Replace nested trees with common table expressions

owlchester · Dec 2, 2023 · f1fb16f · f1fb16f
1 parent 719f1f5
commit f1fb16f
Show file tree

Hide file tree

Showing 49 changed files with 287 additions and 1,697 deletions.
diff --git a/app/Console/Commands/GenerateTrees.php b/app/Console/Commands/GenerateTrees.php
diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
@@ -144,7 +144,7 @@ public function crudIndex(Request $request)
         $parent = null;
         if (request()->has('parent_id')) {
             // @phpstan-ignore-next-line
-            $parentKey = $model->getParentIdName();
+            $parentKey = $model->getParentKeyName();
             $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]);
 
             $parent = $model->where('id', request()->get('parent_id'))->first();

diff --git a/app/Http/Controllers/Locations/CharacterController.php b/app/Http/Controllers/Locations/CharacterController.php
@@ -38,6 +38,7 @@ public function index(Campaign $campaign, Location $location)
                 'location', 'location.entity',
                 'races', 'families',
             ])
+            ->filter($filters)
             ->filteredCharacters()
             ->paginate();
 

diff --git a/app/Http/Controllers/Locations/LocationController.php b/app/Http/Controllers/Locations/LocationController.php
@@ -34,7 +34,7 @@ public function index(Campaign $campaign, Location $location)
         // @phpstan-ignore-next-line
         $this->rows = $location
             ->descendants()
-            ->select(['id', 'image', 'name', 'type', 'location_id', 'is_private'])
+            ->select(['id', 'name', 'type', 'location_id', 'is_private'])
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
             ->filter($filters)
             ->with([

diff --git a/app/Models/Ability.php b/app/Models/Ability.php
@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Arr;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class Ability
@@ -34,10 +35,9 @@ class Ability extends MiscModel
     use CampaignTrait;
     use ExportableTrait;
     use HasFactory;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
-    use SortableTrait
-    ;
+    use SortableTrait;
 
     /** @var string[]  */
     protected $fillable = [
@@ -86,20 +86,11 @@ class Ability extends MiscModel
      * Parent ID used for the Node Trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'ability_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setAbilityIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */

diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php
@@ -8,6 +8,7 @@
 use App\Traits\CampaignTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
 /**
  * Class AttributeTemplate
@@ -23,7 +24,7 @@ class AttributeTemplate extends MiscModel
 {
     use Acl;
     use CampaignTrait;
-    use Nested;
+    use HasRecursiveRelationships;
     use SoftDeletes;
 
     /**
@@ -96,20 +97,11 @@ public function attributeTemplates()
      * Parent ID field for the Node trait
      * @return string
      */
-    public function getParentIdName()
+    public function getParentKeyName()
     {
         return 'attribute_template_id';
     }
 
-    /**
-     * Specify parent id attribute mutator
-     * @param int $value
-     */
-    public function setAttributeTemplateIdAttribute($value)
-    {
-        $this->setParentIdAttribute($value);
-    }
-
     /**
      * Performance with for datagrids
      */

diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php
@@ -134,7 +134,7 @@ public function datagridSelectFields(): array
         return ['calendar_id', 'date'];
     }
 
-    public function getParentIdName(): string
+    public function getParentKeyName(): string
     {
         return 'calendar_id';
     }

diff --git a/app/Models/Concerns/HasFilters.php b/app/Models/Concerns/HasFilters.php
@@ -650,6 +650,6 @@ protected function getFilterOption(): FilterOption
 
     protected function filterParent(Builder $query): void
     {
-        $query->where($this->getTable() . '.' . $this->getParentIdName(), $this->filterValue);
+        $query->where($this->getTable() . '.' . $this->getParentKeyName(), $this->filterValue);
     }
 }