feat(cart): add Cart and CartItem models with item management methods

Move Catalog endpoints under /api/tenants/{tenant:codigo} and derive tenant
context from the route instead of request payload fields.

- scope marcas, categorias, productos, and product-attributes by tenant
- enforce tenant ownership in catalog controllers
- remove tenant_codigo and tenant_code from Catalog request validation
- update product attribute tests to use tenant-scoped routes

app/Domains/Cart/Models/Cart.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Domains\Cart\Models;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use App\Models\User;
+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\HasMany;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+
+#[Fillable([
+    'user_id',
+    'guest_token',
+    'status',
+])]
+class Cart extends Model
+{
+    use HasFactory;
+
+    protected $table = 'carritos';
+
+    protected function casts(): array
+    {
+        return [
+            'user_id' => 'integer',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<User, $this>
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * @return HasMany<CartItem, $this>
+     */
+    public function items(): HasMany
+    {
+        return $this->hasMany(CartItem::class, 'cart_id');
+    }
+
+    public function addItem(int $productVariantId, int $quantity): CartItem
+    {
+        if ($quantity <= 0) {
+            throw ValidationException::withMessages([
+                'cantidad' => 'La cantidad debe ser mayor a cero.',
+            ]);
+        }
+
+        return DB::transaction(function () use ($productVariantId, $quantity) {
+            /** @var ProductVariant $variant */
+            $variant = ProductVariant::query()
+                ->lockForUpdate()
+                ->findOrFail($productVariantId);
+
+            if ($variant->stock < $quantity) {
+                throw ValidationException::withMessages([
+                    'cantidad' => 'Stock insuficiente para la variante solicitada.',
+                ]);
+            }
+
+            /** @var CartItem|null $item */
+            $item = $this->items()
+                ->where('producto_variante_id', $productVariantId)
+                ->lockForUpdate()
+                ->first();
+
+            if ($item) {
+                $item->cantidad += $quantity;
+                $item->save();
+            } else {
+                $item = $this->items()->create([
+                    'producto_variante_id' => $productVariantId,
+                    'cantidad' => $quantity,
+                ]);
+            }
+
+            $variant->decrement('stock', $quantity);
+
+            return $item->fresh();
+        });
+    }
+
+    public function updateItem(int $productVariantId, int $quantity): CartItem
+    {
+        if ($quantity <= 0) {
+            throw ValidationException::withMessages([
+                'cantidad' => 'La cantidad debe ser mayor a cero.',
+            ]);
+        }
+
+        return DB::transaction(function () use ($productVariantId, $quantity) {
+            /** @var CartItem $item */
+            $item = $this->items()
+                ->where('producto_variante_id', $productVariantId)
+                ->lockForUpdate()
+                ->firstOrFail();
+
+            /** @var ProductVariant $variant */
+            $variant = ProductVariant::query()
+                ->lockForUpdate()
+                ->findOrFail($productVariantId);
+
+            $delta = $quantity - $item->cantidad;
+
+            if ($delta > 0 && $variant->stock < $delta) {
+                throw ValidationException::withMessages([
+                    'cantidad' => 'Stock insuficiente para actualizar la cantidad solicitada.',
+                ]);
+            }
+
+            $item->cantidad = $quantity;
+            $item->save();
+
+            if ($delta > 0) {
+                $variant->decrement('stock', $delta);
+            }
+
+            if ($delta < 0) {
+                $variant->increment('stock', abs($delta));
+            }
+
+            return $item->fresh();
+        });
+    }
+
+    public function removeItem(int $productVariantId): void
+    {
+        DB::transaction(function () use ($productVariantId) {
+            /** @var CartItem $item */
+            $item = $this->items()
+                ->where('producto_variante_id', $productVariantId)
+                ->lockForUpdate()
+                ->firstOrFail();
+
+            /** @var ProductVariant $variant */
+            $variant = ProductVariant::query()
+                ->lockForUpdate()
+                ->findOrFail($productVariantId);
+
+            $variant->increment('stock', $item->cantidad);
+            $item->delete();
+        });
+    }
+}

app/Domains/Cart/Models/CartItem.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Domains\Cart\Models;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'cart_id',
+    'producto_variante_id',
+    'cantidad',
+])]
+class CartItem extends Model
+{
+    use HasFactory;
+
+    protected $table = 'carrito_items';
+
+    protected function casts(): array
+    {
+        return [
+            'cart_id' => 'integer',
+            'producto_variante_id' => 'integer',
+            'cantidad' => 'integer',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Cart, $this>
+     */
+    public function cart(): BelongsTo
+    {
+        return $this->belongsTo(Cart::class, 'cart_id');
+    }
+
+    /**
+     * @return BelongsTo<ProductVariant, $this>
+     */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(ProductVariant::class, 'producto_variante_id');
+    }
+}

app/Domains/Catalog/Controllers/BrandController.php

@@ -6,48 +6,60 @@ use App\Domains\Catalog\Models\Brand;
 use App\Domains\Catalog\Requests\StoreBrandRequest;
 use App\Domains\Catalog\Requests\UpdateBrandRequest;
 use App\Domains\Catalog\Resources\BrandResource;
+use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class BrandController extends Controller
 {
-    public function index(): JsonResponse
+    public function index(Tenant $tenant): JsonResponse
     {
-        return BrandResource::collection(Brand::query()->orderByDesc('id')->get())->response();
+        return BrandResource::collection(
+            Brand::query()->where('tenant_codigo', $tenant->codigo)->orderByDesc('id')->get()
+        )->response();
     }
 
-    public function store(StoreBrandRequest $request): JsonResponse
+    public function store(StoreBrandRequest $request, Tenant $tenant): JsonResponse
     {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $brand = Brand::createWithProps($validated, $props);
+        $brand = Brand::query()->create([
+            ...$request->validated(),
+            'tenant_codigo' => $tenant->codigo,
+        ]);
 
         return BrandResource::make($brand)->response()->setStatusCode(201);
     }
 
-    public function show(Brand $marca): BrandResource
+    public function show(Tenant $tenant, Brand $marca): BrandResource
     {
-        return BrandResource::make($marca);
-    }
-
-    public function update(UpdateBrandRequest $request, Brand $marca): BrandResource
-    {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $marca = $marca->updateWithProps($validated, $props);
+        $marca = $this->resolveScopedBrand($tenant, $marca);
 
         return BrandResource::make($marca);
     }
 
-    public function destroy(Brand $marca): Response
+    public function update(UpdateBrandRequest $request, Tenant $tenant, Brand $marca): BrandResource
     {
+        $marca = $this->resolveScopedBrand($tenant, $marca);
+        $marca->update($request->validated());
+
+        return BrandResource::make($marca);
+    }
+
+    public function destroy(Tenant $tenant, Brand $marca): Response
+    {
+        $marca = $this->resolveScopedBrand($tenant, $marca);
         $marca->delete();
 
         return response()->noContent();
     }
+
+    protected function resolveScopedBrand(Tenant $tenant, Brand $brand): Brand
+    {
+        if ($brand->tenant_codigo !== $tenant->codigo) {
+            throw new NotFoundHttpException('Brand not found for tenant.');
+        }
+
+        return $brand;
+    }
 }

app/Domains/Catalog/Controllers/CategoryController.php

@@ -6,52 +6,66 @@ use App\Domains\Catalog\Models\Category;
 use App\Domains\Catalog\Requests\StoreCategoryRequest;
 use App\Domains\Catalog\Requests\UpdateCategoryRequest;
 use App\Domains\Catalog\Resources\CategoryResource;
+use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CategoryController extends Controller
 {
-    public function index(): JsonResponse
+    public function index(Tenant $tenant): JsonResponse
     {
         return CategoryResource::collection(
-            Category::query()->with(['parent', 'subCategories','tenant'])->orderByDesc('id')->get()
+            Category::query()
+                ->where('tenant_code', $tenant->codigo)
+                ->with(['parent', 'subCategories', 'tenant'])
+                ->orderByDesc('id')
+                ->get()
         )->response();
     }
 
-    public function store(StoreCategoryRequest $request): JsonResponse
+    public function store(StoreCategoryRequest $request, Tenant $tenant): JsonResponse
     {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $category = Category::createWithProps($validated, $props);
+        $category = Category::query()->create([
+            ...$request->validated(),
+            'tenant_code' => $tenant->codigo,
+        ]);
 
         return CategoryResource::make($category->load(['parent', 'subCategories', 'tenant']))
             ->response()
             ->setStatusCode(201);
     }
 
-    public function show(Category $categoria): CategoryResource
+    public function show(Tenant $tenant, Category $categoria): CategoryResource
     {
-        return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
-    }
-
-    public function update(UpdateCategoryRequest $request, Category $categoria): CategoryResource
-    {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $categoria = $categoria->updateWithProps($validated, $props);
+        $categoria = $this->resolveScopedCategory($tenant, $categoria);
 
         return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
     }
 
-    public function destroy(Category $categoria): Response
+    public function update(UpdateCategoryRequest $request, Tenant $tenant, Category $categoria): CategoryResource
     {
+        $categoria = $this->resolveScopedCategory($tenant, $categoria);
+        $categoria->update($request->validated());
+
+        return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
+    }
+
+    public function destroy(Tenant $tenant, Category $categoria): Response
+    {
+        $categoria = $this->resolveScopedCategory($tenant, $categoria);
         $categoria->delete();
 
         return response()->noContent();
     }
+
+    protected function resolveScopedCategory(Tenant $tenant, Category $category): Category
+    {
+        if ($category->tenant_code !== $tenant->codigo) {
+            throw new NotFoundHttpException('Category not found for tenant.');
+        }
+
+        return $category;
+    }
 }

app/Domains/Catalog/Controllers/ProductAttributeController.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Domains\Catalog\Controllers;
+
+use App\Domains\Catalog\Models\ProductAttribute;
+use App\Domains\Catalog\Requests\StoreProductAttributeRequest;
+use App\Domains\Catalog\Requests\UpdateProductAttributeRequest;
+use App\Domains\Catalog\Resources\ProductAttributeResource;
+use App\Domains\Catalog\Support\ProductAttributeType;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class ProductAttributeController extends Controller
+{
+    public function index(Tenant $tenant): JsonResponse
+    {
+        $query = ProductAttribute::query()
+            ->where('tenant_codigo', $tenant->codigo)
+            ->with('options')
+            ->latest();
+
+        return ProductAttributeResource::collection($query->get())->response();
+    }
+
+    public function store(StoreProductAttributeRequest $request, Tenant $tenant): JsonResponse
+    {
+        $attribute = DB::transaction(function () use ($request, $tenant): ProductAttribute {
+            $validated = $request->validated();
+            $options = $validated['options'] ?? [];
+            unset($validated['options']);
+
+            $type = ProductAttributeType::from((string) $validated['type']);
+            if (! $type->supportsOptions()) {
+                $validated['metadata_schema'] = null;
+                $options = [];
+            }
+
+            /** @var ProductAttribute $attribute */
+            $attribute = ProductAttribute::query()->create([
+                ...$validated,
+                'tenant_codigo' => $tenant->codigo,
+            ]);
+            $attribute->options()->createMany($options);
+
+            return $attribute->load('options');
+        });
+
+        return ProductAttributeResource::make($attribute)->response()->setStatusCode(201);
+    }
+
+    public function show(Tenant $tenant, ProductAttribute $productAttribute): ProductAttributeResource
+    {
+        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
+
+        return ProductAttributeResource::make($productAttribute->load('options'));
+    }
+
+    public function update(UpdateProductAttributeRequest $request, Tenant $tenant, ProductAttribute $productAttribute): ProductAttributeResource
+    {
+        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
+
+        $productAttribute = DB::transaction(function () use ($request, $productAttribute): ProductAttribute {
+            $validated = $request->validated();
+            $options = $validated['options'] ?? [];
+            unset($validated['options']);
+
+            $type = ProductAttributeType::from((string) $validated['type']);
+            if (! $type->supportsOptions()) {
+                $validated['metadata_schema'] = null;
+                $options = [];
+            }
+
+            $productAttribute->update($validated);
+            $productAttribute->options()->delete();
+            $productAttribute->options()->createMany($options);
+
+            return $productAttribute->load('options');
+        });
+
+        return ProductAttributeResource::make($productAttribute);
+    }
+
+    public function destroy(Tenant $tenant, ProductAttribute $productAttribute): Response
+    {
+        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
+        $productAttribute->delete();
+
+        return response()->noContent();
+    }
+
+    protected function resolveScopedAttribute(Tenant $tenant, ProductAttribute $attribute): ProductAttribute
+    {
+        if ($attribute->tenant_codigo !== $tenant->codigo) {
+            throw new NotFoundHttpException('Product attribute not found for tenant.');
+        }
+
+        return $attribute;
+    }
+}

app/Domains/Catalog/Controllers/ProductController.php

@@ -6,48 +6,60 @@ use App\Domains\Catalog\Models\Product;
 use App\Domains\Catalog\Requests\StoreProductRequest;
 use App\Domains\Catalog\Requests\UpdateProductRequest;
 use App\Domains\Catalog\Resources\ProductResource;
+use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class ProductController extends Controller
 {
-    public function index(): JsonResponse
+    public function index(Tenant $tenant): JsonResponse
     {
-        return ProductResource::collection(Product::query()->latest()->get())->response();
+        return ProductResource::collection(
+            Product::query()->where('tenant_codigo', $tenant->codigo)->latest()->get()
+        )->response();
     }
 
-    public function store(StoreProductRequest $request): JsonResponse
+    public function store(StoreProductRequest $request, Tenant $tenant): JsonResponse
     {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $product = Product::createWithProps($validated, $props);
+        $product = Product::query()->create([
+            ...$request->validated(),
+            'tenant_codigo' => $tenant->codigo,
+        ]);
 
         return ProductResource::make($product)->response()->setStatusCode(201);
     }
 
-    public function show(Product $producto): ProductResource
+    public function show(Tenant $tenant, Product $producto): ProductResource
     {
-        return ProductResource::make($producto);
-    }
-
-    public function update(UpdateProductRequest $request, Product $producto): ProductResource
-    {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
-        unset($validated['props']);
-
-        $producto = $producto->updateWithProps($validated, $props);
+        $producto = $this->resolveScopedProduct($tenant, $producto);
 
         return ProductResource::make($producto);
     }
 
-    public function destroy(Product $producto): Response
+    public function update(UpdateProductRequest $request, Tenant $tenant, Product $producto): ProductResource
     {
+        $producto = $this->resolveScopedProduct($tenant, $producto);
+        $producto->update($request->validated());
+
+        return ProductResource::make($producto);
+    }
+
+    public function destroy(Tenant $tenant, Product $producto): Response
+    {
+        $producto = $this->resolveScopedProduct($tenant, $producto);
         $producto->delete();
 
         return response()->noContent();
     }
+
+    protected function resolveScopedProduct(Tenant $tenant, Product $product): Product
+    {
+        if ($product->tenant_codigo !== $tenant->codigo) {
+            throw new NotFoundHttpException('Product not found for tenant.');
+        }
+
+        return $product;
+    }
 }

app/Domains/Catalog/Controllers/ProductVariantController.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Domains\Catalog\Controllers;
+
+use App\Domains\Catalog\Models\Product;
+use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Catalog\Requests\StoreProductVariantRequest;
+use App\Domains\Catalog\Requests\UpdateProductVariantRequest;
+use App\Domains\Catalog\Resources\ProductVariantResource;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class ProductVariantController extends Controller
+{
+    public function index(Tenant $tenant): JsonResponse
+    {
+        $query = ProductVariant::query()
+            ->whereHas('product', fn ($query) => $query->where('tenant_codigo', $tenant->codigo))
+            ->with(['product', 'definitions.attribute'])
+            ->latest();
+
+        return ProductVariantResource::collection($query->get())->response();
+    }
+
+    public function store(StoreProductVariantRequest $request, Tenant $tenant): JsonResponse
+    {
+        $validated = $request->validated();
+        $variant = DB::transaction(function () use ($request, $tenant): ProductVariant {
+            
+            $definitions = $validated['definitions'] ?? [];
+            unset($validated['definitions']);
+
+            $product = $this->resolveTenantProduct($tenant, (int) $validated['producto_id']);
+
+            /** @var ProductVariant $variant */
+            $variant = $product->variants()->create($validated);
+            $variant->definitions()->createMany($definitions);
+
+            return $variant->load(['product', 'definitions.attribute']);
+        });
+
+        return ProductVariantResource::make($variant)->response()->setStatusCode(201);
+    }
+
+    public function show(Tenant $tenant, ProductVariant $productVariant): ProductVariantResource
+    {
+        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
+
+        return ProductVariantResource::make($productVariant->load(['product', 'definitions.attribute']));
+    }
+
+    public function update(UpdateProductVariantRequest $request, Tenant $tenant, ProductVariant $productVariant): ProductVariantResource
+    {
+        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
+
+        $productVariant = DB::transaction(function () use ($request, $tenant, $productVariant): ProductVariant {
+            $validated = $request->validated();
+            $definitions = $validated['definitions'] ?? [];
+            unset($validated['definitions']);
+
+            $this->resolveTenantProduct($tenant, (int) $validated['producto_id']);
+
+            $productVariant->update($validated);
+            $productVariant->definitions()->delete();
+            $productVariant->definitions()->createMany($definitions);
+
+            return $productVariant->load(['product', 'definitions.attribute']);
+        });
+
+        return ProductVariantResource::make($productVariant);
+    }
+
+    public function destroy(Tenant $tenant, ProductVariant $productVariant): Response
+    {
+        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
+        $productVariant->delete();
+
+        return response()->noContent();
+    }
+
+    protected function resolveScopedVariant(Tenant $tenant, ProductVariant $variant): ProductVariant
+    {
+        $variant->loadMissing('product');
+
+        if ($variant->product === null || $variant->product->tenant_codigo !== $tenant->codigo) {
+            throw new NotFoundHttpException('Product variant not found for tenant.');
+        }
+
+        return $variant;
+    }
+
+    protected function resolveTenantProduct(Tenant $tenant, int $productId): Product
+    {
+        $product = Product::query()
+            ->whereKey($productId)
+            ->where('tenant_codigo', $tenant->codigo)
+            ->first();
+
+        if ($product === null) {
+            throw new NotFoundHttpException('Product not found for tenant.');
+        }
+
+        return $product;
+    }
+}

app/Domains/Catalog/Models/Brand.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Models;
 
-use App\Domains\Prop\Concerns\Propable;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -17,7 +16,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 class Brand extends Model
 {
     use HasFactory;
-    use Propable;
 
     protected $table = 'brands';
 

app/Domains/Catalog/Models/Category.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Models;
 
-use App\Domains\Prop\Concerns\Propable;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -18,7 +17,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 class Category extends Model
 {
     use HasFactory;
-    use Propable;
 
     protected $table = 'categorias';
 

app/Domains/Catalog/Models/Product.php

@@ -2,12 +2,12 @@
 
 namespace App\Domains\Catalog\Models;
 
-use App\Domains\Prop\Concerns\Propable;
 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\HasMany;
 
 #[Fillable([
     'tenant_codigo',
@@ -20,7 +20,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 class Product extends Model
 {
     use HasFactory;
-    use Propable;
 
     protected $table = 'productos';
 
@@ -39,4 +38,12 @@ class Product extends Model
     {
         return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
     }
+
+    /**
+     * @return HasMany<ProductVariant, $this>
+     */
+    public function variants(): HasMany
+    {
+        return $this->hasMany(ProductVariant::class, 'producto_id');
+    }
 }

app/Domains/Catalog/Models/ProductAttribute.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use App\Domains\Catalog\Support\ProductAttributeType;
+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\HasMany;
+
+#[Fillable([
+    'tenant_codigo',
+    'codigo',
+    'nombre',
+    'is_required',
+    'metadata_schema',
+    'type',
+])]
+class ProductAttribute extends Model
+{
+    use HasFactory;
+
+    protected $table = 'productos_attributes';
+
+    /**
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'is_required' => 'boolean',
+            'metadata_schema' => 'array',
+            'type' => ProductAttributeType::class,
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
+    }
+
+    /**
+     * @return HasMany<ProductAttributeOption, $this>
+     */
+    public function options(): HasMany
+    {
+        return $this->hasMany(ProductAttributeOption::class, 'attribute_id')->orderBy('sort_order');
+    }
+
+    /**
+     * @return HasMany<ProductVariantDefinition, $this>
+     */
+    public function variantDefinitions(): HasMany
+    {
+        return $this->hasMany(ProductVariantDefinition::class, 'attribute_id');
+    }
+}

