fixed content module ( well reverted)

Modules/Content/Models/ContentDocument.php

@@ -1,18 +1,17 @@
 <?php
-
-declare(strict_types=1);
-
 namespace Modules\Content\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 final class ContentDocument extends Model
 {
-    protected $fillable = ['content_type_id','title','slug','status','data','published_at','expires_at'];
-    protected $casts = ['data'=>'array','published_at'=>'datetime','expires_at'=>'datetime'];
-
+    use SoftDeletes;
+    protected $fillable = ['content_type_id','title','slug','data','status','published_at','expires_at','language','created_by','updated_by'];
+    protected function casts(): array { return ['data'=>'array','published_at'=>'datetime','expires_at'=>'datetime']; }
     public function type(): BelongsTo { return $this->belongsTo(ContentType::class, 'content_type_id'); }
     public function placements(): HasMany { return $this->hasMany(PageContent::class); }
+    public function scopePublished($query) { return $query->where('status','published')->where(fn($q) => $q->whereNull('published_at')->orWhere('published_at','<=',now()))->where(fn($q) => $q->whereNull('expires_at')->orWhere('expires_at','>',now())); }
 }

Modules/Content/Models/ContentType.php

@@ -1,7 +1,4 @@
 <?php
-
-declare(strict_types=1);
-
 namespace Modules\Content\Models;
 
 use Illuminate\Database\Eloquent\Model;
@@ -9,8 +6,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 final class ContentType extends Model
 {
-    protected $fillable = ['key', 'name', 'description', 'schema'];
-    protected $casts = ['schema' => 'array'];
-
+    protected $fillable = ['name','key','description','schema','renderer','allowed_regions','is_system','is_active'];
+    protected function casts(): array { return ['schema'=>'array','allowed_regions'=>'array','is_system'=>'boolean','is_active'=>'boolean']; }
     public function documents(): HasMany { return $this->hasMany(ContentDocument::class); }
 }

Modules/Content/Models/PageContent.php

@@ -1,17 +1,15 @@
 <?php
-
-declare(strict_types=1);
-
 namespace Modules\Content\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Modules\Pages\Models\Page;
 
 final class PageContent extends Model
 {
     protected $table = 'page_content';
-    protected $fillable = ['page_key','region','content_document_id','sort_order','is_enabled','published_at','expires_at'];
-    protected $casts = ['is_enabled'=>'boolean','published_at'=>'datetime','expires_at'=>'datetime'];
-
+    protected $fillable = ['page_id','page_key','content_document_id','region','sort_order','is_enabled','visibility_rules','presentation','starts_at','ends_at'];
+    protected function casts(): array { return ['is_enabled'=>'boolean','visibility_rules'=>'array','presentation'=>'array','starts_at'=>'datetime','ends_at'=>'datetime']; }
     public function document(): BelongsTo { return $this->belongsTo(ContentDocument::class, 'content_document_id'); }
+    public function page(): BelongsTo { return $this->belongsTo(Page::class); }
 }