Entities: Reverted back to data from contents, fixed various issues

Author: ssddanbrown

app/Console/Commands/UpdateUrlCommand.php

@@ -45,8 +45,8 @@ public function handle(Connection $db): int
 
         $columnsToUpdateByTable = [
             'attachments' => ['path'],
-            'entity_page_contents' => ['html', 'text', 'markdown'],
-            'entity_container_contents' => ['description_html'],
+            'entity_page_data' => ['html', 'text', 'markdown'],
+            'entity_container_data' => ['description_html'],
             'page_revisions' => ['html', 'text', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],

app/Entities/Controllers/PageController.php

@@ -120,6 +120,7 @@ public function store(Request $request, string $bookSlug, int $pageId)
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
         ]);
+
         $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageCreate, $draftPage->getParent());
 

app/Entities/Models/Book.php

@@ -34,6 +34,7 @@ class Book extends Entity implements HasDescriptionInterface, HasCoverInterface,
     public float $searchFactor = 1.2;
 
     protected $hidden = ['pivot', 'deleted_at'];
+    protected $fillable = ['name'];
 
     /**
      * Get the url for this book.

app/Entities/Models/Bookshelf.php

@@ -20,6 +20,7 @@ class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInter
     public float $searchFactor = 1.2;
 
     protected $hidden = ['image_id', 'deleted_at', 'description_html'];
+    protected $fillable = ['name'];
 
     /**
      * Get the books in this shelf.
@@ -28,7 +29,7 @@ class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInter
     public function books(): BelongsToMany
     {
         return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')
-            ->select(['entities.*', 'entity_container_contents.*'])
+            ->select(['entities.*', 'entity_container_data.*'])
             ->withPivot('order')
             ->orderBy('order', 'asc');
     }

app/Entities/Models/Chapter.php

@@ -20,6 +20,7 @@ class Chapter extends BookChild implements HasDescriptionInterface, HasDefaultTe
 
     public float $searchFactor = 1.2;
     protected $hidden = ['pivot', 'deleted_at', 'description_html'];
+    protected $fillable = ['name', 'priority'];
 
     /**
      * Get the pages that this chapter contains.

app/Entities/Models/ContainerTrait.php

@@ -16,11 +16,11 @@ public function descriptionInfo(): EntityHtmlDescription
     }
 
     /**
-     * @return HasOne<EntityContainerContents, $this>
+     * @return HasOne<EntityContainerData, $this>
      */
     public function relatedData(): HasOne
     {
-        return $this->hasOne(EntityContainerContents::class, 'entity_id', 'id')
+        return $this->hasOne(EntityContainerData::class, 'entity_id', 'id')
             ->where('entity_type', '=', $this->getMorphClass());
     }
 }

app/Entities/Models/Entity.php

@@ -95,6 +95,7 @@ abstract class Entity extends Model implements
         'name',
         'slug',
         'book_id',
+        'chapter_id',
         'priority',
         'created_at',
         'updated_at',
@@ -104,13 +105,12 @@ abstract class Entity extends Model implements
         'owned_by',
     ];
 
-    // TODO - Review usages of query-time update or mass insert of entity model data since those will still need to consider the multi-table layout.
-
     /**
      * Override the save method to also save the contents for convenience.
      */
     public function save(array $options = []): bool
     {
+        /** @var EntityPageData|EntityContainerData $contents */
         $contents = $this->relatedData()->firstOrNew();
         $contentFields = $this->getContentsAttributes();
 
@@ -119,10 +119,13 @@ public function save(array $options = []): bool
             unset($this->attributes[$key]);
         }
 
+        $this->setAttribute('type', $this->getMorphClass());
         $result = parent::save($options);
         $contentsResult = true;
 
         if ($result && $contents->isDirty()) {
+            $contentsFillData = $contents instanceof EntityPageData ? ['page_id' => $this->id] : ['entity_id' => $this->id, 'entity_type' => $this->getMorphClass()];
+            $contents->forceFill($contentsFillData);
             $contentsResult = $contents->save();
             $this->touch();
         }
@@ -446,7 +449,7 @@ public function logDescriptor(): string
     }
 
     /**
-     * @return HasOne<EntityContainerContents|EntityPageContents, $this>
+     * @return HasOne<EntityContainerData|EntityPageData, $this>
      */
     abstract public function relatedData(): HasOne;
 

…ities/Models/EntityContainerContents.php …/Entities/Models/EntityContainerData.phpapp/Entities/Models/EntityContainerContents.php renamed to app/Entities/Models/EntityContainerData.php app/Entities/Models/EntityContainerContents.php renamed to app/Entities/Models/EntityContainerData.php

@@ -14,7 +14,7 @@
  * @property ?int    $image_id
  * @property ?int    $sort_rule_id
  */
-class EntityContainerContents extends Model
+class EntityContainerData extends Model
 {
     public $timestamps = false;
     protected $primaryKey = 'entity_id';
@@ -26,7 +26,7 @@ class EntityContainerContents extends Model
     public function setKeysForSaveQuery($query): Builder
     {
         $query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery())
-            ->where('type', '=', $this->entity_type);
+            ->where('entity_type', '=', $this->entity_type);
 
         return $query;
     }
@@ -37,7 +37,7 @@ public function setKeysForSaveQuery($query): Builder
     protected function setKeysForSelectQuery($query): Builder
     {
         $query->where($this->getKeyName(), '=', $this->getKeyForSelectQuery())
-            ->where('type', '=', $this->entity_type);
+            ->where('entity_type', '=', $this->entity_type);
 
         return $query;
     }

…p/Entities/Models/EntityPageContents.php app/Entities/Models/EntityPageData.phpapp/Entities/Models/EntityPageContents.php renamed to app/Entities/Models/EntityPageData.php app/Entities/Models/EntityPageContents.php renamed to app/Entities/Models/EntityPageData.php

@@ -4,7 +4,10 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class EntityPageContents extends Model
+/**
+ * @property int    $page_id
+ */
+class EntityPageData extends Model
 {
     public $timestamps = false;
     protected $primaryKey = 'page_id';

app/Entities/Models/EntityScope.php

@@ -16,11 +16,11 @@ public function apply(Builder $builder, Model $model): void
     {
         $builder = $builder->where('type', '=', $model->getMorphClass());
         if ($model instanceof Page) {
-            $builder->leftJoin('entity_page_contents', 'entity_page_contents.page_id', '=', 'entities.id');
+            $builder->leftJoin('entity_page_data', 'entity_page_data.page_id', '=', 'entities.id');
         } else {
-            $builder->leftJoin('entity_container_contents', function (JoinClause $join) use ($model) {
-                $join->on('entity_container_contents.entity_id', '=', 'entities.id')
-                    ->where('entity_container_contents.entity_type', '=', $model->getMorphClass());
+            $builder->leftJoin('entity_container_data', function (JoinClause $join) use ($model) {
+                $join->on('entity_container_data.entity_id', '=', 'entities.id')
+                    ->where('entity_container_data.entity_type', '=', $model->getMorphClass());
             });
         }
     }