app/Domains/Catalog/Models/ProductAttributeOption.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'attribute_id',
+    'label',
+    'sort_order',
+    'metadata',
+])]
+class ProductAttributeOption extends Model
+{
+    use HasFactory;
+
+    protected $table = 'attribute_options';
+
+    /**
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'sort_order' => 'integer',
+            'metadata' => 'array',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<ProductAttribute, $this>
+     */
+    public function attribute(): BelongsTo
+    {
+        return $this->belongsTo(ProductAttribute::class, 'attribute_id');
+    }
+}

app/Domains/Catalog/Models/ProductVariant.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+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\HasMany;
+
+#[Fillable([
+    'producto_id',
+    'slug',
+    'nombre',
+    'stock',
+    'descripcion',
+    'precio',
+])]
+class ProductVariant extends Model
+{
+    use HasFactory;
+
+    protected $table = 'productos_variantes';
+
+    protected function casts(): array
+    {
+        return [
+            'producto_id' => 'integer',
+            'stock' => 'integer',
+            'precio' => 'decimal:2',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Product, $this>
+     */
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class, 'producto_id');
+    }
+
+    /**
+     * @return HasMany<ProductVariantDefinition, $this>
+     */
+    public function definitions(): HasMany
+    {
+        return $this->hasMany(ProductVariantDefinition::class, 'producto_variante_id');
+    }
+}

