feat: enhance item attributes management by adding sort order; update related models, resources, and tests for visibility and ordering of variants

tests/Feature/Catalog/CatalogControllerTest.php

@@ -48,8 +48,15 @@ class CatalogControllerTest extends TestCase
             'real_stock' => 4,
             'reserved_stock' => 1,
         ]);
+        $unavailableInventory = Inventory::query()->create([
+            'real_stock' => 2,
+            'reserved_stock' => 2,
+        ]);
         $variantItem->variants()->create(['inventory_id' => $firstInventory->id]);
         $variantItem->variants()->create(['inventory_id' => $secondInventory->id]);
+        $unavailableVariant = $variantItem->variants()->create([
+            'inventory_id' => $unavailableInventory->id,
+        ]);
         $cart->featuredItems()->create(['catalog_item_id' => $variantItem->id]);
 
         $response = $this->getJson("/api/tenants/{$tenant->codigo}/catalog");
@@ -67,6 +74,7 @@ class CatalogControllerTest extends TestCase
             ->assertJsonCount(2, '0.items.0.variants')
             ->assertJsonPath('0.items.0.variants.0.stock_tecnico', 4)
             ->assertJsonPath('0.items.0.variants.1.stock_tecnico', 3)
+            ->assertJsonMissing(['id' => $unavailableVariant->id, 'stock_tecnico' => 0])
             ->assertJsonPath('1.title', 'Row')
             ->assertJsonPath('1.items.data.0.stock_tecnico', 8)
             ->assertJsonCount(0, '1.items.data.0.variants');

tests/Feature/Catalog/CatalogItemDetailControllerTest.php

@@ -45,7 +45,7 @@ class CatalogItemDetailControllerTest extends TestCase
         $this->assertStringContainsString($itemImage->path, $response->json('data.images.0'));
     }
 
-    public function test_it_selects_the_first_variant_and_returns_its_images_by_default(): void
+    public function test_it_filters_unavailable_variants_and_selects_the_first_available_one(): void
     {
         Storage::fake('s3');
         $tenant = $this->createTenant('detail-default');
@@ -66,14 +66,21 @@ class CatalogItemDetailControllerTest extends TestCase
 
         $response
             ->assertOk()
-            ->assertJsonPath('data.selected_variant.id', $firstVariant->id)
-            ->assertJsonPath('data.selected_variant.stock_tecnico', 0)
+            ->assertJsonCount(1, 'data.variants')
+            ->assertJsonPath('data.variants.0.id', $secondVariant->id)
+            ->assertJsonPath('data.selected_variant.id', $secondVariant->id)
+            ->assertJsonPath('data.selected_variant.stock_tecnico', 6)
             ->assertJsonCount(1, 'data.selected_variant.images');
         $response
             ->assertJsonMissingPath('data.stock_tecnico')
             ->assertJsonMissingPath('data.images');
-        $this->assertStringContainsString($firstImage->path, $response->json('data.selected_variant.images.0'));
+        $this->assertStringContainsString($secondImage->path, $response->json('data.selected_variant.images.0'));
+        $this->assertStringNotContainsString($firstImage->path, $response->json('data.selected_variant.images.0'));
         $this->assertStringNotContainsString($itemImage->path, $response->json('data.selected_variant.images.0'));
+
+        $this->getJson(
+            "/api/tenants/{$tenant->codigo}/catalog-items/{$item->id}?variant_id={$firstVariant->id}"
+        )->assertNotFound();
     }
 
     public function test_it_selects_the_requested_variant_and_lists_variant_values_and_stock(): void
@@ -222,6 +229,51 @@ class CatalogItemDetailControllerTest extends TestCase
         $this->assertDatabaseCount('attribute_options', 0);
     }
 
+    public function test_it_orders_item_attributes_by_sort_order_and_then_attribute_label(): void
+    {
+        $tenant = $this->createTenant('detail-attribute-order');
+        $item = $this->createItem($tenant, 'Ordered attributes');
+        $variant = $this->createVariant($item, 10, 0);
+
+        $attributes = collect([
+            ['code' => 'zeta', 'label' => 'Zeta', 'sort_order' => 2],
+            ['code' => 'priority', 'label' => 'Priority', 'sort_order' => 1],
+            ['code' => 'alpha', 'label' => 'Alpha', 'sort_order' => 2],
+        ])->mapWithKeys(function (array $data) use ($tenant, $item): array {
+            $attribute = Attribute::query()->create([
+                'tenant_codigo' => $tenant->codigo,
+                'codigo' => $data['code'],
+                'nombre' => $data['label'],
+                'type' => FieldType::String,
+            ]);
+            $itemAttribute = $item->itemAttributes()->create([
+                'attribute_id' => $attribute->id,
+                'sort_order' => $data['sort_order'],
+            ]);
+
+            return [$data['code'] => $itemAttribute];
+        });
+
+        foreach (['zeta', 'priority', 'alpha'] as $code) {
+            $variant->definitions()->create([
+                'item_attribute_id' => $attributes[$code]->id,
+                'value' => $code,
+            ]);
+        }
+
+        $response = $this->getJson("/api/tenants/{$tenant->codigo}/catalog-items/{$item->id}")
+            ->assertOk()
+            ->assertJsonPath('data.attributes.0.codigo', 'priority')
+            ->assertJsonPath('data.attributes.0.sort_order', 1)
+            ->assertJsonPath('data.attributes.1.codigo', 'alpha')
+            ->assertJsonPath('data.attributes.2.codigo', 'zeta');
+
+        $this->assertSame(
+            ['priority', 'alpha', 'zeta'],
+            array_keys($response->json('data.variants.0.values')),
+        );
+    }
+
     private function createItem(
         Tenant $tenant,
         string $name,

tests/Feature/Catalog/CatalogSchemaTest.php

@@ -24,6 +24,7 @@ class CatalogSchemaTest extends TestCase
         $this->assertFalse(Schema::hasTable('bundle_items'));
         $this->assertTrue(Schema::hasTable('variantes'));
         $this->assertTrue(Schema::hasTable('item_attributes'));
+        $this->assertTrue(Schema::hasColumn('item_attributes', 'sort_order'));
         $this->assertTrue(Schema::hasTable('variant_values'));
     }
 

tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php

@@ -5,6 +5,7 @@ namespace Tests\Feature\FiestaFutbolInfantil;
 use App\Domains\Auth\Models\User;
 use App\Domains\Authorization\Enums\RoleCode;
 use App\Domains\Catalog\Models\Attribute;
+use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Category;
 use App\Domains\Menu\Models\Menu;
 use App\Domains\Shared\Enums\FieldType;
@@ -68,6 +69,22 @@ class FoodControllerTest extends TestCase
         $this->assertDatabaseCount('inventories', 2);
         $this->assertDatabaseCount('variant_event_dates', 2);
         $this->assertDatabaseCount('variant_values', 4);
+        $food = CatalogItem::query()->where('slug', 'comida')->sole();
+        $this->assertDatabaseHas('item_attributes', [
+            'catalog_item_id' => $food->id,
+            'attribute_id' => Attribute::query()->where('codigo', 'event_date')->sole()->id,
+            'sort_order' => 1,
+        ]);
+        $this->assertDatabaseHas('item_attributes', [
+            'catalog_item_id' => $food->id,
+            'attribute_id' => Attribute::query()->where('codigo', 'horario')->sole()->id,
+            'sort_order' => 2,
+        ]);
+        $this->assertDatabaseHas('item_attributes', [
+            'catalog_item_id' => $food->id,
+            'attribute_id' => Attribute::query()->where('codigo', 'servicio')->sole()->id,
+            'sort_order' => 3,
+        ]);
         $this->assertDatabaseHas('catalog_items', [
             'tenant_code' => $tenant->codigo,
             'slug' => 'comida',

tests/Unit/Catalog/CatalogModelsTest.php

@@ -223,6 +223,43 @@ class CatalogModelsTest extends TestCase
         );
     }
 
+    public function test_variant_orders_selection_options_by_item_order_and_attribute_label(): void
+    {
+        $definitions = collect([
+            ['id' => 1, 'code' => 'zeta', 'label' => 'Zeta', 'sort_order' => 2],
+            ['id' => 2, 'code' => 'priority', 'label' => 'Priority', 'sort_order' => 1],
+            ['id' => 3, 'code' => 'alpha', 'label' => 'Alpha', 'sort_order' => 2],
+        ])->map(function (array $data): VariantDefinition {
+            $attribute = new Attribute([
+                'codigo' => $data['code'],
+                'nombre' => $data['label'],
+            ]);
+            $attribute->setRelation('options', new EloquentCollection);
+
+            $itemAttribute = new ItemAttribute([
+                'sort_order' => $data['sort_order'],
+                'allow_multi_select' => false,
+            ]);
+            $itemAttribute->id = $data['id'];
+            $itemAttribute->setRelation('attribute', $attribute);
+
+            $definition = new VariantDefinition(['value' => $data['code']]);
+            $definition->item_attribute_id = $itemAttribute->id;
+            $definition->setRelation('itemAttribute', $itemAttribute);
+
+            return $definition;
+        });
+
+        $variant = new Variant;
+        $variant->setRelation('definitions', new EloquentCollection($definitions));
+        $variant->setRelation('eventDates', new EloquentCollection);
+
+        $this->assertSame(
+            ['priority', 'alpha', 'zeta'],
+            $variant->selectionOptions()->keys()->all(),
+        );
+    }
+
     public function test_inventory_maps_stock_without_a_polymorphic_owner(): void
     {
         $inventory = $this->trackedInventory(realStock: 10, reservedStock: 3);
@@ -249,6 +286,21 @@ class CatalogModelsTest extends TestCase
         $this->assertTrue($item->isAvailable());
     }
 
+    public function test_catalog_item_only_exposes_available_tracked_variants(): void
+    {
+        $unavailable = (new Variant)->setRelation('inventory', $this->trackedInventory(3, 3));
+        $available = (new Variant)->setRelation('inventory', $this->trackedInventory(5, 2));
+        $item = new CatalogItem;
+        $item->inventory_policy = InventoryPolicy::Tracked;
+        $item->setRelation('variants', new EloquentCollection([$unavailable, $available]));
+
+        $this->assertSame([$available], $item->visibleVariants()->all());
+
+        $item->inventory_policy = InventoryPolicy::Unlimited;
+
+        $this->assertSame([$unavailable, $available], $item->visibleVariants()->all());
+    }
+
     public function test_catalog_item_prioritizes_its_inventory_over_variants(): void
     {
         $item = new CatalogItem;