tbianchini/shopit-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Brand, Category, Product, and ModelPropValue models to remove morph relationships; update migration files for props and model prop values to reflect new foreign key structure.

Browse Source
This commit is contained in:
ncoronel
2026-06-22 12:15:12 -03:00
parent 5c81d6997a
commit 93ebb0a110
8 changed files with 19 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Domains/Product/Models/Brand.php
View File

@@ -2,29 +2,10 @@
namespace App\Domains\Product\Models;
use App\Domains\Prop\Models\ModelPropValue;
use App\Domains\Prop\Models\Prop;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
class Brand extends Model
{
use HasFactory;
/**
* @return MorphMany<Prop, $this>
*/
public function props(): MorphMany
{
return $this->morphMany(Prop::class, 'propable');
}
/**
* @return MorphMany<ModelPropValue, $this>
*/
public function propValues(): MorphMany
{
return $this->morphMany(ModelPropValue::class, 'valuable');
}
}

19
app/Domains/Product/Models/Category.php
View File

@@ -2,29 +2,10 @@
namespace App\Domains\Product\Models;
use App\Domains\Prop\Models\ModelPropValue;
use App\Domains\Prop\Models\Prop;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
class Category extends Model
{
use HasFactory;
/**
* @return MorphMany<Prop, $this>
*/
public function props(): MorphMany
{
return $this->morphMany(Prop::class, 'propable');
}
/**
* @return MorphMany<ModelPropValue, $this>
*/
public function propValues(): MorphMany
{
return $this->morphMany(ModelPropValue::class, 'valuable');
}
}

19
app/Domains/Product/Models/Product.php
View File

@@ -2,14 +2,11 @@
namespace App\Domains\Product\Models;
use App\Domains\Prop\Models\ModelPropValue;
use App\Domains\Prop\Models\Prop;
use App\Domains\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany;
#[Fillable([
'tenant_codigo',
@@ -40,20 +37,4 @@ class Product extends Model
{
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
}
/**
* @return MorphMany<Prop, $this>
*/
public function props(): MorphMany
{
return $this->morphMany(Prop::class, 'propable');
}
/**
* @return MorphMany<ModelPropValue, $this>
*/
public function propValues(): MorphMany
{
return $this->morphMany(ModelPropValue::class, 'valuable');
}
}

14
app/Domains/Prop/Models/ModelPropValue.php
View File

@@ -6,12 +6,10 @@ use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
#[Fillable([
'valuable_type',
'valuable_id',
'prop_codigo',
'prop_id',
'value',
])]
class ModelPropValue extends Model
@@ -20,19 +18,11 @@ class ModelPropValue extends Model
protected $table = 'model_prop_values';
/**
* @return MorphTo<Model, $this>
*/
public function valuable(): MorphTo
{
return $this->morphTo();
}
/**
* @return BelongsTo<Prop, $this>
*/
public function prop(): BelongsTo
{
return $this->belongsTo(Prop::class, 'prop_codigo', 'codigo');
return $this->belongsTo(Prop::class, 'prop_id');
}
}

12
app/Domains/Prop/Models/Prop.php
View File

@@ -3,16 +3,14 @@
namespace App\Domains\Prop\Models;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphTo;
#[Fillable([
'propable_type',
'propable_id',
'scope',
'codigo',
'nombre',
'is_required',
@@ -23,11 +21,11 @@ class Prop extends Model
use HasFactory;
/**
* @return MorphTo<Model, $this>
* @param Builder<self> $query
*/
public function propable(): MorphTo
public function scopeForModel(Builder $query, Model|string $model): void
{
return $this->morphTo();
$query->where('propable_type', is_string($model) ? $model : $model::class);
}
/**
@@ -51,6 +49,6 @@ class Prop extends Model
*/
public function modelValues(): HasMany
{
return $this->hasMany(ModelPropValue::class, 'prop_codigo', 'codigo');
return $this->hasMany(ModelPropValue::class, 'prop_id');
}
}

15
app/Domains/Tenant/Models/Tenant.php
View File

@@ -6,11 +6,11 @@ use App\Domains\Prop\Models\ModelPropValue;
use App\Domains\Prop\Models\Prop;
use App\Domains\Product\Models\Product;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
#[Fillable([
'codigo',
@@ -40,18 +40,19 @@ class Tenant extends Model
}
/**
* @return MorphMany<Prop, $this>
* @return Builder<Prop>
*/
public function props(): MorphMany
public function props(): Builder
{
return $this->morphMany(Prop::class, 'propable');
return Prop::query()->forModel(static::class);
}
/**
* @return MorphMany<ModelPropValue, $this>
* @return HasMany<ModelPropValue, $this>
*/
public function propValues(): MorphMany
public function propValues(): HasMany
{
return $this->morphMany(ModelPropValue::class, 'valuable');
return $this->hasMany(ModelPropValue::class, 'valuable_id')
->whereHas('prop', fn (Builder $query) => $query->forModel(static::class));
}
}