app/Domains/Catalog/Models/ProductVariantDefinition.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'producto_variante_id',
+    'attribute_id',
+    'value',
+])]
+class ProductVariantDefinition extends Model
+{
+    use HasFactory;
+
+    protected $table = 'productos_variantes_definiciones';
+
+    /**
+     * @return BelongsTo<ProductVariant, $this>
+     */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(ProductVariant::class, 'producto_variante_id');
+    }
+
+    /**
+     * @return BelongsTo<ProductAttribute, $this>
+     */
+    public function attribute(): BelongsTo
+    {
+        return $this->belongsTo(ProductAttribute::class, 'attribute_id');
+    }
+}

app/Domains/Catalog/Requests/StoreBrandRequest.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreBrandRequest extends FormRequest
@@ -18,10 +17,8 @@ class StoreBrandRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/StoreCategoryRequest.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreCategoryRequest extends FormRequest
@@ -18,10 +17,8 @@ class StoreCategoryRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'tenant_code' => ['required', 'string', 'exists:tenants,codigo'],
             'categoria_id' => ['nullable', 'integer', 'exists:categorias,id'],
             'nombre' => ['required', 'string', 'max:255'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/StoreProductAttributeRequest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use App\Domains\Catalog\Support\ProductAttributeType;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class StoreProductAttributeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'codigo' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('productos_attributes', 'codigo')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'nombre' => ['required', 'string', 'max:255'],
+            'is_required' => ['sometimes', 'boolean'],
+            'metadata_schema' => ['nullable', 'array'],
+            'type' => ['required', Rule::enum(ProductAttributeType::class)],
+            'options' => [
+                Rule::requiredIf(fn (): bool => in_array($this->input('type'), [
+                    ProductAttributeType::Select->value,
+                    ProductAttributeType::Multiselect->value,
+                ], true)),
+                Rule::prohibitedIf(fn (): bool => ! in_array($this->input('type'), [
+                    ProductAttributeType::Select->value,
+                    ProductAttributeType::Multiselect->value,
+                ], true)),
+                'array',
+            ],
+            'options.*.label' => ['required', 'string', 'max:255'],
+            'options.*.sort_order' => ['sometimes', 'integer'],
+            'options.*.metadata' => ['nullable', 'array'],
+        ];
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(function (Validator $validator): void {
+            $type = $this->input('type');
+            $supportsOptions = in_array($type, [ProductAttributeType::Select->value, ProductAttributeType::Multiselect->value], true);
+
+            if (! $supportsOptions && $this->filled('metadata_schema')) {
+                $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');
+            }
+
+            if (! $supportsOptions && $this->filled('options')) {
+                $validator->errors()->add('options', 'Options are only allowed for select and multiselect attributes.');
+            }
+        });
+    }
+}

app/Domains/Catalog/Requests/StoreProductRequest.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -19,13 +18,11 @@ class StoreProductRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
             'categoria_id' => ['required', 'integer'],
             'slug' => ['required', 'string', 'max:255', Rule::unique('productos', 'slug')],
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/StoreProductVariantRequest.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StoreProductVariantRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'producto_id' => [
+                'required',
+                'integer',
+                Rule::exists('productos', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'slug' => [
+                'nullable',
+                'string',
+                'max:255',
+                Rule::unique('productos_variantes', 'slug')->where(
+                    fn ($query) => $query->where('producto_id', $this->input('producto_id'))
+                ),
+            ],
+            'nombre' => ['nullable', 'string', 'max:255'],
+            'stock' => ['sometimes', 'integer', 'min:0'],
+            'descripcion' => ['nullable', 'string'],
+            'precio' => ['required', 'numeric', 'min:0'],
+            'definitions' => ['sometimes', 'array'],
+            'definitions.*.attribute_id' => [
+                'required',
+                'integer',
+                'distinct',
+                Rule::exists('productos_attributes', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'definitions.*.value' => ['nullable', 'string'],
+        ];
+    }
+}

app/Domains/Catalog/Requests/UpdateBrandRequest.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateBrandRequest extends FormRequest
@@ -18,10 +17,8 @@ class UpdateBrandRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/UpdateCategoryRequest.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Catalog\Requests;
 
 use App\Domains\Catalog\Models\Category;
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -23,7 +22,6 @@ class UpdateCategoryRequest extends FormRequest
         $category = $this->route('categoria');
 
         return [
-            'tenant_code' => ['required', 'string', 'exists:tenants,codigo'],
             'categoria_id' => [
                 'nullable',
                 'integer',
@@ -31,7 +29,6 @@ class UpdateCategoryRequest extends FormRequest
                 Rule::notIn([$category?->id]),
             ],
             'nombre' => ['required', 'string', 'max:255'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/UpdateProductAttributeRequest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use App\Domains\Catalog\Models\ProductAttribute;
+use App\Domains\Catalog\Support\ProductAttributeType;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class UpdateProductAttributeRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        /** @var ProductAttribute|null $attribute */
+        $attribute = $this->route('productAttribute');
+
+        return [
+            'codigo' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('productos_attributes', 'codigo')
+                    ->ignore($attribute?->id)
+                    ->where(fn ($query) => $query->where('tenant_codigo', $attribute?->tenant_codigo)),
+            ],
+            'nombre' => ['required', 'string', 'max:255'],
+            'is_required' => ['sometimes', 'boolean'],
+            'metadata_schema' => ['nullable', 'array'],
+            'type' => ['required', Rule::enum(ProductAttributeType::class)],
+            'options' => ['sometimes', 'array'],
+            'options.*.label' => ['required', 'string', 'max:255'],
+            'options.*.sort_order' => ['sometimes', 'integer'],
+            'options.*.metadata' => ['nullable', 'array'],
+        ];
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(function (Validator $validator): void {
+            $type = $this->input('type');
+            $supportsOptions = in_array($type, [ProductAttributeType::Select->value, ProductAttributeType::Multiselect->value], true);
+
+            if (! $supportsOptions && $this->filled('metadata_schema')) {
+                $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');
+            }
+
+            if (! $supportsOptions && $this->filled('options')) {
+                $validator->errors()->add('options', 'Options are only allowed for select and multiselect attributes.');
+            }
+        });
+    }
+}

app/Domains/Catalog/Requests/UpdateProductRequest.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Catalog\Requests;
 
 use App\Domains\Catalog\Models\Product;
-use App\Domains\Prop\Support\PropRules;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -23,7 +22,6 @@ class UpdateProductRequest extends FormRequest
         $product = $this->route('producto');
 
         return [
-            'tenant_codigo' => ['required', 'string', 'exists:tenants,codigo'],
             'categoria_id' => ['required', 'integer'],
             'slug' => [
                 'required',
@@ -34,7 +32,6 @@ class UpdateProductRequest extends FormRequest
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
-            ...PropRules::sync(),
         ];
     }
 }

app/Domains/Catalog/Requests/UpdateProductVariantRequest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class UpdateProductVariantRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        /** @var ProductVariant|null $productVariant */
+        $productVariant = $this->route('productVariant');
+
+        return [
+            'producto_id' => [
+                'required',
+                'integer',
+                Rule::exists('productos', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'slug' => [
+                'nullable',
+                'string',
+                'max:255',
+                Rule::unique('productos_variantes', 'slug')
+                    ->ignore($productVariant?->id)
+                    ->where(fn ($query) => $query->where('producto_id', $this->input('producto_id'))),
+            ],
+            'nombre' => ['nullable', 'string', 'max:255'],
+            'stock' => ['sometimes', 'integer', 'min:0'],
+            'descripcion' => ['nullable', 'string'],
+            'precio' => ['required', 'numeric', 'min:0'],
+            'definitions' => ['sometimes', 'array'],
+            'definitions.*.attribute_id' => [
+                'required',
+                'integer',
+                'distinct',
+                Rule::exists('productos_attributes', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'definitions.*.value' => ['nullable', 'string'],
+        ];
+    }
+}

app/Domains/Catalog/Resources/ProductAttributeOptionResource.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Catalog\Models\ProductAttributeOption
+ */
+class ProductAttributeOptionResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'label' => $this->label,
+            'sort_order' => $this->sort_order,
+            'metadata' => $this->metadata,
+        ];
+    }
+}

app/Domains/Catalog/Resources/ProductAttributeResource.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Catalog\Models\ProductAttribute
+ */
+class ProductAttributeResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'tenant_codigo' => $this->tenant_codigo,
+            'codigo' => $this->codigo,
+            'nombre' => $this->nombre,
+            'is_required' => $this->is_required,
+            'metadata_schema' => $this->metadata_schema,
+            'type' => $this->type?->value ?? $this->type,
+            'options' => ProductAttributeOptionResource::collection($this->whenLoaded('options')),
+        ];
+    }
+}

app/Domains/Catalog/Resources/ProductVariantDefinitionResource.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Catalog\Models\ProductVariantDefinition
+ */
+class ProductVariantDefinitionResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'producto_variante_id' => $this->producto_variante_id,
+            'attribute_id' => $this->attribute_id,
+            'value' => $this->value,
+            'attribute' => ProductAttributeResource::make($this->whenLoaded('attribute')),
+        ];
+    }
+}

app/Domains/Catalog/Resources/ProductVariantResource.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Domains\Catalog\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Catalog\Models\ProductVariant
+ */
+class ProductVariantResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'producto_id' => $this->producto_id,
+            'slug' => $this->slug,
+            'nombre' => $this->nombre,
+            'stock' => $this->stock,
+            'descripcion' => $this->descripcion,
+            'precio' => $this->precio,
+            'product' => ProductResource::make($this->whenLoaded('product')),
+            'definitions' => ProductVariantDefinitionResource::collection($this->whenLoaded('definitions')),
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Domains/Catalog/Support/ProductAttributeType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\Catalog\Support;
+
+enum ProductAttributeType: string
+{
+    case Text = 'text';
+    case Numeric = 'numeric';
+    case Select = 'select';
+    case Multiselect = 'multiselect';
+
+    public function supportsOptions(): bool
+    {
+        return in_array($this, [self::Select, self::Multiselect], true);
+    }
+}

app/Domains/Catalog/routes/api.php

@@ -3,8 +3,16 @@
 use App\Domains\Catalog\Controllers\BrandController;
 use App\Domains\Catalog\Controllers\CategoryController;
 use App\Domains\Catalog\Controllers\ProductController;
+use App\Domains\Catalog\Controllers\ProductAttributeController;
+use App\Domains\Catalog\Controllers\ProductVariantController;
 use Illuminate\Support\Facades\Route;
 
-Route::apiResource('marcas', BrandController::class)->parameters(['marcas' => 'marca']);
-Route::apiResource('categorias', CategoryController::class)->parameters(['categorias' => 'categoria']);
-Route::apiResource('productos', ProductController::class);
+Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
+    Route::apiResource('marcas', BrandController::class)->parameters(['marcas' => 'marca']);
+    Route::apiResource('categorias', CategoryController::class)->parameters(['categorias' => 'categoria']);
+    Route::apiResource('productos', ProductController::class);
+    Route::apiResource('product-attributes', ProductAttributeController::class)
+        ->parameters(['product-attributes' => 'productAttribute']);
+    Route::apiResource('product-variants', ProductVariantController::class)
+        ->parameters(['product-variants' => 'productVariant']);
+});

app/Domains/Prop/Concerns/Propable.php

@@ -1,138 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Concerns;
-
-use App\Domains\Prop\Models\ModelPropValue;
-use App\Domains\Prop\Models\Prop;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Facades\DB;
-use LogicException;
-
-trait Propable
-{
-    /**
-     * @param  array<string, mixed>  $attributes
-     * @param  array<string, mixed>  $props
-     * @return static
-     */
-    public static function createWithProps(array $attributes, array $props = []): static
-    {
-        /** @var static $model */
-        $model = DB::transaction(function () use ($attributes, $props): Model {
-            /** @var static $createdModel */
-            $createdModel = static::query()->create($attributes);
-            $createdModel->syncPropValues($props);
-
-            return $createdModel;
-        });
-
-        return $model;
-    }
-
-    /**
-     * @param  array<string, mixed>  $attributes
-     */
-    public static function createProp(array $attributes): Prop
-    {
-        return Prop::query()->create([
-            ...$attributes,
-            'propable_type' => static::class,
-        ]);
-    }
-
-    /**
-     * @return Builder<Prop>
-     */
-    public function props(): Builder
-    {
-        return Prop::query()->forModel(static::class);
-    }
-
-    /**
-     * @return HasMany<ModelPropValue, $this>
-     */
-    public function propValues(): HasMany
-    {
-        return $this->hasMany(ModelPropValue::class, 'valuable_id')
-            ->whereHas('prop', fn (Builder $query) => $query->forModel(static::class));
-    }
-
-    public function getPropValue(Prop|string $prop): ?ModelPropValue
-    {
-        $resolvedProp = $this->resolveProp($prop);
-
-        return $this->propValues()
-            ->where('prop_id', $resolvedProp->getKey())
-            ->first();
-    }
-
-    public function setPropValue(Prop|string $prop, mixed $value): ModelPropValue
-    {
-        $this->ensurePropValuesCanBeManaged();
-
-        $resolvedProp = $this->resolveProp($prop);
-
-        return $this->propValues()->updateOrCreate(
-            ['prop_id' => $resolvedProp->getKey()],
-            ['value' => $value],
-        );
-    }
-
-    /**
-     * @param  array<string, mixed>  $props
-     */
-    public function syncPropValues(array $props): void
-    {
-        foreach ($props as $codigo => $value) {
-            $this->setPropValue($codigo, $value);
-        }
-    }
-
-    /**
-     * @param  array<string, mixed>  $attributes
-     * @param  array<string, mixed>  $props
-     */
-    public function updateWithProps(array $attributes, array $props = []): static
-    {
-        DB::transaction(function () use ($attributes, $props): void {
-            $this->update($attributes);
-            $this->syncPropValues($props);
-        });
-
-        return $this;
-    }
-
-    public function deletePropValue(Prop|string $prop): bool
-    {
-        $resolvedProp = $this->resolveProp($prop);
-
-        return $this->propValues()
-            ->where('prop_id', $resolvedProp->getKey())
-            ->delete() > 0;
-    }
-
-    protected function ensurePropValuesCanBeManaged(): void
-    {
-        if (! $this->exists) {
-            throw new LogicException('Cannot manage prop values for an unsaved model.');
-        }
-    }
-
-    protected function resolveProp(Prop|string $prop): Prop
-    {
-        if ($prop instanceof Prop) {
-            if ($prop->propable_type !== static::class) {
-                throw new LogicException('The given prop does not belong to this model type.');
-            }
-
-            return $prop;
-        }
-
-        return Prop::query()
-            ->forModel(static::class)
-            ->where('codigo', $prop)
-            ->firstOrFail();
-    }
-}

app/Domains/Prop/Controllers/PropController.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Controllers;
-
-use App\Domains\Prop\Models\Prop;
-use App\Domains\Prop\Requests\StorePropRequest;
-use App\Domains\Prop\Requests\UpdatePropRequest;
-use App\Domains\Prop\Resources\PropResource;
-use App\Domains\Prop\Support\PropableModels;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class PropController extends Controller
-{
-    public function index(string $propableType): JsonResponse
-    {
-        $modelClass = PropableModels::resolveOrFail($propableType);
-
-        return PropResource::collection(
-            Prop::query()->forModel($modelClass)->latest()->get()
-        )->response();
-    }
-
-    public function store(StorePropRequest $request, string $propableType): JsonResponse
-    {
-        $modelClass = PropableModels::resolveOrFail($propableType);
-
-        /** @var Prop $prop */
-        $prop = $modelClass::createProp($request->validated());
-
-        return PropResource::make($prop)->response()->setStatusCode(201);
-    }
-
-    public function show(string $propableType, Prop $prop): PropResource
-    {
-        $modelClass = PropableModels::resolveOrFail($propableType);
-        $prop = $this->resolveScopedProp($prop, $modelClass);
-
-        return PropResource::make($prop);
-    }
-
-    public function update(UpdatePropRequest $request, string $propableType, Prop $prop): PropResource
-    {
-        $modelClass = PropableModels::resolveOrFail($propableType);
-        $prop = $this->resolveScopedProp($prop, $modelClass);
-        $prop->update($request->validated());
-
-        return PropResource::make($prop);
-    }
-
-    public function destroy(string $propableType, Prop $prop): Response
-    {
-        $modelClass = PropableModels::resolveOrFail($propableType);
-        $prop = $this->resolveScopedProp($prop, $modelClass);
-        $prop->delete();
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedProp(Prop $prop, string $modelClass): Prop
-    {
-        if ($prop->propable_type !== $modelClass) {
-            throw new NotFoundHttpException('Prop not found for the given model type.');
-        }
-
-        return $prop;
-    }
-}

app/Domains/Prop/Models/ModelPropValue.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'valuable_id',
-    'prop_id',
-    'value',
-])]
-class ModelPropValue extends Model
-{
-    use HasFactory;
-
-    protected $table = 'model_prop_values';
-
-    /**
-     * @return BelongsTo<Prop, $this>
-     */
-    public function prop(): BelongsTo
-    {
-        return $this->belongsTo(Prop::class, 'prop_id');
-    }
-}

app/Domains/Prop/Models/Prop.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Models;
-
-use App\Domains\Prop\Support\PropDataType;
-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\HasMany;
-
-#[Fillable([
-    'propable_type',
-    'codigo',
-    'nombre',
-    'is_required',
-    'data_type',
-])]
-class Prop extends Model
-{
-    use HasFactory;
-
-    /**
-     * @return array<string, string>
-     */
-    protected function casts(): array
-    {
-        return [
-            'is_required' => 'boolean',
-            'data_type' => PropDataType::class,
-        ];
-    }
-
-    /**
-     * @param  Builder<self>  $query
-     */
-    public function scopeForModel(Builder $query, Model|string $model): void
-    {
-        $query->where('propable_type', is_string($model) ? $model : $model::class);
-    }
-
-    /**
-     * @return HasMany<PropOption, $this>
-     */
-    public function options(): HasMany
-    {
-        return $this->hasMany(PropOption::class);
-    }
-
-    /**
-     * @return HasMany<ModelPropValue, $this>
-     */
-    public function modelValues(): HasMany
-    {
-        return $this->hasMany(ModelPropValue::class, 'prop_id');
-    }
-}

app/Domains/Prop/Models/PropOption.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'prop_id',
-    'value',
-    'label',
-    'sort_order',
-])]
-class PropOption extends Model
-{
-    use HasFactory;
-
-    /**
-     * @return BelongsTo<Prop, $this>
-     */
-    public function prop(): BelongsTo
-    {
-        return $this->belongsTo(Prop::class);
-    }
-}

app/Domains/Prop/Requests/StorePropRequest.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Requests;
-
-use App\Domains\Prop\Support\PropDataType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StorePropRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('props', 'codigo')],
-            'nombre' => ['required', 'string', 'max:255'],
-            'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(PropDataType::class)],
-        ];
-    }
-}

app/Domains/Prop/Requests/UpdatePropRequest.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Requests;
-
-use App\Domains\Prop\Models\Prop;
-use App\Domains\Prop\Support\PropDataType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdatePropRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        /** @var Prop|null $prop */
-        $prop = $this->route('prop');
-
-        return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('props', 'codigo')->ignore($prop?->id)],
-            'nombre' => ['required', 'string', 'max:255'],
-            'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(PropDataType::class)],
-        ];
-    }
-}

app/Domains/Prop/Resources/PropValueResource.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Resources;
-
-use App\Domains\Prop\Concerns\Propable;
-use App\Domains\Prop\Models\ModelPropValue;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-use InvalidArgumentException;
-
-/**
- * @mixin ModelPropValue
- */
-class PropValueResource extends JsonResource
-{
-    /**
-     * @param  iterable<ModelPropValue>  $propValues
-     * @return array<string, mixed>
-     */
-    public static function collapsed(iterable $propValues): array
-    {
-        return collect($propValues)
-            ->mapWithKeys(fn (ModelPropValue $propValue) => [
-                $propValue->prop->codigo => $propValue->value,
-            ])
-            ->all();
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function collapsedFromPropable(object $model): array
-    {
-        if (! in_array(Propable::class, class_uses_recursive($model), true)) {
-            throw new InvalidArgumentException('The given model must use the Propable trait.');
-        }
-
-        return static::collapsed(
-            $model->propValues()->with('prop')->get(),
-        );
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [$this->prop->codigo => $this->value];
-    }
-}

app/Domains/Prop/Support/PropDataType.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Support;
-
-enum PropDataType: string
-{
-    case String = 'string';
-    case Integer = 'integer';
-    case Decimal = 'decimal';
-    case Boolean = 'boolean';
-    case Date = 'date';
-    case DateTime = 'datetime';
-    case Json = 'json';
-    case Select = 'select';
-
-    /**
-     * @return list<string>
-     */
-    public static function values(): array
-    {
-        return array_map(
-            static fn (self $type): string => $type->value,
-            self::cases(),
-        );
-    }
-}

app/Domains/Prop/Support/PropRules.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Support;
-
-class PropRules
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public static function sync(): array
-    {
-        return [
-            'props' => ['sometimes', 'array'],
-            'props.*' => ['nullable'],
-        ];
-    }
-}

app/Domains/Prop/Support/PropableModels.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Domains\Prop\Support;
-
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Product;
-use App\Domains\Prop\Concerns\Propable;
-use App\Domains\Tenant\Models\Tenant;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class PropableModels
-{
-    /**
-     * @return array<string, class-string<Model>>
-     */
-    public static function map(): array
-    {
-        return [
-            'brand' => Brand::class,
-            'category' => Category::class,
-            'product' => Product::class,
-            'tenant' => Tenant::class,
-        ];
-    }
-
-    /**
-     * @return class-string<Model>
-     */
-    public static function resolveOrFail(string $alias): string
-    {
-        $modelClass = Arr::get(static::map(), $alias);
-
-        if (! is_string($modelClass) || ! is_subclass_of($modelClass, Model::class) || ! in_array(Propable::class, class_uses_recursive($modelClass), true)) {
-            throw new NotFoundHttpException('Propable model not found.');
-        }
-
-        return $modelClass;
-    }
-
-    public static function aliasFor(string $modelClass): ?string
-    {
-        return array_search($modelClass, static::map(), true) ?: null;
-    }
-}

app/Domains/Prop/routes/api.php

@@ -1,10 +0,0 @@
-<?php
-
-use App\Domains\Prop\Controllers\PropController;
-use Illuminate\Support\Facades\Route;
-
-Route::apiResource('prop-models.props', PropController::class)
-    ->parameters([
-        'prop-models' => 'propableType',
-        'props' => 'prop',
-    ]);

app/Domains/Tenant/Controllers/TenantController.php

@@ -21,7 +21,6 @@ class TenantController extends Controller
     {
         $validated = $request->validated();
         $props = $validated['props'] ?? [];
-        unset($validated['props']);
 
         $tenant = Tenant::createWithProps($validated, $props);
 
@@ -37,9 +36,8 @@ class TenantController extends Controller
     {
         $validated = $request->validated();
         $props = $validated['props'] ?? [];
-        unset($validated['props']);
 
-        $tenant = $tenant->updateWithProps($validated, $props);
+        $tenant->updateWithProps($validated, $props);
 
         return TenantResource::make($tenant);
     }

app/Domains/Tenant/Controllers/TenantPropController.php

@@ -2,60 +2,44 @@
 
 namespace App\Domains\Tenant\Controllers;
 
-use App\Domains\Prop\Models\Prop;
-use App\Domains\Prop\Resources\PropResource;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Tenant\Models\TenantProp;
 use App\Domains\Tenant\Requests\StoreTenantPropRequest;
 use App\Domains\Tenant\Requests\UpdateTenantPropRequest;
+use App\Domains\Tenant\Resources\TenantPropResource;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class TenantPropController extends Controller
 {
     public function index(): JsonResponse
     {
-        return PropResource::collection(
-            app(Tenant::class)->props()->latest()->get()
-        )->response();
+        return TenantPropResource::collection(TenantProp::query()->latest()->get())->response();
     }
 
     public function store(StoreTenantPropRequest $request): JsonResponse
     {
-        /** @var Prop $prop */
-        $prop = Tenant::createProp($request->validated());
+        $tenantProp = TenantProp::query()->create($request->validated());
 
-        return PropResource::make($prop)->response()->setStatusCode(201);
+        return TenantPropResource::make($tenantProp)->response()->setStatusCode(201);
     }
 
-    public function show(Prop $tenantProp): PropResource
+    public function show(TenantProp $tenantProp): TenantPropResource
     {
-        return PropResource::make($this->resolveScopedProp($tenantProp));
+        return TenantPropResource::make($tenantProp);
     }
 
-    public function update(UpdateTenantPropRequest $request, Prop $tenantProp): PropResource
+    public function update(UpdateTenantPropRequest $request, TenantProp $tenantProp): TenantPropResource
     {
-        $tenantProp = $this->resolveScopedProp($tenantProp);
         $tenantProp->update($request->validated());
 
-        return PropResource::make($tenantProp);
+        return TenantPropResource::make($tenantProp);
     }
 
-    public function destroy(Prop $tenantProp): Response
+    public function destroy(TenantProp $tenantProp): Response
     {
-        $tenantProp = $this->resolveScopedProp($tenantProp);
         $tenantProp->delete();
 
         return response()->noContent();
     }
-
-    protected function resolveScopedProp(Prop $prop): Prop
-    {
-        if ($prop->propable_type !== Tenant::class) {
-            throw new NotFoundHttpException('Tenant prop not found.');
-        }
-
-        return $prop;
-    }
 }

app/Domains/Tenant/Models/Tenant.php

@@ -2,12 +2,13 @@
 
 namespace App\Domains\Tenant\Models;
 
-use App\Domains\Prop\Concerns\Propable;
 use App\Domains\Catalog\Models\Product;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Facades\DB;
+use LogicException;
 
 #[Fillable([
     'codigo',
@@ -17,7 +18,27 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 class Tenant extends Model
 {
     use HasFactory;
-    use Propable;
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<string, mixed>  $props
+     * @return static
+     */
+    public static function createWithProps(array $attributes, array $props = []): static
+    {
+        unset($attributes['props']);
+
+        /** @var static $tenant */
+        $tenant = DB::transaction(function () use ($attributes, $props): self {
+            /** @var static $createdTenant */
+            $createdTenant = static::query()->create($attributes);
+            $createdTenant->syncPropValues($props);
+
+            return $createdTenant;
+        });
+
+        return $tenant;
+    }
 
     /**
      * @return HasMany<Product, $this>
@@ -26,4 +47,78 @@ class Tenant extends Model
     {
         return $this->hasMany(Product::class, 'tenant_codigo', 'codigo');
     }
+
+    /**
+     * @return HasMany<TenantPropValue, $this>
+     */
+    public function propValues(): HasMany
+    {
+        return $this->hasMany(TenantPropValue::class, 'tenant_codigo', 'codigo');
+    }
+
+    public function getPropValue(TenantProp|string $prop): ?TenantPropValue
+    {
+        $resolvedProp = $this->resolveProp($prop);
+
+        return $this->propValues()
+            ->where('tenant_prop_codigo', $resolvedProp->codigo)
+            ->first();
+    }
+
+    public function setPropValue(TenantProp|string $prop, mixed $value): TenantPropValue
+    {
+        $this->ensurePropValuesCanBeManaged();
+
+        $resolvedProp = $this->resolveProp($prop);
+
+        return $this->propValues()->updateOrCreate(
+            ['tenant_prop_codigo' => $resolvedProp->codigo],
+            ['value' => $value],
+        );
+    }
+
+    /**
+     * @param  array<string, mixed>  $props
+     */
+    public function syncPropValues(array $props): void
+    {
+        foreach ($props as $codigo => $value) {
+            $this->setPropValue((string) $codigo, $value);
+        }
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<string, mixed>  $props
+     * @return static
+     */
+    public function updateWithProps(array $attributes, array $props = []): static
+    {
+        unset($attributes['props']);
+
+        DB::transaction(function () use ($attributes, $props): void {
+            $this->update($attributes);
+            $this->syncPropValues($props);
+        });
+
+        return $this;
+    }
+
+    protected function ensurePropValuesCanBeManaged(): void
+    {
+        if (! $this->exists) {
+            throw new LogicException('Cannot manage prop values for an unsaved tenant.');
+        }
+    }
+
+    protected function resolveProp(TenantProp|string $prop): TenantProp
+    {
+        if ($prop instanceof TenantProp) {
+            return $prop;
+        }
+
+        return TenantProp::query()
+            ->where('codigo', $prop)
+            ->firstOrFail();
+    }
 }

app/Domains/Tenant/Models/TenantProp.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Domains\Tenant\Models;
+
+use App\Domains\Tenant\Support\TenantPropDataType;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'codigo',
+    'nombre',
+    'descripcion',
+    'is_required',
+    'data_type',
+])]
+class TenantProp extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tenant_props';
+
+    /**
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'is_required' => 'boolean',
+            'data_type' => TenantPropDataType::class,
+        ];
+    }
+
+    /**
+     * @return HasMany<TenantPropValue, $this>
+     */
+    public function values(): HasMany
+    {
+        return $this->hasMany(TenantPropValue::class, 'tenant_prop_codigo', 'codigo');
+    }
+}

app/Domains/Tenant/Models/TenantPropValue.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Tenant\Models;
+
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'tenant_codigo',
+    'tenant_prop_codigo',
+    'value',
+])]
+class TenantPropValue extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tenant_prop_values';
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
+    }
+
+    /**
+     * @return BelongsTo<TenantProp, $this>
+     */
+    public function prop(): BelongsTo
+    {
+        return $this->belongsTo(TenantProp::class, 'tenant_prop_codigo', 'codigo');
+    }
+}

app/Domains/Tenant/Requests/StoreTenantPropRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Tenant\Requests;
 
-use App\Domains\Prop\Support\PropDataType;
+use App\Domains\Tenant\Support\TenantPropDataType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -19,10 +19,11 @@ class StoreTenantPropRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('props', 'codigo')],
+            'codigo' => ['required', 'string', 'max:255', Rule::unique('tenant_props', 'codigo')],
             'nombre' => ['required', 'string', 'max:255'],
+            'descripcion' => ['nullable', 'string'],
             'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(PropDataType::class)],
+            'data_type' => ['required', Rule::enum(TenantPropDataType::class)],
         ];
     }
 }

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Tenant\Requests;
 
-use App\Domains\Prop\Support\PropRules;
+use App\Domains\Tenant\Support\TenantPropRules;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
@@ -50,7 +50,7 @@ class StoreTenantRequest extends FormRequest
                 'max:255',
                 Rule::unique('tenants', 'dominio'),
             ],
-            ...PropRules::sync(),
+            ...TenantPropRules::sync(),
         ];
     }
 }

app/Domains/Tenant/Requests/UpdateTenantPropRequest.php

@@ -2,8 +2,8 @@
 
 namespace App\Domains\Tenant\Requests;
 
-use App\Domains\Prop\Models\Prop;
-use App\Domains\Prop\Support\PropDataType;
+use App\Domains\Tenant\Models\TenantProp;
+use App\Domains\Tenant\Support\TenantPropDataType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -19,14 +19,15 @@ class UpdateTenantPropRequest extends FormRequest
      */
     public function rules(): array
     {
-        /** @var Prop|null $tenantProp */
+        /** @var TenantProp|null $tenantProp */
         $tenantProp = $this->route('tenantProp');
 
         return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('props', 'codigo')->ignore($tenantProp?->id)],
+            'codigo' => ['required', 'string', 'max:255', Rule::unique('tenant_props', 'codigo')->ignore($tenantProp?->id)],
             'nombre' => ['required', 'string', 'max:255'],
+            'descripcion' => ['nullable', 'string'],
             'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(PropDataType::class)],
+            'data_type' => ['required', Rule::enum(TenantPropDataType::class)],
         ];
     }
 }

app/Domains/Tenant/Requests/UpdateTenantRequest.php

@@ -2,9 +2,9 @@
 
 namespace App\Domains\Tenant\Requests;
 
-use App\Domains\Prop\Support\PropRules;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Tenant\Support\TenantPropRules;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -59,7 +59,7 @@ class UpdateTenantRequest extends FormRequest
                 'max:255',
                 Rule::unique('tenants', 'dominio')->ignore($tenant?->id),
             ],
-            ...PropRules::sync(),
+            ...TenantPropRules::sync(),
         ];
     }
 }

app/Domains/Tenant/Resources/TenantPropResource.php

@@ -1,16 +1,14 @@
 <?php
 
-namespace App\Domains\Prop\Resources;
+namespace App\Domains\Tenant\Resources;
 
-use App\Domains\Prop\Models\Prop;
-use App\Domains\Prop\Support\PropableModels;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin Prop
+ * @mixin \App\Domains\Tenant\Models\TenantProp
  */
-class PropResource extends JsonResource
+class TenantPropResource extends JsonResource
 {
     /**
      * @return array<string, mixed>
@@ -19,11 +17,11 @@ class PropResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'propable_type' => PropableModels::aliasFor($this->propable_type) ?? $this->propable_type,
             'codigo' => $this->codigo,
             'nombre' => $this->nombre,
+            'descripcion' => $this->descripcion,
             'is_required' => $this->is_required,
-            'data_type' => $this->data_type?->value,
+            'data_type' => $this->data_type?->value ?? $this->data_type,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];

app/Domains/Tenant/Resources/TenantResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Tenant\Resources;
 
-use App\Domains\Prop\Resources\PropValueResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -11,6 +10,29 @@ use Illuminate\Http\Resources\Json\JsonResource;
  */
 class TenantResource extends JsonResource
 {
+    /**
+     * @return array<string, mixed>
+     */
+    protected function collapseProps(): array
+    {
+        return $this->resource->propValues()
+            ->with('prop')
+            ->get()
+            ->mapWithKeys(fn ($propValue): array => [
+                $propValue->tenant_prop_codigo => $this->normalizePropValue($propValue->value, $propValue->prop?->data_type?->value),
+            ])
+            ->all();
+    }
+
+    protected function normalizePropValue(mixed $value, ?string $dataType): mixed
+    {
+        return match ($dataType) {
+            'boolean' => filter_var($value, FILTER_VALIDATE_BOOL, FILTER_NULL_ON_FAILURE) ?? $value,
+            'number' => is_numeric($value) ? $value + 0 : $value,
+            default => $value,
+        };
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -21,7 +43,7 @@ class TenantResource extends JsonResource
             'codigo' => $this->codigo,
             'nombre' => $this->nombre,
             'dominio' => $this->dominio,
-            'props' => PropValueResource::collapsedFromPropable($this->resource)
+            'props' => $this->collapseProps(),
         ];
     }
 }

app/Domains/Tenant/Support/TenantPropDataType.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Domains\Tenant\Support;
+
+enum TenantPropDataType: string
+{
+    case String = 'string';
+    case Number = 'number';
+    case Boolean = 'boolean';
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Tenant/Support/TenantPropRules.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Domains\Tenant\Support;
+
+use App\Domains\Tenant\Models\TenantProp;
+use Closure;
+
+class TenantPropRules
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public static function sync(): array
+    {
+        return [
+            'props' => [
+                'sometimes',
+                'array',
+                static function (string $attribute, mixed $value, Closure $fail): void {
+                    static::validateExistingProps($attribute, $value, $fail);
+                },
+            ],
+            'props.*' => ['nullable'],
+        ];
+    }
+
+    protected static function validateExistingProps(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! is_array($value) || $value === []) {
+            return;
+        }
+
+        $propCodes = array_map('strval', array_keys($value));
+        $existingPropCodes = TenantProp::query()
+            ->whereIn('codigo', $propCodes)
+            ->pluck('codigo')
+            ->all();
+
+        $missingPropCodes = array_values(array_diff($propCodes, $existingPropCodes));
+
+        if ($missingPropCodes === []) {
+            return;
+        }
+
+        $fail(sprintf(
+            'The selected %s are invalid for Tenant: %s.',
+            $attribute,
+            implode(', ', $missingPropCodes),
+        ));
+    }
+}

database/migrations/2026_06_22_120300_create_model_prop_values_table.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('model_prop_values', function (Blueprint $table) {
-            $table->id();
-            $table->unsignedBigInteger('valuable_id');
-            $table->foreignId('prop_id')->constrained('props')->cascadeOnUpdate()->cascadeOnDelete();
-            $table->text('value')->nullable();
-            $table->timestamps();
-
-            $table->unique(['prop_id', 'valuable_id']);
-            $table->index('valuable_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('model_prop_values');
-    }
-};

database/migrations/2026_06_22_130000_convert_prop_data_types_to_enum.php

@@ -1,106 +0,0 @@
-<?php
-
-use App\Domains\Prop\Support\PropDataType;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        if (! Schema::hasTable('props')) {
-            return;
-        }
-
-        if (Schema::hasColumn('props', 'data_type_id')) {
-            Schema::table('props', function (Blueprint $table) {
-                $table->string('data_type')->nullable()->after('is_required');
-            });
-
-            if (Schema::hasTable('props_data_types')) {
-                $typeMap = DB::table('props_data_types')
-                    ->pluck('code', 'id')
-                    ->map(static fn (mixed $code): string => in_array($code, PropDataType::values(), true) ? (string) $code : PropDataType::String->value)
-                    ->all();
-
-                DB::table('props')
-                    ->select(['id', 'data_type_id'])
-                    ->orderBy('id')
-                    ->get()
-                    ->each(function (object $prop) use ($typeMap): void {
-                        DB::table('props')
-                            ->where('id', $prop->id)
-                            ->update([
-                                'data_type' => $typeMap[$prop->data_type_id] ?? PropDataType::String->value,
-                            ]);
-                    });
-            } else {
-                DB::table('props')->update([
-                    'data_type' => PropDataType::String->value,
-                ]);
-            }
-
-            Schema::table('props', function (Blueprint $table) {
-                $table->dropForeign(['data_type_id']);
-                $table->dropColumn('data_type_id');
-            });
-
-            Schema::table('props', function (Blueprint $table) {
-                $table->string('data_type')->nullable(false)->change();
-            });
-        }
-
-        if (Schema::hasTable('props_data_types')) {
-            Schema::drop('props_data_types');
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        if (! Schema::hasTable('props_data_types')) {
-            Schema::create('props_data_types', function (Blueprint $table) {
-                $table->id();
-                $table->string('name');
-                $table->string('code')->unique();
-                $table->timestamps();
-            });
-
-            DB::table('props_data_types')->insert([
-                [
-                    'id' => 1,
-                    'name' => 'String',
-                    'code' => PropDataType::String->value,
-                    'created_at' => now(),
-                    'updated_at' => now(),
-                ],
-            ]);
-        }
-
-        if (Schema::hasTable('props') && Schema::hasColumn('props', 'data_type') && ! Schema::hasColumn('props', 'data_type_id')) {
-            Schema::table('props', function (Blueprint $table) {
-                $table->foreignId('data_type_id')->nullable()->after('is_required')->constrained('props_data_types')->cascadeOnUpdate()->restrictOnDelete();
-            });
-
-            $stringTypeId = DB::table('props_data_types')
-                ->where('code', PropDataType::String->value)
-                ->value('id');
-
-            DB::table('props')->update([
-                'data_type_id' => $stringTypeId,
-            ]);
-
-            Schema::table('props', function (Blueprint $table) {
-                $table->foreignId('data_type_id')->nullable(false)->change();
-                $table->dropColumn('data_type');
-            });
-        }
-    }
-};

database/migrations/2026_06_24_000000_create_categorias_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('categorias', function (Blueprint $table) {
+            $table->id();
+            $table->string('tenant_code')->nullable();
+            $table->unsignedBigInteger('categoria_id')->nullable();
+            $table->string('nombre');
+            $table->timestamps();
+
+            $table->foreign('tenant_code')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+
+            $table->foreign('categoria_id')
+                ->references('id')
+                ->on('categorias')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('categorias');
+    }
+};

database/migrations/2026_06_24_000100_create_brands_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('brands', function (Blueprint $table) {
+            $table->id();
+            $table->string('tenant_codigo');
+            $table->string('nombre');
+            $table->text('descripcion')->nullable();
+            $table->timestamps();
+
+            $table->foreign('tenant_codigo')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('brands');
+    }
+};

database/migrations/2026_06_24_000200_create_productos_variantes_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('productos_variantes', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('producto_id');
+            $table->string('slug')->nullable();
+            $table->string('nombre')->nullable();
+            $table->unsignedInteger('stock')->default(0);
+            $table->text('descripcion')->nullable();
+            $table->decimal('precio', 10, 2);
+            $table->timestamps();
+
+            $table->foreign('producto_id')
+                ->references('id')
+                ->on('productos')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('productos_variantes');
+    }
+};

database/migrations/2026_06_24_000250_create_tenant_props_table.php

@@ -11,16 +11,14 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create('props', function (Blueprint $table) {
+        Schema::create('tenant_props', function (Blueprint $table) {
             $table->id();
-            $table->string('propable_type');
             $table->string('codigo')->unique();
             $table->string('nombre');
+            $table->text('descripcion')->nullable();
             $table->boolean('is_required')->default(false);
             $table->string('data_type');
             $table->timestamps();
-
-            $table->index('propable_type');
         });
     }
 
@@ -29,6 +27,6 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('props');
+        Schema::dropIfExists('tenant_props');
     }
 };

database/migrations/2026_06_24_000260_create_model_prop_values_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tenant_prop_values', function (Blueprint $table) {
+            $table->id();
+            $table->string('tenant_codigo');
+            $table->string('tenant_prop_codigo');
+            $table->text('value')->nullable();
+            $table->timestamps();
+
+            $table->foreign('tenant_codigo')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+
+            $table->foreign('tenant_prop_codigo')
+                ->references('codigo')
+                ->on('tenant_props')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+
+            $table->unique(['tenant_codigo', 'tenant_prop_codigo']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('tenant_prop_values');
+    }
+};

database/migrations/2026_06_24_000300_create_productos_attributes_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('productos_attributes', function (Blueprint $table) {
+            $table->id();
+            $table->string('tenant_codigo');
+            $table->string('codigo');
+            $table->string('nombre');
+            $table->boolean('is_required')->default(false);
+            $table->json('metadata_schema')->nullable();
+            $table->string('type');
+            $table->timestamps();
+
+            $table->foreign('tenant_codigo')
+                ->references('codigo')
+                ->on('tenants')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+
+            $table->unique(['tenant_codigo', 'codigo']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('productos_attributes');
+    }
+};

database/migrations/2026_06_24_000310_create_attribute_options_table.php

@@ -11,15 +11,13 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create('prop_options', function (Blueprint $table) {
+        Schema::create('attribute_options', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('prop_id')->constrained('props')->cascadeOnUpdate()->cascadeOnDelete();
-            $table->string('value');
+            $table->foreignId('attribute_id')->constrained('productos_attributes')->cascadeOnUpdate()->cascadeOnDelete();
             $table->string('label');
             $table->unsignedInteger('sort_order')->default(0);
+            $table->json('metadata')->nullable();
             $table->timestamps();
-
-            $table->unique(['prop_id', 'value']);
         });
     }
 
@@ -28,6 +26,6 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('prop_options');
+        Schema::dropIfExists('attribute_options');
     }
 };

database/migrations/2026_06_24_000320_create_productos_variantes_definiciones_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('productos_variantes_definiciones', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('producto_variante_id');
+            $table->foreignId('attribute_id')->constrained('productos_attributes')->cascadeOnUpdate()->cascadeOnDelete();
+            $table->text('value')->nullable();
+            $table->timestamps();
+
+            $table->foreign('producto_variante_id')
+                ->references('id')
+                ->on('productos_variantes')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+
+            $table->unique(['producto_variante_id', 'attribute_id'], 'prod_var_def_variant_attr_unique');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('productos_variantes_definiciones');
+    }
+};

routes/api.php

@@ -8,5 +8,4 @@ Route::get('/user', function (Request $request) {
 })->middleware('auth:sanctum');
 
 require __DIR__.'/../app/Domains/Catalog/routes/api.php';
-require __DIR__.'/../app/Domains/Prop/routes/api.php';
 require __DIR__.'/../app/Domains/Tenant/routes/api.php';

tests/Feature/Catalog/ProductAttributeControllerTest.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Feature\Catalog;
+
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ProductAttributeControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_creates_a_select_attribute_with_options(): void
+    {
+        Tenant::create([
+            'codigo' => 'acme',
+            'nombre' => 'Acme',
+            'dominio' => 'acme.com',
+        ]);
+
+        $response = $this->postJson('/api/tenants/acme/product-attributes', [
+            'codigo' => 'color',
+            'nombre' => 'Color',
+            'is_required' => true,
+            'type' => 'select',
+            'metadata_schema' => [
+                'swatch' => ['type' => 'hex'],
+            ],
+            'options' => [
+                [
+                    'label' => 'Red',
+                    'sort_order' => 1,
+                    'metadata' => ['hex' => '#ff0000'],
+                ],
+                [
+                    'label' => 'Blue',
+                    'sort_order' => 2,
+                    'metadata' => ['hex' => '#0000ff'],
+                ],
+            ],
+        ]);
+
+        $response
+            ->assertCreated()
+            ->assertJsonPath('tenant_codigo', 'acme')
+            ->assertJsonPath('codigo', 'color')
+            ->assertJsonPath('type', 'select')
+            ->assertJsonPath('options.0.label', 'Red')
+            ->assertJsonPath('options.1.metadata.hex', '#0000ff');
+
+        $this->assertDatabaseHas('productos_attributes', [
+            'tenant_codigo' => 'acme',
+            'codigo' => 'color',
+            'type' => 'select',
+        ]);
+
+        $this->assertDatabaseHas('attribute_options', [
+            'label' => 'Red',
+            'sort_order' => 1,
+        ]);
+    }
+
+    public function test_it_rejects_options_for_text_attributes(): void
+    {
+        Tenant::create([
+            'codigo' => 'acme',
+            'nombre' => 'Acme',
+            'dominio' => 'acme.com',
+        ]);
+
+        $response = $this->postJson('/api/tenants/acme/product-attributes', [
+            'codigo' => 'material',
+            'nombre' => 'Material',
+            'type' => 'text',
+            'options' => [
+                ['label' => 'Cotton'],
+            ],
+        ]);
+
+        $response
+            ->assertUnprocessable()
+            ->assertJsonValidationErrors(['options']);
+    }
+}

tests/Feature/Prop/PropControllerTest.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Tests\Feature\Prop;
-
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class PropControllerTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_it_creates_a_prop_using_enum_data_type(): void
-    {
-        $response = $this->postJson('/api/prop-models/tenant/props', [
-            'codigo' => 'color_primario',
-            'nombre' => 'Color primario',
-            'is_required' => false,
-            'data_type' => 'string',
-        ]);
-
-        $response
-            ->assertCreated()
-            ->assertJsonPath('propable_type', 'tenant')
-            ->assertJsonPath('data_type', 'string');
-
-        $this->assertDatabaseHas('props', [
-            'codigo' => 'color_primario',
-            'data_type' => 'string',
-        ]);
-    }
-
-    public function test_it_rejects_unknown_enum_data_type(): void
-    {
-        $response = $this->postJson('/api/prop-models/tenant/props', [
-            'codigo' => 'color_primario',
-            'nombre' => 'Color primario',
-            'is_required' => false,
-            'data_type' => 'unsupported-type',
-        ]);
-
-        $response
-            ->assertUnprocessable()
-            ->assertJsonValidationErrors(['data_type']);
-    }
-}

tests/Feature/Tenant/BootstrapTenantControllerTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Feature\Tenant;
 
 use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Tenant\Models\TenantProp;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
@@ -18,9 +19,10 @@ class BootstrapTenantControllerTest extends TestCase
             'dominio' => 'acme.com',
         ]);
 
-        Tenant::createProp([
+        TenantProp::create([
             'codigo' => 'primary_color',
             'nombre' => 'Primary Color',
+            'descripcion' => 'Brand color',
             'is_required' => false,
             'data_type' => 'string',
         ]);
@@ -63,15 +65,33 @@ class BootstrapTenantControllerTest extends TestCase
 
     public function test_it_rejects_duplicate_domains_after_normalization_when_storing(): void
     {
+        TenantProp::create([
+            'codigo' => 'primary_color',
+            'nombre' => 'Primary Color',
+            'descripcion' => 'Brand color',
+            'is_required' => false,
+            'data_type' => 'string',
+        ]);
+
         $firstResponse = $this->postJson('/api/tenants', [
             'codigo' => 'acme',
             'nombre' => 'Acme',
             'dominio' => 'https://ACME.com/path',
+            'props' => [
+                'primary_color' => 'blue',
+            ],
         ]);
 
         $firstResponse
             ->assertCreated()
-            ->assertJsonPath('dominio', 'acme.com');
+            ->assertJsonPath('dominio', 'acme.com')
+            ->assertJsonPath('props.primary_color', 'blue');
+
+        $this->assertDatabaseHas('tenant_prop_values', [
+            'tenant_codigo' => 'acme',
+            'tenant_prop_codigo' => 'primary_color',
+            'value' => 'blue',
+        ]);
 
         $secondResponse = $this->postJson('/api/tenants', [
             'codigo' => 'globex',
@@ -86,6 +106,14 @@ class BootstrapTenantControllerTest extends TestCase
 
     public function test_it_allows_keeping_the_same_domain_on_update_but_rejects_collisions(): void
     {
+        TenantProp::create([
+            'codigo' => 'primary_color',
+            'nombre' => 'Primary Color',
+            'descripcion' => 'Brand color',
+            'is_required' => false,
+            'data_type' => 'string',
+        ]);
+
         $tenant = Tenant::create([
             'codigo' => 'acme',
             'nombre' => 'Acme',
@@ -102,12 +130,16 @@ class BootstrapTenantControllerTest extends TestCase
             'codigo' => 'acme',
             'nombre' => 'Acme Updated',
             'dominio' => 'https://ACME.com:443/admin',
+            'props' => [
+                'primary_color' => 'green',
+            ],
         ]);
 
         $successfulResponse
             ->assertOk()
             ->assertJsonPath('nombre', 'Acme Updated')
-            ->assertJsonPath('dominio', 'acme.com');
+            ->assertJsonPath('dominio', 'acme.com')
+            ->assertJsonPath('props.primary_color', 'green');
 
         $failingResponse = $this->putJson("/api/tenants/{$otherTenant->id}", [
             'codigo' => 'globex',

tests/Feature/Tenant/TenantPropControllerTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Feature\Tenant;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class TenantPropControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_creates_a_tenant_prop(): void
+    {
+        $response = $this->postJson('/api/tenant-props', [
+            'codigo' => 'primary_color',
+            'nombre' => 'Primary Color',
+            'descripcion' => 'Brand color',
+            'is_required' => false,
+            'data_type' => 'string',
+        ]);
+
+        $response
+            ->assertCreated()
+            ->assertJsonPath('codigo', 'primary_color')
+            ->assertJsonPath('data_type', 'string');
+
+        $this->assertDatabaseHas('tenant_props', [
+            'codigo' => 'primary_color',
+            'data_type' => 'string',
+        ]);
+    }
+
+    public function test_it_rejects_unknown_data_type(): void
+    {
+        $response = $this->postJson('/api/tenant-props', [
+            'codigo' => 'primary_color',
+            'nombre' => 'Primary Color',
+            'data_type' => 'unsupported',
+        ]);
+
+        $response
+            ->assertUnprocessable()
+            ->assertJsonValidationErrors(['data_type']);
+    }
+}