From 6c56b338c1c638c8939c0255e436f1bb8344f3d3 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:08 -0300 Subject: [PATCH 01/23] feat(inventory): add calculated availability and movement ledger --- .../Enums/InventoryMovementOperation.php | 18 ++ .../Commerce/Catalog/Models/CatalogItem.php | 17 +- .../Commerce/Catalog/Models/Inventory.php | 306 +++++++++++++++--- .../Catalog/Models/InventoryMovement.php | 45 +++ ...000_generate_available_inventory_stock.php | 59 ++++ ...10000_create_inventory_movements_table.php | 33 ++ .../InventoryStockMovementMigrationTest.php | 135 ++++++++ 7 files changed, 569 insertions(+), 44 deletions(-) create mode 100644 app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php create mode 100644 app/Domains/Commerce/Catalog/Models/InventoryMovement.php create mode 100644 database/migrations/2026_09_25_000000_generate_available_inventory_stock.php create mode 100644 database/migrations/2026_09_25_010000_create_inventory_movements_table.php create mode 100644 tests/Feature/Migrations/InventoryStockMovementMigrationTest.php diff --git a/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php b/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php new file mode 100644 index 00000000..53870d5e --- /dev/null +++ b/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php @@ -0,0 +1,18 @@ + $query */ public function scopeWhereAvailable(Builder $query): Builder { + $availableInventory = static fn (Builder $inventoryQuery): Builder => Schema::hasColumn('inventories', 'available_stock') + ? $inventoryQuery->where('inventories.available_stock', '>', 0) + : $inventoryQuery->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock'); + return $query->where(function (Builder $query): void { $query->whereNull('catalog_items.sales_end_at') ->orWhere('catalog_items.sales_end_at', '>', now()); - })->where(function (Builder $query): void { + })->where(function (Builder $query) use ($availableInventory): void { $query ->where(function (Builder $unlimitedQuery): void { $unlimitedQuery @@ -236,20 +241,18 @@ class CatalogItem extends Model ->whereNull('replaced_by_variant_id') ->whereHas( 'inventory', - fn (Builder $inventoryQuery): Builder => $inventoryQuery - ->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock') + $availableInventory ) ) - ->orWhere(function (Builder $directItemQuery): void { + ->orWhere(function (Builder $directItemQuery) use ($availableInventory): void { $directItemQuery ->whereDoesntHave('variants') - ->where(function (Builder $inventoryQuery): void { + ->where(function (Builder $inventoryQuery) use ($availableInventory): void { $inventoryQuery ->whereNull('catalog_items.inventory_id') ->orWhereHas( 'inventory', - fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery - ->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock') + $availableInventory ); }); }); diff --git a/app/Domains/Commerce/Catalog/Models/Inventory.php b/app/Domains/Commerce/Catalog/Models/Inventory.php index d18af516..137dca39 100644 --- a/app/Domains/Commerce/Catalog/Models/Inventory.php +++ b/app/Domains/Commerce/Catalog/Models/Inventory.php @@ -2,11 +2,17 @@ namespace App\Domains\Commerce\Catalog\Models; +use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation; +use App\Domains\Core\Auth\Models\User; 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\Database\Eloquent\Relations\HasOne; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; +use Illuminate\Validation\ValidationException; #[Fillable([ 'sold_units', @@ -38,6 +44,7 @@ class Inventory extends Model 'reserved_stock' => 'integer', 'entry_reserved_stock' => 'integer', 'real_stock' => 'integer', + 'available_stock' => 'integer', ]; } @@ -59,70 +66,295 @@ class Inventory extends Model return $this->hasMany(StockReservationLine::class); } + /** @return HasMany */ + public function movements(): HasMany + { + return $this->hasMany(InventoryMovement::class); + } + public function availableStock(): int { - return max(0, $this->real_stock - $this->reserved_stock - $this->entry_reserved_stock); + if (! array_key_exists('available_stock', $this->attributes)) { + return max(0, $this->real_stock - $this->reserved_stock - ($this->entry_reserved_stock ?? 0)); + } + + return (int) $this->getAttribute('available_stock'); } public function reserveEntry(int $amount, bool $tracksInventory): void { - if ($amount < 1 || ($tracksInventory && $this->availableStock() < $amount)) { - throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.'); - } - $this->entry_reserved_stock += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::EntryStockReserved, + ['entry_reserved_stock' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) { + throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.'); + } + }, + ); } public function releaseEntry(int $amount): void { - if ($amount < 1 || $this->entry_reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.'); - } - - $this->entry_reserved_stock -= $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::EntryStockReleased, + ['entry_reserved_stock' => -$amount], + function (self $inventory) use ($amount): void { + if ($amount < 1 || $inventory->entry_reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.'); + } + }, + ); } public function reserve(int $amount, bool $tracksInventory): void { - if ($amount < 0) { - throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.'); - } - - if ($tracksInventory && $this->availableStock() < $amount) { - throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.'); - } - - $this->reserved_stock += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockReserved, + ['reserved_stock' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 0) { + throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.'); + } + if ($tracksInventory && $inventory->availableStock() < $amount) { + throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.'); + } + }, + ); } public function release(int $amount): void { - if ($amount < 0 || $this->reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad reservada no es válida.'); - } - - $this->reserved_stock -= $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockReleased, + ['reserved_stock' => -$amount], + function (self $inventory) use ($amount): void { + if ($amount < 0 || $inventory->reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad reservada no es válida.'); + } + }, + ); } public function buy(int $amount, bool $tracksInventory): void { - if ($amount < 0 || $this->reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.'); + $counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount]; + if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) { + $counterDeltas['real_stock'] = -$amount; } - if ($tracksInventory && $this->real_stock - $this->entry_reserved_stock < $amount) { - throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); + $this->mutate( + InventoryMovementOperation::PurchaseCommitted, + $counterDeltas, + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 0 || $inventory->reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.'); + } + if ($tracksInventory && $inventory->availableStock() < 0) { + throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); + } + }, + ); + } + + public function adjustAvailableStock( + int $delta, + ?User $responsibleUser = null, + ?string $idempotencyKey = null, + ): void { + if ($delta === 0) { + return; } - if ($tracksInventory) { - $this->real_stock -= $amount; + $operation = $delta > 0 + ? InventoryMovementOperation::StockIncreased + : InventoryMovementOperation::StockDecreased; + + $this->mutate( + $operation, + ['real_stock' => $delta], + function (self $inventory) use ($delta): void { + if ($inventory->real_stock + $delta < 0 || $inventory->availableStock() + $delta < 0) { + throw ValidationException::withMessages([ + 'stock_difference' => ['El ajuste dejaría el stock en un valor inválido.'], + ]); + } + }, + $responsibleUser, + $idempotencyKey, + ); + } + + public function refundStock(int $amount, ?User $responsibleUser = null): void + { + $counterDeltas = ['refunded_units' => $amount]; + if (! array_key_exists('available_stock', $this->attributes)) { + $counterDeltas['real_stock'] = $amount; } - $this->reserved_stock -= $amount; - $this->sold_units += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockRefunded, + $counterDeltas, + function () use ($amount): void { + if ($amount < 1) { + throw new \InvalidArgumentException('La cantidad devuelta debe ser positiva.'); + } + }, + $responsibleUser, + ); + } + + public function commitDirectSale(int $amount, bool $tracksInventory = true): void + { + $this->mutate( + InventoryMovementOperation::PurchaseCommitted, + ['sold_units' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) { + throw new \InvalidArgumentException('No hay suficiente stock para confirmar la compra.'); + } + }, + ); + } + + public function recordInitialization(?User $responsibleUser = null): void + { + $this->recordCurrentState(InventoryMovementOperation::StockInitialized, $responsibleUser); + } + + public function recordTransferInitialization(?User $responsibleUser = null): void + { + $this->recordCurrentState(InventoryMovementOperation::InventoryTransferred, $responsibleUser); + } + + /** @param array $counterDeltas */ + public function transferCounters(array $counterDeltas, ?User $responsibleUser = null): void + { + $counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0); + if ($counterDeltas === []) { + return; + } + + $this->mutate( + InventoryMovementOperation::InventoryTransferred, + $counterDeltas, + function (self $inventory) use ($counterDeltas): void { + foreach ($counterDeltas as $counter => $delta) { + if ((int) $inventory->getAttribute($counter) + $delta < 0) { + throw new \LogicException("El traslado dejaría {$counter} en un valor negativo."); + } + } + }, + $responsibleUser, + ); + } + + private function recordCurrentState( + InventoryMovementOperation $operation, + ?User $responsibleUser, + ): void { + if (! Schema::hasTable('inventory_movements')) { + return; + } + + $this->refresh(); + $counterDeltas = array_filter([ + 'real_stock' => $this->real_stock, + 'sold_units' => $this->sold_units, + 'reserved_stock' => $this->reserved_stock, + 'entry_reserved_stock' => $this->entry_reserved_stock, + 'refunded_units' => $this->refunded_units, + ], fn (int $delta): bool => $delta !== 0); + + $this->movements()->create([ + 'operation' => $operation, + 'available_stock_delta' => $this->availableStock(), + 'available_stock_before' => 0, + 'available_stock_after' => $this->availableStock(), + 'counter_deltas' => $counterDeltas, + 'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(), + ]); + } + + public function resetTransactionCounters(?User $responsibleUser = null): void + { + $this->refresh(); + $counterDeltas = array_filter([ + 'sold_units' => -$this->sold_units, + 'reserved_stock' => -$this->reserved_stock, + 'entry_reserved_stock' => -$this->entry_reserved_stock, + 'refunded_units' => -$this->refunded_units, + ], fn (int $delta): bool => $delta !== 0); + + if ($counterDeltas === []) { + return; + } + + $this->mutate( + InventoryMovementOperation::InventoryReset, + $counterDeltas, + static function (): void {}, + $responsibleUser, + ); + } + + /** + * @param array $counterDeltas + * @param callable(self): void $validate + */ + private function mutate( + InventoryMovementOperation $operation, + array $counterDeltas, + callable $validate, + ?User $responsibleUser = null, + ?string $idempotencyKey = null, + ): void { + DB::transaction(function () use ($operation, $counterDeltas, $validate, $responsibleUser, $idempotencyKey): void { + /** @var self $inventory */ + $inventory = self::query()->lockForUpdate()->findOrFail($this->getKey()); + $this->setRawAttributes($inventory->getAttributes(), true); + + $recordsMovements = Schema::hasTable('inventory_movements'); + if ($recordsMovements && $idempotencyKey !== null) { + $existing = $this->movements() + ->where('idempotency_key', $idempotencyKey) + ->first(); + if ($existing !== null) { + if ($existing->counter_deltas !== $counterDeltas) { + throw ValidationException::withMessages([ + 'stock_adjustment_id' => ['La operación ya fue utilizada con otro ajuste.'], + ]); + } + + return; + } + } + + $validate($this); + $counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0); + if ($counterDeltas === []) { + return; + } + + $availableBefore = $this->availableStock(); + foreach ($counterDeltas as $counter => $delta) { + $this->setAttribute($counter, (int) $this->getAttribute($counter) + $delta); + } + $this->save(); + $this->refresh(); + + $availableAfter = $this->availableStock(); + if ($recordsMovements) { + $this->movements()->create([ + 'operation' => $operation, + 'available_stock_delta' => $availableAfter - $availableBefore, + 'available_stock_before' => $availableBefore, + 'available_stock_after' => $availableAfter, + 'counter_deltas' => $counterDeltas, + 'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(), + 'idempotency_key' => $idempotencyKey, + ]); + } + }); } } diff --git a/app/Domains/Commerce/Catalog/Models/InventoryMovement.php b/app/Domains/Commerce/Catalog/Models/InventoryMovement.php new file mode 100644 index 00000000..d2d65de9 --- /dev/null +++ b/app/Domains/Commerce/Catalog/Models/InventoryMovement.php @@ -0,0 +1,45 @@ + InventoryMovementOperation::class, + 'available_stock_delta' => 'integer', + 'available_stock_before' => 'integer', + 'available_stock_after' => 'integer', + 'counter_deltas' => 'array', + ]; + } + + /** @return BelongsTo */ + public function inventory(): BelongsTo + { + return $this->belongsTo(Inventory::class); + } + + /** @return BelongsTo */ + public function responsibleUser(): BelongsTo + { + return $this->belongsTo(User::class, 'responsible_user_id'); + } +} diff --git a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php new file mode 100644 index 00000000..fe0694f0 --- /dev/null +++ b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php @@ -0,0 +1,59 @@ +assertNonNegative($conversion, 'la conversión produciría un stock real negativo'); + $this->assertNonNegative( + "({$conversion}) - CAST(sold_units AS SIGNED) - CAST(reserved_stock AS SIGNED) - CAST(entry_reserved_stock AS SIGNED) + CAST(refunded_units AS SIGNED)", + 'el stock disponible actual es negativo', + ); + + if (DB::getDriverName() === 'sqlite') { + Schema::table('inventories', function (Blueprint $table): void { + $table->bigInteger('available_stock')->virtualAs(self::FORMULA); + }); + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + } else { + Schema::table('inventories', function (Blueprint $table): void { + $table->unsignedBigInteger('real_stock')->default(0)->change(); + $table->bigInteger('available_stock')->storedAs(self::FORMULA); + }); + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + } + } + + public function down(): void + { + $conversion = 'CAST(real_stock AS SIGNED) - CAST(sold_units AS SIGNED) + CAST(refunded_units AS SIGNED)'; + $this->assertNonNegative($conversion, 'el rollback produciría un stock real negativo'); + + if (DB::getDriverName() === 'sqlite') { + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock')); + + return; + } + + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock')); + } + + private function assertNonNegative(string $expression, string $reason): void + { + if (DB::table('inventories')->whereRaw("({$expression}) < 0")->exists()) { + throw new RuntimeException("Hay inventarios inconsistentes: {$reason}."); + } + } +}; diff --git a/database/migrations/2026_09_25_010000_create_inventory_movements_table.php b/database/migrations/2026_09_25_010000_create_inventory_movements_table.php new file mode 100644 index 00000000..b43c57c1 --- /dev/null +++ b/database/migrations/2026_09_25_010000_create_inventory_movements_table.php @@ -0,0 +1,33 @@ +id(); + $table->foreignId('inventory_id')->constrained('inventories')->restrictOnDelete(); + $table->string('operation', 40); + $table->bigInteger('available_stock_delta'); + $table->bigInteger('available_stock_before'); + $table->bigInteger('available_stock_after'); + $table->json('counter_deltas'); + $table->foreignId('responsible_user_id')->nullable()->constrained('users')->restrictOnDelete(); + $table->uuid('idempotency_key')->nullable(); + $table->timestamps(); + + $table->unique(['inventory_id', 'idempotency_key']); + $table->index(['inventory_id', 'created_at']); + $table->index(['operation', 'created_at']); + }); + } + + public function down(): void + { + Schema::dropIfExists('inventory_movements'); + } +}; diff --git a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php new file mode 100644 index 00000000..c70c29ee --- /dev/null +++ b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php @@ -0,0 +1,135 @@ +id(); + $table->softDeletes(); + }); + Schema::create('inventories', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('sold_units')->default(0); + $table->unsignedInteger('reserved_stock')->default(0); + $table->unsignedInteger('real_stock')->default(0); + $table->unsignedBigInteger('refunded_units')->default(0); + $table->unsignedInteger('entry_reserved_stock')->default(0); + }); + } + + protected function tearDown(): void + { + Schema::disableForeignKeyConstraints(); + Schema::dropIfExists('inventory_movements'); + Schema::dropIfExists('inventories'); + Schema::dropIfExists('users'); + Schema::enableForeignKeyConstraints(); + + parent::tearDown(); + } + + public function test_migration_and_rollback_preserve_the_available_balance(): void + { + DB::table('inventories')->insert([ + 'id' => 17, + 'real_stock' => 10, + 'sold_units' => 3, + 'refunded_units' => 1, + 'reserved_stock' => 2, + 'entry_reserved_stock' => 1, + ]); + + $stockMigration = $this->stockMigration(); + $movementMigration = $this->movementMigration(); + $stockMigration->up(); + $movementMigration->up(); + + $inventory = Inventory::findOrFail(17); + $this->assertSame(12, $inventory->real_stock); + $this->assertSame(7, $inventory->availableStock()); + $this->assertTrue(Schema::hasTable('inventory_movements')); + + $inventory->adjustAvailableStock(2); + $this->assertSame(9, $inventory->availableStock()); + + $movementMigration->down(); + $stockMigration->down(); + + $this->assertFalse(Schema::hasColumn('inventories', 'available_stock')); + $this->assertFalse(Schema::hasTable('inventory_movements')); + $this->assertSame(12, Inventory::findOrFail(17)->real_stock); + $this->assertSame(9, Inventory::findOrFail(17)->availableStock()); + } + + public function test_movements_capture_counters_actor_and_idempotency(): void + { + $this->stockMigration()->up(); + $this->movementMigration()->up(); + DB::table('users')->insert(['id' => 5]); + $user = User::query()->findOrFail(5); + + $inventory = Inventory::query()->create(['real_stock' => 10]); + $inventory->recordInitialization($user); + $inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4'); + $inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4'); + $inventory->reserve(2, true); + $inventory->buy(2, true); + $inventory->refundStock(1, $user); + + $this->assertSame(12, $inventory->availableStock()); + $this->assertCount(5, $inventory->movements()->get()); + + $adjustment = InventoryMovement::query() + ->where('operation', InventoryMovementOperation::StockIncreased->value) + ->firstOrFail(); + $this->assertSame(3, $adjustment->available_stock_delta); + $this->assertSame(10, $adjustment->available_stock_before); + $this->assertSame(13, $adjustment->available_stock_after); + $this->assertSame(['real_stock' => 3], $adjustment->counter_deltas); + $this->assertSame(5, $adjustment->responsible_user_id); + + $purchase = InventoryMovement::query() + ->where('operation', InventoryMovementOperation::PurchaseCommitted->value) + ->firstOrFail(); + $this->assertSame(0, $purchase->available_stock_delta); + $this->assertSame(['reserved_stock' => -2, 'sold_units' => 2], $purchase->counter_deltas); + } + + public function test_migration_rejects_an_inventory_with_negative_available_stock(): void + { + DB::table('inventories')->insert([ + 'real_stock' => 1, + 'reserved_stock' => 2, + ]); + + $this->expectException(\RuntimeException::class); + $this->expectExceptionMessage('stock disponible actual es negativo'); + + $this->stockMigration()->up(); + } + + private function stockMigration(): Migration + { + return require database_path('migrations/2026_09_25_000000_generate_available_inventory_stock.php'); + } + + private function movementMigration(): Migration + { + return require database_path('migrations/2026_09_25_010000_create_inventory_movements_table.php'); + } +} -- 2.49.1 From 863e911120c216d3f980e2220689d798374aba68 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:19 -0300 Subject: [PATCH 02/23] refactor(inventory): record stock operations consistently --- .../Services/CatalogInventoryService.php | 3 +- .../Catalog/Services/CatalogService.php | 5 ++- .../Services/StockReservationService.php | 2 +- .../Services/VariantReplacementService.php | 32 ++++++++++--------- .../TenantTransactionResetService.php | 16 ++++------ .../InvitationPurchaseProvisioner.php | 19 ++++++++--- .../Ticket/Services/AdminAppTicketService.php | 10 ++---- .../Services/BackfillRefundedUnitsService.php | 15 ++++----- 8 files changed, 54 insertions(+), 48 deletions(-) diff --git a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php index 5819fe73..d79a7638 100644 --- a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php +++ b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php @@ -64,6 +64,7 @@ class CatalogInventoryService $selection->loadMissing('variants.inventory'); return $selection->variants + ->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $selection)) ->filter(fn (Variant $variant): bool => $variant->isSellable()) ->unique(fn (Variant $variant): string => $variant->inventory_id === null ? 'object:'.spl_object_id($variant->inventory) @@ -153,7 +154,7 @@ class CatalogInventoryService if ($operation === 'commit' && $requirement['tracks_inventory'] - && $inventory->real_stock - $inventory->entry_reserved_stock < $requiredQuantity) { + && $inventory->availableStock() < 0) { throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); } } diff --git a/app/Domains/Commerce/Catalog/Services/CatalogService.php b/app/Domains/Commerce/Catalog/Services/CatalogService.php index 5d2c0280..4b87a505 100644 --- a/app/Domains/Commerce/Catalog/Services/CatalogService.php +++ b/app/Domains/Commerce/Catalog/Services/CatalogService.php @@ -370,9 +370,12 @@ class CatalogService private function createInventory(int $realStock): Inventory { - return Inventory::query()->create([ + $inventory = Inventory::query()->create([ 'real_stock' => $realStock, ]); + $inventory->recordInitialization(); + + return $inventory; } /** diff --git a/app/Domains/Commerce/Catalog/Services/StockReservationService.php b/app/Domains/Commerce/Catalog/Services/StockReservationService.php index a9216474..2412ee76 100644 --- a/app/Domains/Commerce/Catalog/Services/StockReservationService.php +++ b/app/Domains/Commerce/Catalog/Services/StockReservationService.php @@ -225,7 +225,7 @@ class StockReservationService $inventory = $inventories->get($line->inventory_id) ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.'); if ($inventory->reserved_stock < $line->quantity - || ($line->tracks_inventory && $inventory->real_stock - $inventory->entry_reserved_stock < $line->quantity)) { + || ($line->tracks_inventory && $inventory->availableStock() < 0)) { throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.'); } } diff --git a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php index 317c4972..ac28cf69 100644 --- a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php +++ b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php @@ -194,6 +194,7 @@ class VariantReplacementService 'entry_reserved_stock' => $sourceInventory->entry_reserved_stock, 'real_stock' => $sourceInventory->real_stock, ]); + $replacementInventory->recordTransferInitialization(); if ($activeLines->isNotEmpty()) { StockReservationLine::query() @@ -202,7 +203,10 @@ class VariantReplacementService } EntryReservation::query()->where('inventory_id', $sourceInventory->id) ->update(['inventory_id' => $replacementInventory->id]); - $sourceInventory->update(['reserved_stock' => 0, 'entry_reserved_stock' => 0]); + $sourceInventory->transferCounters([ + 'reserved_stock' => -$sourceInventory->reserved_stock, + 'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock, + ]); return $replacementInventory; } @@ -236,13 +240,14 @@ class VariantReplacementService throw new \LogicException('El inventario reservado de la variante es inconsistente.'); } - $destinationInventory->update([ - 'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock, - 'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock, - 'entry_reserved_stock' => $destinationInventory->entry_reserved_stock + $sourceInventory->entry_reserved_stock, - 'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units, - 'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units, - ]); + $transferredCounters = [ + 'real_stock' => $sourceInventory->real_stock, + 'reserved_stock' => $sourceInventory->reserved_stock, + 'entry_reserved_stock' => $sourceInventory->entry_reserved_stock, + 'sold_units' => $sourceInventory->sold_units, + 'refunded_units' => $sourceInventory->refunded_units, + ]; + $destinationInventory->transferCounters($transferredCounters); if ($activeLines->isNotEmpty()) { StockReservationLine::query() ->whereKey($activeLines->modelKeys()) @@ -250,13 +255,10 @@ class VariantReplacementService } EntryReservation::query()->where('inventory_id', $sourceInventory->id) ->update(['inventory_id' => $destinationInventory->id]); - $sourceInventory->update([ - 'real_stock' => 0, - 'reserved_stock' => 0, - 'entry_reserved_stock' => 0, - 'sold_units' => 0, - 'refunded_units' => 0, - ]); + $sourceInventory->transferCounters(array_map( + fn (int $value): int => -$value, + $transferredCounters, + )); } /** @return list */ diff --git a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php index 37931061..815b2663 100644 --- a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php +++ b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php @@ -2,6 +2,7 @@ namespace App\Domains\Commerce\Purchase\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Purchase\Models\Purchase; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; @@ -69,15 +70,12 @@ class TenantTransactionResetService 'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(), ]; - DB::table('inventories') - ->whereIn('id', $scope['inventory_ids']) - ->update([ - 'real_stock' => DB::raw('real_stock + sold_units - refunded_units'), - 'reserved_stock' => 0, - 'entry_reserved_stock' => 0, - 'sold_units' => 0, - 'refunded_units' => 0, - ]); + Inventory::query() + ->whereKey($scope['inventory_ids']) + ->orderBy('id') + ->lockForUpdate() + ->get() + ->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters()); return $summary; }); diff --git a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php index a2be68ea..2fcb5e29 100644 --- a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php +++ b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php @@ -2,6 +2,7 @@ namespace App\Domains\Ticketing\Desfile\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use DateTimeInterface; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; @@ -393,14 +394,22 @@ class InvitationPurchaseProvisioner $inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first(); - if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0 || ($inventory->entry_reserved_stock ?? 0) > 0) { + $available = $inventory?->available_stock + ?? ($inventory === null ? 0 : $inventory->real_stock - $inventory->reserved_stock - ($inventory->entry_reserved_stock ?? 0)); + if ($available < 1) { throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible."); } - DB::table('inventories')->where('id', $inventory->id)->update([ - 'real_stock' => $inventory->real_stock - 1, - 'sold_units' => $inventory->sold_units + 1, - ]); + if (property_exists($inventory, 'available_stock')) { + Inventory::query()->findOrFail($inventory->id)->commitDirectSale(1); + } else { + // This provisioner is also used by historical migrations that run + // before generated availability and the movement ledger exist. + DB::table('inventories')->where('id', $inventory->id)->update([ + 'real_stock' => $inventory->real_stock - 1, + 'sold_units' => $inventory->sold_units + 1, + ]); + } $reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id'); if ($reservationId === null) { diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php index 81dbfa0f..2dede24a 100644 --- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php +++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php @@ -228,13 +228,13 @@ class AdminAppTicketService 'amount' => number_format($refundAmount, 2, '.', ''), ]); - $this->restoreInventory($ticket, $purchaseItem); + $this->restoreInventory($ticket, $purchaseItem, $createdBy); return $ticket->refresh()->load(self::RELATIONS); }); } - private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem): void + private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem, ?User $createdBy): void { $catalogItem = $ticket->sourceCatalogItem; if ($catalogItem === null) { @@ -272,11 +272,7 @@ class AdminAppTicketService throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']); } - if ($catalogItem->inventory_policy === InventoryPolicy::Tracked) { - $inventory->real_stock++; - } - $inventory->refunded_units++; - $inventory->save(); + $inventory->refundStock(1, $createdBy); } private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float diff --git a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php index d403ded8..dd9acdc7 100644 --- a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php +++ b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php @@ -2,6 +2,7 @@ namespace App\Domains\Ticketing\Ticket\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use RuntimeException; @@ -64,14 +65,9 @@ class BackfillRefundedUnitsService }, 'refunds.id', 'id'); foreach ($counts as $inventoryId => $count) { - $updates = ['refunded_units' => DB::raw('refunded_units + '.$count['refunded'])]; - if (($count['stock'] ?? 0) > 0) { - $updates['real_stock'] = DB::raw('real_stock + '.$count['stock']); - } - - if (DB::table('inventories')->where('id', $inventoryId)->update($updates) !== 1) { - throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo."); - } + $inventory = Inventory::query()->lockForUpdate()->find($inventoryId) + ?? throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo."); + $inventory->refundStock($count['refunded']); } $refundedUnitsAdded = array_sum(array_column($counts, 'refunded')); @@ -82,7 +78,8 @@ class BackfillRefundedUnitsService 'bundles_skipped' => $bundlesSkipped, 'inventories_updated' => count($counts), 'refunded_units_added' => $refundedUnitsAdded, - 'real_stock_added' => array_sum(array_column($counts, 'stock')), + 'real_stock_added' => 0, + 'available_stock_added' => $refundedUnitsAdded, ]; }); -- 2.49.1 From 717f02ce16d0cefb54754350264413ad605a8d3d Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:29 -0300 Subject: [PATCH 03/23] feat(admin-stock): apply idempotent availability deltas --- .../Controllers/AccommodationController.php | 1 + .../Controllers/EntryController.php | 1 + .../Controllers/FoodController.php | 2 + .../Controllers/MerchandiseController.php | 1 + .../UpdateHistoricalFoodStockRequest.php | 4 +- .../UpsertAccommodationVariantsRequest.php | 4 +- .../Requests/UpsertEntriesRequest.php | 4 +- .../Requests/UpsertFoodVariantsRequest.php | 4 +- .../Requests/UpsertMerchandiseRequest.php | 4 +- .../Resources/AccommodationResource.php | 2 +- .../Resources/EntryResource.php | 2 +- .../Resources/FoodResource.php | 2 +- .../Resources/MerchandiseResource.php | 2 +- .../Services/AccommodationService.php | 19 ++++------ .../Services/EntryService.php | 21 ++++------ .../Services/FoodService.php | 38 +++++++------------ .../Services/MerchandiseService.php | 20 ++++------ 17 files changed, 59 insertions(+), 72 deletions(-) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php index fb9ca451..e21425d3 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php @@ -28,6 +28,7 @@ class AccommodationController extends Controller $this->accommodationService->upsertMany( $tenant, $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php index 68b11636..2fa4d1e1 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php @@ -29,6 +29,7 @@ class EntryController extends Controller $entries = $this->entryService->upsertMany( $tenant, $request->validated('entries'), + $request->validated('stock_adjustment_id'), ); return EntryResource::collection($entries) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php index e580cc8d..86d5b5f4 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php @@ -29,6 +29,7 @@ class FoodController extends Controller $this->foodService->upsertMany( $tenant, $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } @@ -39,6 +40,7 @@ class FoodController extends Controller $this->foodService->updateHistoricalStock( $request->user()->tenant()->firstOrFail(), $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php index 10b0307f..dd52f9a0 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php @@ -28,6 +28,7 @@ class MerchandiseController extends Controller $items = $this->merchandiseService->upsertMany( $tenant, $request->validated('items'), + $request->validated('stock_adjustment_id'), ); return MerchandiseResource::collection($items) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php index aa784622..d137b168 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php @@ -16,9 +16,11 @@ class UpdateHistoricalFoodStockRequest extends FormRequest { return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,stock'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,stock,stock_difference'], 'variants.*.id' => ['required', 'integer', 'distinct'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], ]; } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php index d275c487..11ff365c 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php @@ -16,11 +16,13 @@ class UpsertAccommodationVariantsRequest extends FormRequest { return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,title,description,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,title,description,stock,stock_difference,price'], 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.title' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php index 6827fc4b..b18cf1f3 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php @@ -20,7 +20,8 @@ class UpsertEntriesRequest extends FormRequest return [ 'entries' => ['required', 'array', 'min:1', 'max:100'], - 'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,stock_difference,price'], 'entries.*.id' => [ 'sometimes', 'nullable', @@ -47,6 +48,7 @@ class UpsertEntriesRequest extends FormRequest ), ], 'entries.*.stock' => ['required', 'integer', 'min:0'], + 'entries.*.stock_difference' => ['nullable', 'integer'], 'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php index 164ca981..1f6872ec 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php @@ -20,7 +20,8 @@ class UpsertFoodVariantsRequest extends FormRequest return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,stock_difference,price'], 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.event_date_id' => [ 'required', @@ -33,6 +34,7 @@ class UpsertFoodVariantsRequest extends FormRequest 'variants.*.service' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php index 862a59a0..15b05967 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php @@ -39,11 +39,13 @@ class UpsertMerchandiseRequest extends FormRequest 'items.*.description' => ['sometimes', 'nullable', 'string'], 'items.*.max_units_per_user' => ['required', 'integer', 'min:1'], 'items.*.variants' => ['required', 'array', 'min:1', 'max:500'], - 'items.*.variants.*' => ['required', 'array:id,color,size,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'items.*.variants.*' => ['required', 'array:id,color,size,stock,stock_difference,price'], 'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'items.*.variants.*.color' => ['required', 'string', 'max:255'], 'items.*.variants.*.size' => ['required', 'string', 'max:255'], 'items.*.variants.*.stock' => ['required', 'integer', 'min:0'], + 'items.*.variants.*.stock_difference' => ['nullable', 'integer'], 'items.*.variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php index b3cb3186..9b3a9d06 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php @@ -37,7 +37,7 @@ class AccommodationResource extends JsonResource 'title' => $options->get($value)?->label ?? $value, 'value' => $value, 'description' => $variant->descripcion, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; })->values(), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php index efce8a91..7da32839 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php @@ -33,7 +33,7 @@ class EntryResource extends JsonResource 'title' => $this->nombre, 'description' => $this->descripcion, 'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(), - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => $this->precio, ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php index 436e62da..34d7abfb 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php @@ -81,7 +81,7 @@ class FoodResource extends JsonResource 'schedule' => $values->get('horario'), 'service' => $values->get('servicio'), 'description' => $variant->descripcion, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php index 2b6f2a26..369e0783 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php @@ -44,7 +44,7 @@ class MerchandiseResource extends JsonResource 'color_value' => $colorValue, 'size' => $sizeOptions->get($sizeValue)?->label ?? $sizeValue, 'size_value' => $sizeValue, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; })->values(), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php index 6e5baae2..20e44ee6 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php @@ -39,9 +39,9 @@ class AccommodationService /** * @param array> $variants */ - public function upsertMany(Tenant $tenant, array $variants): CatalogItem + public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $attribute = $this->attribute($tenant); $accommodation = $this->accommodation($tenant, $variants); $itemAttribute = $accommodation->itemAttributes()->firstOrCreate( @@ -70,7 +70,7 @@ class AccommodationService if ($variant === null) { $this->createVariant($attribute, $accommodation, $itemAttribute, $data); } else { - $this->updateVariant($attribute, $variant, $itemAttribute, $data, $index); + $this->updateVariant($attribute, $variant, $itemAttribute, $data, $index, $stockAdjustmentId); } } @@ -212,6 +212,7 @@ class AccommodationService $this->createOption($attribute, $data['value'], $data['title']); $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $accommodation->variants()->create([ 'inventory_id' => $inventory->id, 'descripcion' => $data['description'], @@ -230,20 +231,13 @@ class AccommodationService ItemAttribute $itemAttribute, array $data, int $index, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $definition = $variant->definitions ->firstWhere('item_attribute_id', $itemAttribute->id); $option = $definition === null @@ -263,7 +257,8 @@ class AccommodationService 'descripcion' => $data['description'], 'precio' => $data['price'], ]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $variant->definitions()->updateOrCreate( ['item_attribute_id' => $itemAttribute->id], ['value' => $data['value']], diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php index 5d028f5d..5c486029 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php @@ -43,18 +43,18 @@ class EntryService * @param array> $entries * @return Collection */ - public function upsertMany(Tenant $tenant, array $entries): Collection + public function upsertMany(Tenant $tenant, array $entries, ?string $stockAdjustmentId = null): Collection { - return DB::transaction(function () use ($tenant, $entries): Collection { + return DB::transaction(function () use ($tenant, $entries, $stockAdjustmentId): Collection { $reservedSlugs = []; $category = Category::query()->firstOrCreate([ 'tenant_code' => $tenant->codigo, 'nombre' => 'Entradas', ]); - return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, &$reservedSlugs): CatalogItem { + return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, $stockAdjustmentId, &$reservedSlugs): CatalogItem { if (isset($entry['id'])) { - return $this->update($tenant, $category, $entry, $index); + return $this->update($tenant, $category, $entry, $index, $stockAdjustmentId); } $slug = $this->uniqueSlug($tenant, $entry['title'], $reservedSlugs); @@ -92,7 +92,7 @@ class EntryService } /** @param array $entry */ - private function update(Tenant $tenant, Category $category, array $entry, int $index): CatalogItem + private function update(Tenant $tenant, Category $category, array $entry, int $index, ?string $stockAdjustmentId): CatalogItem { $catalogItem = CatalogItem::query() ->whereKey($entry['id']) @@ -121,14 +121,6 @@ class EntryService ->lockForUpdate() ->firstOrFail(); - if ((int) $entry['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "entries.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $eventDateIds = collect($entry['event_date_ids']) ->map(fn ($id): int => (int) $id) ->unique() @@ -149,7 +141,8 @@ class EntryService $catalogItem->itemAttributes() ->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date')) ->update(['allow_multi_select' => true]); - $inventory->update(['real_stock' => $entry['stock']]); + $stockDifference = (int) ($entry['stock_difference'] ?? ((int) $entry['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); return $catalogItem->load([ 'variants.inventory', diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php index 88488541..8b9f4c05 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php @@ -11,9 +11,9 @@ use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Catalog\Models\ItemAttribute; use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Commerce\Catalog\Services\CatalogService; +use App\Domains\Core\Tenant\Models\Tenant; use App\Domains\Ticketing\Event\Enums\EventDateStatus; use App\Domains\Ticketing\Event\Models\EventDate; -use App\Domains\Core\Tenant\Models\Tenant; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Validation\ValidationException; @@ -50,9 +50,9 @@ class FoodService /** * @param array> $variants */ - public function upsertMany(Tenant $tenant, array $variants): CatalogItem + public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $attributes = $this->attributes($tenant); $food = $this->food($tenant, $variants); $itemAttributes = $this->itemAttributes($food, $attributes); @@ -85,7 +85,7 @@ class FoodService if ($variant === null) { $this->createVariant($food, $itemAttributes, $data); } else { - $this->updateVariant($variant, $itemAttributes, $data, $index); + $this->updateVariant($variant, $itemAttributes, $data, $index, $stockAdjustmentId); } } @@ -115,9 +115,9 @@ class FoodService /** * @param array $variants */ - public function updateHistoricalStock(Tenant $tenant, array $variants): CatalogItem + public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $food = CatalogItem::query() ->forTenantCatalog($tenant) ->where('slug', 'comida') @@ -142,17 +142,9 @@ class FoodService ]); } - $stock = (int) $data['stock']; $inventory = $this->inventoryForHistoricalStockUpdate($variant); - if ($stock < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - - $inventory->update(['real_stock' => $stock]); + $stockDifference = (int) ($data['stock_difference'] ?? ((int) $data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); } return $this->current($tenant) ?? $food; @@ -181,6 +173,7 @@ class FoodService 'reserved_stock' => 0, 'real_stock' => $inventory->real_stock, ]); + $historicalInventory->recordTransferInitialization(); $variant->update(['inventory_id' => $historicalInventory->getKey()]); return $historicalInventory; @@ -384,6 +377,7 @@ class FoodService private function createVariant(CatalogItem $food, Collection $itemAttributes, array $data): void { $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $food->variants()->create([ 'event_date_id' => $data['event_date_id'], 'inventory_id' => $inventory->id, @@ -400,27 +394,21 @@ class FoodService Collection $itemAttributes, array $data, int $index, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $variant->update([ 'event_date_id' => $data['event_date_id'], 'descripcion' => $data['description'], 'precio' => $data['price'], ]); $variant->eventDates()->sync([$data['event_date_id']]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php index 3d3183ca..735406df 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php @@ -43,9 +43,9 @@ class MerchandiseService * @param array> $items * @return Collection */ - public function upsertMany(Tenant $tenant, array $items): Collection + public function upsertMany(Tenant $tenant, array $items, ?string $stockAdjustmentId = null): Collection { - return DB::transaction(function () use ($tenant, $items): Collection { + return DB::transaction(function () use ($tenant, $items, $stockAdjustmentId): Collection { $attributes = $this->attributes($tenant); $category = Category::query()->firstOrCreate([ 'tenant_code' => $tenant->codigo, @@ -57,6 +57,7 @@ class MerchandiseService $tenant, $attributes, $category, + $stockAdjustmentId, &$reservedSlugs, ): CatalogItem { $item = isset($data['id']) @@ -101,7 +102,7 @@ class MerchandiseService if ($variant === null) { $this->createVariant($item, $itemAttributes, $variantData); } else { - $this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex); + $this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex, $stockAdjustmentId); } } @@ -342,6 +343,7 @@ class MerchandiseService array $data, ): void { $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $item->variants()->create([ 'inventory_id' => $inventory->id, 'precio' => $data['price'], @@ -359,22 +361,16 @@ class MerchandiseService array $data, int $itemIndex, int $variantIndex, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "items.{$itemIndex}.variants.{$variantIndex}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $variant->update(['precio' => $data['price']]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $this->syncDefinitions($variant, $itemAttributes, $data); } -- 2.49.1 From a05d15d17fb40d6e2f9f3fb411c2b2b07292639d Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 15:28:49 -0300 Subject: [PATCH 04/23] refactor(inventory): update stock validation rules and enforce stock_difference requirement --- .../UpdateHistoricalFoodStockRequest.php | 5 +-- .../UpsertAccommodationVariantsRequest.php | 33 ++++++++++++++- .../Requests/UpsertEntriesRequest.php | 18 ++++++++- .../Requests/UpsertFoodVariantsRequest.php | 18 ++++++++- .../Requests/UpsertMerchandiseRequest.php | 40 ++++++++++++++++++- .../Services/AccommodationService.php | 8 ++-- .../Services/EntryService.php | 6 ++- .../Services/FoodService.php | 16 +++++--- .../Services/MerchandiseService.php | 8 ++-- .../AccommodationControllerTest.php | 2 + .../EntryControllerTest.php | 8 ++-- .../FoodControllerTest.php | 6 ++- .../MerchandiseControllerTest.php | 4 ++ 13 files changed, 141 insertions(+), 31 deletions(-) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php index d137b168..caa5e853 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php @@ -17,10 +17,9 @@ class UpdateHistoricalFoodStockRequest extends FormRequest return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], 'stock_adjustment_id' => ['nullable', 'uuid'], - 'variants.*' => ['required', 'array:id,stock,stock_difference'], + 'variants.*' => ['required', 'array:id,stock_difference'], 'variants.*.id' => ['required', 'integer', 'distinct'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock_difference' => ['required', 'integer'], ]; } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php index 11ff365c..7e2475eb 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php @@ -3,6 +3,7 @@ namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Validator; class UpsertAccommodationVariantsRequest extends FormRequest { @@ -21,9 +22,37 @@ class UpsertAccommodationVariantsRequest extends FormRequest 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.title' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['sometimes', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } + + /** @return array */ + public function after(): array + { + return [ + function (Validator $validator): void { + foreach ($this->input('variants', []) as $index => $variant) { + if (! is_array($variant)) { + continue; + } + + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + } + }, + ]; + } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php index b18cf1f3..2b982850 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php @@ -47,8 +47,8 @@ class UpsertEntriesRequest extends FormRequest fn ($query) => $query->where('tenant_code', $tenantCode) ), ], - 'entries.*.stock' => ['required', 'integer', 'min:0'], - 'entries.*.stock_difference' => ['nullable', 'integer'], + 'entries.*.stock' => ['sometimes', 'integer', 'min:0'], + 'entries.*.stock_difference' => ['sometimes', 'integer'], 'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } @@ -63,6 +63,20 @@ class UpsertEntriesRequest extends FormRequest continue; } + if (isset($entry['id']) && ! array_key_exists('stock_difference', $entry)) { + $validator->errors()->add( + "entries.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una entrada.', + ); + } + + if (! isset($entry['id']) && ! array_key_exists('stock', $entry)) { + $validator->errors()->add( + "entries.{$index}.stock", + 'El stock inicial es obligatorio al crear una entrada.', + ); + } + $dateIds = $entry['event_date_ids'] ?? []; if (! is_array($dateIds)) { diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php index 1f6872ec..50b557d5 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php @@ -33,8 +33,8 @@ class UpsertFoodVariantsRequest extends FormRequest 'variants.*.schedule' => ['required', 'string', 'max:255'], 'variants.*.service' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['sometimes', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } @@ -51,6 +51,20 @@ class UpsertFoodVariantsRequest extends FormRequest continue; } + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + $key = implode('|', [ $variant['event_date_id'] ?? '', mb_strtolower(trim((string) ($variant['schedule'] ?? ''))), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php index 15b05967..0e683413 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php @@ -4,6 +4,7 @@ namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use Illuminate\Validation\Validator; class UpsertMerchandiseRequest extends FormRequest { @@ -44,9 +45,44 @@ class UpsertMerchandiseRequest extends FormRequest 'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'items.*.variants.*.color' => ['required', 'string', 'max:255'], 'items.*.variants.*.size' => ['required', 'string', 'max:255'], - 'items.*.variants.*.stock' => ['required', 'integer', 'min:0'], - 'items.*.variants.*.stock_difference' => ['nullable', 'integer'], + 'items.*.variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'items.*.variants.*.stock_difference' => ['sometimes', 'integer'], 'items.*.variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } + + /** @return array */ + public function after(): array + { + return [ + function (Validator $validator): void { + foreach ($this->input('items', []) as $itemIndex => $item) { + if (! is_array($item)) { + continue; + } + + foreach ($item['variants'] ?? [] as $variantIndex => $variant) { + if (! is_array($variant)) { + continue; + } + + $prefix = "items.{$itemIndex}.variants.{$variantIndex}"; + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "{$prefix}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "{$prefix}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + } + } + }, + ]; + } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php index 20e44ee6..4e33b50e 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php @@ -169,7 +169,7 @@ class AccommodationService 'title' => trim($variant['title']), 'value' => $this->valueCode($variant['title']), 'description' => $variant['description'] ?? null, - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ])->all(); } @@ -257,8 +257,10 @@ class AccommodationService 'descripcion' => $data['description'], 'precio' => $data['price'], ]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $variant->definitions()->updateOrCreate( ['item_attribute_id' => $itemAttribute->id], ['value' => $data['value']], diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php index 5c486029..06ac4e09 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php @@ -141,8 +141,10 @@ class EntryService $catalogItem->itemAttributes() ->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date')) ->update(['allow_multi_select' => true]); - $stockDifference = (int) ($entry['stock_difference'] ?? ((int) $entry['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $entry['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); return $catalogItem->load([ 'variants.inventory', diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php index 8b9f4c05..1e194eaf 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php @@ -113,7 +113,7 @@ class FoodService } /** - * @param array $variants + * @param array $variants */ public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { @@ -143,8 +143,10 @@ class FoodService } $inventory = $this->inventoryForHistoricalStockUpdate($variant); - $stockDifference = (int) ($data['stock_difference'] ?? ((int) $data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); } return $this->current($tenant) ?? $food; @@ -294,7 +296,7 @@ class FoodService 'schedule' => $schedule->value, 'service' => $service->value, 'description' => (string) ($variant['description'] ?? ''), - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ]; })->all(); } @@ -407,8 +409,10 @@ class FoodService 'precio' => $data['price'], ]); $variant->eventDates()->sync([$data['event_date_id']]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php index 735406df..9beaac2d 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php @@ -245,7 +245,7 @@ class MerchandiseService ...$variant, 'color' => $color->value, 'size' => $size->value, - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ]; })->all(); } @@ -369,8 +369,10 @@ class MerchandiseService ->firstOrFail(); $variant->update(['precio' => $data['price']]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php index d04907fb..3050ac09 100644 --- a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php @@ -97,6 +97,8 @@ class AccommodationControllerTest extends TestCase $updated = $this->variantPayload('Casa Rodante Premium', 'Con electricidad', 15, 50000); $updated['id'] = $variantId; + unset($updated['stock']); + $updated['stock_difference'] = -5; $this->postJson('/api/v1/adminapp/tenant/accommodations', [ 'variants' => [ diff --git a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php index fb3b59fb..b6066fe9 100644 --- a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php @@ -194,7 +194,7 @@ class EntryControllerTest extends TestCase 'title' => 'Abono actualizado', 'description' => 'Ahora incluye ambas fechas', 'event_date_ids' => [$firstDate->id, $secondDate->id], - 'stock' => 20, + 'stock_difference' => 10, 'price' => 250, ], [ @@ -268,7 +268,7 @@ class EntryControllerTest extends TestCase 'id' => $entryId, 'title' => 'Abono editado', 'event_date_ids' => [$date->id, $otherDate->id], - 'stock' => 30, + 'stock_difference' => 10, 'price' => 200, ]], ])->assertOk() @@ -329,7 +329,7 @@ class EntryControllerTest extends TestCase 'title' => 'Entrada inválida', 'description' => null, 'event_date_ids' => [$foreignDate->id], - 'stock' => 10, + 'stock_difference' => 0, 'price' => 100, ]], ]) @@ -371,7 +371,7 @@ class EntryControllerTest extends TestCase 'title' => 'Entrada inválida', 'description' => null, 'event_date_ids' => [$eventDate->id], - 'stock' => 10, + 'stock_difference' => 0, 'price' => 100, ]], ]) diff --git a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php index bef74360..c0339163 100644 --- a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php @@ -124,6 +124,8 @@ class FoodControllerTest extends TestCase $updated = $this->variantPayload($secondDate->id, 'Cena', 'Vianda', 80, 8500); $updated['id'] = $variantId; + unset($updated['stock']); + $updated['stock_difference'] = -20; $updated['description'] = 'Cena para llevar'; $this->postJson('/api/v1/adminapp/tenant/foods', [ @@ -240,7 +242,7 @@ class FoodControllerTest extends TestCase Inventory::query()->whereKey($replacementInventoryId)->delete(); $updated = $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [ - 'variants' => [['id' => $historicalVariantId, 'stock' => 45]], + 'variants' => [['id' => $historicalVariantId, 'stock_difference' => -55]], ]) ->assertOk() ->assertJsonPath('data.history.0.variants.0.id', $historicalVariantId) @@ -258,7 +260,7 @@ class FoodControllerTest extends TestCase ]); $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [ - 'variants' => [['id' => $activeVariantId, 'stock' => 20]], + 'variants' => [['id' => $activeVariantId, 'stock_difference' => -60]], ]) ->assertUnprocessable() ->assertJsonValidationErrors(['variants.0.id']); diff --git a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php index 09752a40..7f8ddcf8 100644 --- a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php @@ -112,6 +112,8 @@ class MerchandiseControllerTest extends TestCase $updatedVariant = $this->variantPayload('Blanco', 'M', 80, 12500); $updatedVariant['id'] = $variantId; + unset($updatedVariant['stock']); + $updatedVariant['stock_difference'] = -20; $updatedItem = $this->itemPayload('Camiseta oficial', 2, [ $updatedVariant, $this->variantPayload('Verde', 'L', 60, 15000), @@ -234,6 +236,8 @@ class MerchandiseControllerTest extends TestCase $secondItemVariantId = $created->json('data.1.variants.0.id'); $foreignVariant = $this->variantPayload('Azul Marino', 'XL', 20, 30000); $foreignVariant['id'] = $secondItemVariantId; + unset($foreignVariant['stock']); + $foreignVariant['stock_difference'] = 0; $firstItem = $this->itemPayload('Camiseta', 3, [$foreignVariant]); $firstItem['id'] = $firstItemId; -- 2.49.1 From ad054127aad2c3cead6f714aa8d1f0f44680d533 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 15:31:43 -0300 Subject: [PATCH 05/23] refactor(inventory): enhance error reporting for negative stock validation --- ...000_generate_available_inventory_stock.php | 34 +++++++++++++++++-- .../InventoryStockMovementMigrationTest.php | 6 +++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php index fe0694f0..533a02bf 100644 --- a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php +++ b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php @@ -52,8 +52,38 @@ return new class extends Migration private function assertNonNegative(string $expression, string $reason): void { - if (DB::table('inventories')->whereRaw("({$expression}) < 0")->exists()) { - throw new RuntimeException("Hay inventarios inconsistentes: {$reason}."); + $invalidInventories = DB::table('inventories') + ->select([ + 'id', + 'real_stock', + 'sold_units', + 'refunded_units', + 'reserved_stock', + 'entry_reserved_stock', + ]) + ->selectRaw("({$expression}) as calculated_stock") + ->whereRaw("({$expression}) < 0") + ->orderBy('id') + ->limit(20) + ->get(); + + if ($invalidInventories->isNotEmpty()) { + $details = $invalidInventories + ->map(static fn (object $inventory): string => sprintf( + 'id=%d [real=%d, vendidas=%d, reintegradas=%d, reservadas=%d, reservas_entradas=%d, resultado=%d]', + $inventory->id, + $inventory->real_stock, + $inventory->sold_units, + $inventory->refunded_units, + $inventory->reserved_stock, + $inventory->entry_reserved_stock, + $inventory->calculated_stock, + )) + ->implode('; '); + + throw new RuntimeException( + "Hay inventarios inconsistentes: {$reason}. Inventarios detectados (máximo 20): {$details}." + ); } } }; diff --git a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php index c70c29ee..8946f515 100644 --- a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php +++ b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php @@ -113,12 +113,16 @@ class InventoryStockMovementMigrationTest extends TestCase public function test_migration_rejects_an_inventory_with_negative_available_stock(): void { DB::table('inventories')->insert([ + 'id' => 23, 'real_stock' => 1, 'reserved_stock' => 2, ]); $this->expectException(\RuntimeException::class); - $this->expectExceptionMessage('stock disponible actual es negativo'); + $this->expectExceptionMessage( + 'stock disponible actual es negativo. Inventarios detectados (máximo 20): ' + .'id=23 [real=1, vendidas=0, reintegradas=0, reservadas=2, reservas_entradas=0, resultado=-1]' + ); $this->stockMigration()->up(); } -- 2.49.1 From 068d5d7f4f9c7c871bde2cb556ca07ca0631b9a6 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:08 -0300 Subject: [PATCH 06/23] feat(inventory): add calculated availability and movement ledger --- .../Enums/InventoryMovementOperation.php | 18 ++ .../Commerce/Catalog/Models/CatalogItem.php | 17 +- .../Commerce/Catalog/Models/Inventory.php | 306 +++++++++++++++--- .../Catalog/Models/InventoryMovement.php | 45 +++ ...000_generate_available_inventory_stock.php | 59 ++++ ...10000_create_inventory_movements_table.php | 33 ++ .../InventoryStockMovementMigrationTest.php | 135 ++++++++ 7 files changed, 569 insertions(+), 44 deletions(-) create mode 100644 app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php create mode 100644 app/Domains/Commerce/Catalog/Models/InventoryMovement.php create mode 100644 database/migrations/2026_09_25_000000_generate_available_inventory_stock.php create mode 100644 database/migrations/2026_09_25_010000_create_inventory_movements_table.php create mode 100644 tests/Feature/Migrations/InventoryStockMovementMigrationTest.php diff --git a/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php b/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php new file mode 100644 index 00000000..53870d5e --- /dev/null +++ b/app/Domains/Commerce/Catalog/Enums/InventoryMovementOperation.php @@ -0,0 +1,18 @@ + $query */ public function scopeWhereAvailable(Builder $query): Builder { + $availableInventory = static fn (Builder $inventoryQuery): Builder => Schema::hasColumn('inventories', 'available_stock') + ? $inventoryQuery->where('inventories.available_stock', '>', 0) + : $inventoryQuery->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock'); + return $query->where(function (Builder $query): void { $query->whereNull('catalog_items.sales_end_at') ->orWhere('catalog_items.sales_end_at', '>', now()); - })->where(function (Builder $query): void { + })->where(function (Builder $query) use ($availableInventory): void { $query ->where(function (Builder $unlimitedQuery): void { $unlimitedQuery @@ -236,20 +241,18 @@ class CatalogItem extends Model ->whereNull('replaced_by_variant_id') ->whereHas( 'inventory', - fn (Builder $inventoryQuery): Builder => $inventoryQuery - ->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock') + $availableInventory ) ) - ->orWhere(function (Builder $directItemQuery): void { + ->orWhere(function (Builder $directItemQuery) use ($availableInventory): void { $directItemQuery ->whereDoesntHave('variants') - ->where(function (Builder $inventoryQuery): void { + ->where(function (Builder $inventoryQuery) use ($availableInventory): void { $inventoryQuery ->whereNull('catalog_items.inventory_id') ->orWhereHas( 'inventory', - fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery - ->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock') + $availableInventory ); }); }); diff --git a/app/Domains/Commerce/Catalog/Models/Inventory.php b/app/Domains/Commerce/Catalog/Models/Inventory.php index d18af516..137dca39 100644 --- a/app/Domains/Commerce/Catalog/Models/Inventory.php +++ b/app/Domains/Commerce/Catalog/Models/Inventory.php @@ -2,11 +2,17 @@ namespace App\Domains\Commerce\Catalog\Models; +use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation; +use App\Domains\Core\Auth\Models\User; 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\Database\Eloquent\Relations\HasOne; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; +use Illuminate\Validation\ValidationException; #[Fillable([ 'sold_units', @@ -38,6 +44,7 @@ class Inventory extends Model 'reserved_stock' => 'integer', 'entry_reserved_stock' => 'integer', 'real_stock' => 'integer', + 'available_stock' => 'integer', ]; } @@ -59,70 +66,295 @@ class Inventory extends Model return $this->hasMany(StockReservationLine::class); } + /** @return HasMany */ + public function movements(): HasMany + { + return $this->hasMany(InventoryMovement::class); + } + public function availableStock(): int { - return max(0, $this->real_stock - $this->reserved_stock - $this->entry_reserved_stock); + if (! array_key_exists('available_stock', $this->attributes)) { + return max(0, $this->real_stock - $this->reserved_stock - ($this->entry_reserved_stock ?? 0)); + } + + return (int) $this->getAttribute('available_stock'); } public function reserveEntry(int $amount, bool $tracksInventory): void { - if ($amount < 1 || ($tracksInventory && $this->availableStock() < $amount)) { - throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.'); - } - $this->entry_reserved_stock += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::EntryStockReserved, + ['entry_reserved_stock' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) { + throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.'); + } + }, + ); } public function releaseEntry(int $amount): void { - if ($amount < 1 || $this->entry_reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.'); - } - - $this->entry_reserved_stock -= $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::EntryStockReleased, + ['entry_reserved_stock' => -$amount], + function (self $inventory) use ($amount): void { + if ($amount < 1 || $inventory->entry_reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.'); + } + }, + ); } public function reserve(int $amount, bool $tracksInventory): void { - if ($amount < 0) { - throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.'); - } - - if ($tracksInventory && $this->availableStock() < $amount) { - throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.'); - } - - $this->reserved_stock += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockReserved, + ['reserved_stock' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 0) { + throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.'); + } + if ($tracksInventory && $inventory->availableStock() < $amount) { + throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.'); + } + }, + ); } public function release(int $amount): void { - if ($amount < 0 || $this->reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad reservada no es válida.'); - } - - $this->reserved_stock -= $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockReleased, + ['reserved_stock' => -$amount], + function (self $inventory) use ($amount): void { + if ($amount < 0 || $inventory->reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad reservada no es válida.'); + } + }, + ); } public function buy(int $amount, bool $tracksInventory): void { - if ($amount < 0 || $this->reserved_stock < $amount) { - throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.'); + $counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount]; + if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) { + $counterDeltas['real_stock'] = -$amount; } - if ($tracksInventory && $this->real_stock - $this->entry_reserved_stock < $amount) { - throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); + $this->mutate( + InventoryMovementOperation::PurchaseCommitted, + $counterDeltas, + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 0 || $inventory->reserved_stock < $amount) { + throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.'); + } + if ($tracksInventory && $inventory->availableStock() < 0) { + throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); + } + }, + ); + } + + public function adjustAvailableStock( + int $delta, + ?User $responsibleUser = null, + ?string $idempotencyKey = null, + ): void { + if ($delta === 0) { + return; } - if ($tracksInventory) { - $this->real_stock -= $amount; + $operation = $delta > 0 + ? InventoryMovementOperation::StockIncreased + : InventoryMovementOperation::StockDecreased; + + $this->mutate( + $operation, + ['real_stock' => $delta], + function (self $inventory) use ($delta): void { + if ($inventory->real_stock + $delta < 0 || $inventory->availableStock() + $delta < 0) { + throw ValidationException::withMessages([ + 'stock_difference' => ['El ajuste dejaría el stock en un valor inválido.'], + ]); + } + }, + $responsibleUser, + $idempotencyKey, + ); + } + + public function refundStock(int $amount, ?User $responsibleUser = null): void + { + $counterDeltas = ['refunded_units' => $amount]; + if (! array_key_exists('available_stock', $this->attributes)) { + $counterDeltas['real_stock'] = $amount; } - $this->reserved_stock -= $amount; - $this->sold_units += $amount; - $this->save(); + $this->mutate( + InventoryMovementOperation::StockRefunded, + $counterDeltas, + function () use ($amount): void { + if ($amount < 1) { + throw new \InvalidArgumentException('La cantidad devuelta debe ser positiva.'); + } + }, + $responsibleUser, + ); + } + + public function commitDirectSale(int $amount, bool $tracksInventory = true): void + { + $this->mutate( + InventoryMovementOperation::PurchaseCommitted, + ['sold_units' => $amount], + function (self $inventory) use ($amount, $tracksInventory): void { + if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) { + throw new \InvalidArgumentException('No hay suficiente stock para confirmar la compra.'); + } + }, + ); + } + + public function recordInitialization(?User $responsibleUser = null): void + { + $this->recordCurrentState(InventoryMovementOperation::StockInitialized, $responsibleUser); + } + + public function recordTransferInitialization(?User $responsibleUser = null): void + { + $this->recordCurrentState(InventoryMovementOperation::InventoryTransferred, $responsibleUser); + } + + /** @param array $counterDeltas */ + public function transferCounters(array $counterDeltas, ?User $responsibleUser = null): void + { + $counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0); + if ($counterDeltas === []) { + return; + } + + $this->mutate( + InventoryMovementOperation::InventoryTransferred, + $counterDeltas, + function (self $inventory) use ($counterDeltas): void { + foreach ($counterDeltas as $counter => $delta) { + if ((int) $inventory->getAttribute($counter) + $delta < 0) { + throw new \LogicException("El traslado dejaría {$counter} en un valor negativo."); + } + } + }, + $responsibleUser, + ); + } + + private function recordCurrentState( + InventoryMovementOperation $operation, + ?User $responsibleUser, + ): void { + if (! Schema::hasTable('inventory_movements')) { + return; + } + + $this->refresh(); + $counterDeltas = array_filter([ + 'real_stock' => $this->real_stock, + 'sold_units' => $this->sold_units, + 'reserved_stock' => $this->reserved_stock, + 'entry_reserved_stock' => $this->entry_reserved_stock, + 'refunded_units' => $this->refunded_units, + ], fn (int $delta): bool => $delta !== 0); + + $this->movements()->create([ + 'operation' => $operation, + 'available_stock_delta' => $this->availableStock(), + 'available_stock_before' => 0, + 'available_stock_after' => $this->availableStock(), + 'counter_deltas' => $counterDeltas, + 'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(), + ]); + } + + public function resetTransactionCounters(?User $responsibleUser = null): void + { + $this->refresh(); + $counterDeltas = array_filter([ + 'sold_units' => -$this->sold_units, + 'reserved_stock' => -$this->reserved_stock, + 'entry_reserved_stock' => -$this->entry_reserved_stock, + 'refunded_units' => -$this->refunded_units, + ], fn (int $delta): bool => $delta !== 0); + + if ($counterDeltas === []) { + return; + } + + $this->mutate( + InventoryMovementOperation::InventoryReset, + $counterDeltas, + static function (): void {}, + $responsibleUser, + ); + } + + /** + * @param array $counterDeltas + * @param callable(self): void $validate + */ + private function mutate( + InventoryMovementOperation $operation, + array $counterDeltas, + callable $validate, + ?User $responsibleUser = null, + ?string $idempotencyKey = null, + ): void { + DB::transaction(function () use ($operation, $counterDeltas, $validate, $responsibleUser, $idempotencyKey): void { + /** @var self $inventory */ + $inventory = self::query()->lockForUpdate()->findOrFail($this->getKey()); + $this->setRawAttributes($inventory->getAttributes(), true); + + $recordsMovements = Schema::hasTable('inventory_movements'); + if ($recordsMovements && $idempotencyKey !== null) { + $existing = $this->movements() + ->where('idempotency_key', $idempotencyKey) + ->first(); + if ($existing !== null) { + if ($existing->counter_deltas !== $counterDeltas) { + throw ValidationException::withMessages([ + 'stock_adjustment_id' => ['La operación ya fue utilizada con otro ajuste.'], + ]); + } + + return; + } + } + + $validate($this); + $counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0); + if ($counterDeltas === []) { + return; + } + + $availableBefore = $this->availableStock(); + foreach ($counterDeltas as $counter => $delta) { + $this->setAttribute($counter, (int) $this->getAttribute($counter) + $delta); + } + $this->save(); + $this->refresh(); + + $availableAfter = $this->availableStock(); + if ($recordsMovements) { + $this->movements()->create([ + 'operation' => $operation, + 'available_stock_delta' => $availableAfter - $availableBefore, + 'available_stock_before' => $availableBefore, + 'available_stock_after' => $availableAfter, + 'counter_deltas' => $counterDeltas, + 'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(), + 'idempotency_key' => $idempotencyKey, + ]); + } + }); } } diff --git a/app/Domains/Commerce/Catalog/Models/InventoryMovement.php b/app/Domains/Commerce/Catalog/Models/InventoryMovement.php new file mode 100644 index 00000000..d2d65de9 --- /dev/null +++ b/app/Domains/Commerce/Catalog/Models/InventoryMovement.php @@ -0,0 +1,45 @@ + InventoryMovementOperation::class, + 'available_stock_delta' => 'integer', + 'available_stock_before' => 'integer', + 'available_stock_after' => 'integer', + 'counter_deltas' => 'array', + ]; + } + + /** @return BelongsTo */ + public function inventory(): BelongsTo + { + return $this->belongsTo(Inventory::class); + } + + /** @return BelongsTo */ + public function responsibleUser(): BelongsTo + { + return $this->belongsTo(User::class, 'responsible_user_id'); + } +} diff --git a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php new file mode 100644 index 00000000..fe0694f0 --- /dev/null +++ b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php @@ -0,0 +1,59 @@ +assertNonNegative($conversion, 'la conversión produciría un stock real negativo'); + $this->assertNonNegative( + "({$conversion}) - CAST(sold_units AS SIGNED) - CAST(reserved_stock AS SIGNED) - CAST(entry_reserved_stock AS SIGNED) + CAST(refunded_units AS SIGNED)", + 'el stock disponible actual es negativo', + ); + + if (DB::getDriverName() === 'sqlite') { + Schema::table('inventories', function (Blueprint $table): void { + $table->bigInteger('available_stock')->virtualAs(self::FORMULA); + }); + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + } else { + Schema::table('inventories', function (Blueprint $table): void { + $table->unsignedBigInteger('real_stock')->default(0)->change(); + $table->bigInteger('available_stock')->storedAs(self::FORMULA); + }); + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + } + } + + public function down(): void + { + $conversion = 'CAST(real_stock AS SIGNED) - CAST(sold_units AS SIGNED) + CAST(refunded_units AS SIGNED)'; + $this->assertNonNegative($conversion, 'el rollback produciría un stock real negativo'); + + if (DB::getDriverName() === 'sqlite') { + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock')); + + return; + } + + DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]); + Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock')); + } + + private function assertNonNegative(string $expression, string $reason): void + { + if (DB::table('inventories')->whereRaw("({$expression}) < 0")->exists()) { + throw new RuntimeException("Hay inventarios inconsistentes: {$reason}."); + } + } +}; diff --git a/database/migrations/2026_09_25_010000_create_inventory_movements_table.php b/database/migrations/2026_09_25_010000_create_inventory_movements_table.php new file mode 100644 index 00000000..b43c57c1 --- /dev/null +++ b/database/migrations/2026_09_25_010000_create_inventory_movements_table.php @@ -0,0 +1,33 @@ +id(); + $table->foreignId('inventory_id')->constrained('inventories')->restrictOnDelete(); + $table->string('operation', 40); + $table->bigInteger('available_stock_delta'); + $table->bigInteger('available_stock_before'); + $table->bigInteger('available_stock_after'); + $table->json('counter_deltas'); + $table->foreignId('responsible_user_id')->nullable()->constrained('users')->restrictOnDelete(); + $table->uuid('idempotency_key')->nullable(); + $table->timestamps(); + + $table->unique(['inventory_id', 'idempotency_key']); + $table->index(['inventory_id', 'created_at']); + $table->index(['operation', 'created_at']); + }); + } + + public function down(): void + { + Schema::dropIfExists('inventory_movements'); + } +}; diff --git a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php new file mode 100644 index 00000000..c70c29ee --- /dev/null +++ b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php @@ -0,0 +1,135 @@ +id(); + $table->softDeletes(); + }); + Schema::create('inventories', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('sold_units')->default(0); + $table->unsignedInteger('reserved_stock')->default(0); + $table->unsignedInteger('real_stock')->default(0); + $table->unsignedBigInteger('refunded_units')->default(0); + $table->unsignedInteger('entry_reserved_stock')->default(0); + }); + } + + protected function tearDown(): void + { + Schema::disableForeignKeyConstraints(); + Schema::dropIfExists('inventory_movements'); + Schema::dropIfExists('inventories'); + Schema::dropIfExists('users'); + Schema::enableForeignKeyConstraints(); + + parent::tearDown(); + } + + public function test_migration_and_rollback_preserve_the_available_balance(): void + { + DB::table('inventories')->insert([ + 'id' => 17, + 'real_stock' => 10, + 'sold_units' => 3, + 'refunded_units' => 1, + 'reserved_stock' => 2, + 'entry_reserved_stock' => 1, + ]); + + $stockMigration = $this->stockMigration(); + $movementMigration = $this->movementMigration(); + $stockMigration->up(); + $movementMigration->up(); + + $inventory = Inventory::findOrFail(17); + $this->assertSame(12, $inventory->real_stock); + $this->assertSame(7, $inventory->availableStock()); + $this->assertTrue(Schema::hasTable('inventory_movements')); + + $inventory->adjustAvailableStock(2); + $this->assertSame(9, $inventory->availableStock()); + + $movementMigration->down(); + $stockMigration->down(); + + $this->assertFalse(Schema::hasColumn('inventories', 'available_stock')); + $this->assertFalse(Schema::hasTable('inventory_movements')); + $this->assertSame(12, Inventory::findOrFail(17)->real_stock); + $this->assertSame(9, Inventory::findOrFail(17)->availableStock()); + } + + public function test_movements_capture_counters_actor_and_idempotency(): void + { + $this->stockMigration()->up(); + $this->movementMigration()->up(); + DB::table('users')->insert(['id' => 5]); + $user = User::query()->findOrFail(5); + + $inventory = Inventory::query()->create(['real_stock' => 10]); + $inventory->recordInitialization($user); + $inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4'); + $inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4'); + $inventory->reserve(2, true); + $inventory->buy(2, true); + $inventory->refundStock(1, $user); + + $this->assertSame(12, $inventory->availableStock()); + $this->assertCount(5, $inventory->movements()->get()); + + $adjustment = InventoryMovement::query() + ->where('operation', InventoryMovementOperation::StockIncreased->value) + ->firstOrFail(); + $this->assertSame(3, $adjustment->available_stock_delta); + $this->assertSame(10, $adjustment->available_stock_before); + $this->assertSame(13, $adjustment->available_stock_after); + $this->assertSame(['real_stock' => 3], $adjustment->counter_deltas); + $this->assertSame(5, $adjustment->responsible_user_id); + + $purchase = InventoryMovement::query() + ->where('operation', InventoryMovementOperation::PurchaseCommitted->value) + ->firstOrFail(); + $this->assertSame(0, $purchase->available_stock_delta); + $this->assertSame(['reserved_stock' => -2, 'sold_units' => 2], $purchase->counter_deltas); + } + + public function test_migration_rejects_an_inventory_with_negative_available_stock(): void + { + DB::table('inventories')->insert([ + 'real_stock' => 1, + 'reserved_stock' => 2, + ]); + + $this->expectException(\RuntimeException::class); + $this->expectExceptionMessage('stock disponible actual es negativo'); + + $this->stockMigration()->up(); + } + + private function stockMigration(): Migration + { + return require database_path('migrations/2026_09_25_000000_generate_available_inventory_stock.php'); + } + + private function movementMigration(): Migration + { + return require database_path('migrations/2026_09_25_010000_create_inventory_movements_table.php'); + } +} -- 2.49.1 From bc60f1caa1b33038d57e5227b35f21acd56492f7 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:19 -0300 Subject: [PATCH 07/23] refactor(inventory): record stock operations consistently --- .../Services/CatalogInventoryService.php | 3 +- .../Catalog/Services/CatalogService.php | 5 ++- .../Services/StockReservationService.php | 2 +- .../Services/VariantReplacementService.php | 32 ++++++++++--------- .../TenantTransactionResetService.php | 16 ++++------ .../InvitationPurchaseProvisioner.php | 19 ++++++++--- .../Ticket/Services/AdminAppTicketService.php | 10 ++---- .../Services/BackfillRefundedUnitsService.php | 15 ++++----- 8 files changed, 54 insertions(+), 48 deletions(-) diff --git a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php index 5819fe73..d79a7638 100644 --- a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php +++ b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php @@ -64,6 +64,7 @@ class CatalogInventoryService $selection->loadMissing('variants.inventory'); return $selection->variants + ->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $selection)) ->filter(fn (Variant $variant): bool => $variant->isSellable()) ->unique(fn (Variant $variant): string => $variant->inventory_id === null ? 'object:'.spl_object_id($variant->inventory) @@ -153,7 +154,7 @@ class CatalogInventoryService if ($operation === 'commit' && $requirement['tracks_inventory'] - && $inventory->real_stock - $inventory->entry_reserved_stock < $requiredQuantity) { + && $inventory->availableStock() < 0) { throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.'); } } diff --git a/app/Domains/Commerce/Catalog/Services/CatalogService.php b/app/Domains/Commerce/Catalog/Services/CatalogService.php index 5d2c0280..4b87a505 100644 --- a/app/Domains/Commerce/Catalog/Services/CatalogService.php +++ b/app/Domains/Commerce/Catalog/Services/CatalogService.php @@ -370,9 +370,12 @@ class CatalogService private function createInventory(int $realStock): Inventory { - return Inventory::query()->create([ + $inventory = Inventory::query()->create([ 'real_stock' => $realStock, ]); + $inventory->recordInitialization(); + + return $inventory; } /** diff --git a/app/Domains/Commerce/Catalog/Services/StockReservationService.php b/app/Domains/Commerce/Catalog/Services/StockReservationService.php index a9216474..2412ee76 100644 --- a/app/Domains/Commerce/Catalog/Services/StockReservationService.php +++ b/app/Domains/Commerce/Catalog/Services/StockReservationService.php @@ -225,7 +225,7 @@ class StockReservationService $inventory = $inventories->get($line->inventory_id) ?? throw new \InvalidArgumentException('No se encontró el inventario reservado.'); if ($inventory->reserved_stock < $line->quantity - || ($line->tracks_inventory && $inventory->real_stock - $inventory->entry_reserved_stock < $line->quantity)) { + || ($line->tracks_inventory && $inventory->availableStock() < 0)) { throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.'); } } diff --git a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php index 317c4972..ac28cf69 100644 --- a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php +++ b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php @@ -194,6 +194,7 @@ class VariantReplacementService 'entry_reserved_stock' => $sourceInventory->entry_reserved_stock, 'real_stock' => $sourceInventory->real_stock, ]); + $replacementInventory->recordTransferInitialization(); if ($activeLines->isNotEmpty()) { StockReservationLine::query() @@ -202,7 +203,10 @@ class VariantReplacementService } EntryReservation::query()->where('inventory_id', $sourceInventory->id) ->update(['inventory_id' => $replacementInventory->id]); - $sourceInventory->update(['reserved_stock' => 0, 'entry_reserved_stock' => 0]); + $sourceInventory->transferCounters([ + 'reserved_stock' => -$sourceInventory->reserved_stock, + 'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock, + ]); return $replacementInventory; } @@ -236,13 +240,14 @@ class VariantReplacementService throw new \LogicException('El inventario reservado de la variante es inconsistente.'); } - $destinationInventory->update([ - 'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock, - 'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock, - 'entry_reserved_stock' => $destinationInventory->entry_reserved_stock + $sourceInventory->entry_reserved_stock, - 'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units, - 'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units, - ]); + $transferredCounters = [ + 'real_stock' => $sourceInventory->real_stock, + 'reserved_stock' => $sourceInventory->reserved_stock, + 'entry_reserved_stock' => $sourceInventory->entry_reserved_stock, + 'sold_units' => $sourceInventory->sold_units, + 'refunded_units' => $sourceInventory->refunded_units, + ]; + $destinationInventory->transferCounters($transferredCounters); if ($activeLines->isNotEmpty()) { StockReservationLine::query() ->whereKey($activeLines->modelKeys()) @@ -250,13 +255,10 @@ class VariantReplacementService } EntryReservation::query()->where('inventory_id', $sourceInventory->id) ->update(['inventory_id' => $destinationInventory->id]); - $sourceInventory->update([ - 'real_stock' => 0, - 'reserved_stock' => 0, - 'entry_reserved_stock' => 0, - 'sold_units' => 0, - 'refunded_units' => 0, - ]); + $sourceInventory->transferCounters(array_map( + fn (int $value): int => -$value, + $transferredCounters, + )); } /** @return list */ diff --git a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php index 37931061..815b2663 100644 --- a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php +++ b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php @@ -2,6 +2,7 @@ namespace App\Domains\Commerce\Purchase\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Purchase\Models\Purchase; use Illuminate\Database\Query\Builder; use Illuminate\Support\Collection; @@ -69,15 +70,12 @@ class TenantTransactionResetService 'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(), ]; - DB::table('inventories') - ->whereIn('id', $scope['inventory_ids']) - ->update([ - 'real_stock' => DB::raw('real_stock + sold_units - refunded_units'), - 'reserved_stock' => 0, - 'entry_reserved_stock' => 0, - 'sold_units' => 0, - 'refunded_units' => 0, - ]); + Inventory::query() + ->whereKey($scope['inventory_ids']) + ->orderBy('id') + ->lockForUpdate() + ->get() + ->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters()); return $summary; }); diff --git a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php index a2be68ea..2fcb5e29 100644 --- a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php +++ b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php @@ -2,6 +2,7 @@ namespace App\Domains\Ticketing\Desfile\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use DateTimeInterface; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; @@ -393,14 +394,22 @@ class InvitationPurchaseProvisioner $inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first(); - if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0 || ($inventory->entry_reserved_stock ?? 0) > 0) { + $available = $inventory?->available_stock + ?? ($inventory === null ? 0 : $inventory->real_stock - $inventory->reserved_stock - ($inventory->entry_reserved_stock ?? 0)); + if ($available < 1) { throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible."); } - DB::table('inventories')->where('id', $inventory->id)->update([ - 'real_stock' => $inventory->real_stock - 1, - 'sold_units' => $inventory->sold_units + 1, - ]); + if (property_exists($inventory, 'available_stock')) { + Inventory::query()->findOrFail($inventory->id)->commitDirectSale(1); + } else { + // This provisioner is also used by historical migrations that run + // before generated availability and the movement ledger exist. + DB::table('inventories')->where('id', $inventory->id)->update([ + 'real_stock' => $inventory->real_stock - 1, + 'sold_units' => $inventory->sold_units + 1, + ]); + } $reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id'); if ($reservationId === null) { diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php index 81dbfa0f..2dede24a 100644 --- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php +++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php @@ -228,13 +228,13 @@ class AdminAppTicketService 'amount' => number_format($refundAmount, 2, '.', ''), ]); - $this->restoreInventory($ticket, $purchaseItem); + $this->restoreInventory($ticket, $purchaseItem, $createdBy); return $ticket->refresh()->load(self::RELATIONS); }); } - private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem): void + private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem, ?User $createdBy): void { $catalogItem = $ticket->sourceCatalogItem; if ($catalogItem === null) { @@ -272,11 +272,7 @@ class AdminAppTicketService throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']); } - if ($catalogItem->inventory_policy === InventoryPolicy::Tracked) { - $inventory->real_stock++; - } - $inventory->refunded_units++; - $inventory->save(); + $inventory->refundStock(1, $createdBy); } private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float diff --git a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php index d403ded8..dd9acdc7 100644 --- a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php +++ b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php @@ -2,6 +2,7 @@ namespace App\Domains\Ticketing\Ticket\Services; +use App\Domains\Commerce\Catalog\Models\Inventory; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use RuntimeException; @@ -64,14 +65,9 @@ class BackfillRefundedUnitsService }, 'refunds.id', 'id'); foreach ($counts as $inventoryId => $count) { - $updates = ['refunded_units' => DB::raw('refunded_units + '.$count['refunded'])]; - if (($count['stock'] ?? 0) > 0) { - $updates['real_stock'] = DB::raw('real_stock + '.$count['stock']); - } - - if (DB::table('inventories')->where('id', $inventoryId)->update($updates) !== 1) { - throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo."); - } + $inventory = Inventory::query()->lockForUpdate()->find($inventoryId) + ?? throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo."); + $inventory->refundStock($count['refunded']); } $refundedUnitsAdded = array_sum(array_column($counts, 'refunded')); @@ -82,7 +78,8 @@ class BackfillRefundedUnitsService 'bundles_skipped' => $bundlesSkipped, 'inventories_updated' => count($counts), 'refunded_units_added' => $refundedUnitsAdded, - 'real_stock_added' => array_sum(array_column($counts, 'stock')), + 'real_stock_added' => 0, + 'available_stock_added' => $refundedUnitsAdded, ]; }); -- 2.49.1 From e988e55b77be21ef43e9473cadf88839d3037495 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 10:15:29 -0300 Subject: [PATCH 08/23] feat(admin-stock): apply idempotent availability deltas --- .../Controllers/AccommodationController.php | 1 + .../Controllers/EntryController.php | 1 + .../Controllers/FoodController.php | 2 + .../Controllers/MerchandiseController.php | 1 + .../UpdateHistoricalFoodStockRequest.php | 4 +- .../UpsertAccommodationVariantsRequest.php | 4 +- .../Requests/UpsertEntriesRequest.php | 4 +- .../Requests/UpsertFoodVariantsRequest.php | 4 +- .../Requests/UpsertMerchandiseRequest.php | 4 +- .../Resources/AccommodationResource.php | 2 +- .../Resources/EntryResource.php | 2 +- .../Resources/FoodResource.php | 2 +- .../Resources/MerchandiseResource.php | 2 +- .../Services/AccommodationService.php | 19 ++++------ .../Services/EntryService.php | 21 ++++------ .../Services/FoodService.php | 38 +++++++------------ .../Services/MerchandiseService.php | 20 ++++------ 17 files changed, 59 insertions(+), 72 deletions(-) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php index fb9ca451..e21425d3 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php @@ -28,6 +28,7 @@ class AccommodationController extends Controller $this->accommodationService->upsertMany( $tenant, $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php index 68b11636..2fa4d1e1 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php @@ -29,6 +29,7 @@ class EntryController extends Controller $entries = $this->entryService->upsertMany( $tenant, $request->validated('entries'), + $request->validated('stock_adjustment_id'), ); return EntryResource::collection($entries) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php index e580cc8d..86d5b5f4 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php @@ -29,6 +29,7 @@ class FoodController extends Controller $this->foodService->upsertMany( $tenant, $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } @@ -39,6 +40,7 @@ class FoodController extends Controller $this->foodService->updateHistoricalStock( $request->user()->tenant()->firstOrFail(), $request->validated('variants'), + $request->validated('stock_adjustment_id'), ) ); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php index 10b0307f..dd52f9a0 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php @@ -28,6 +28,7 @@ class MerchandiseController extends Controller $items = $this->merchandiseService->upsertMany( $tenant, $request->validated('items'), + $request->validated('stock_adjustment_id'), ); return MerchandiseResource::collection($items) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php index aa784622..d137b168 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php @@ -16,9 +16,11 @@ class UpdateHistoricalFoodStockRequest extends FormRequest { return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,stock'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,stock,stock_difference'], 'variants.*.id' => ['required', 'integer', 'distinct'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], ]; } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php index d275c487..11ff365c 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php @@ -16,11 +16,13 @@ class UpsertAccommodationVariantsRequest extends FormRequest { return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,title,description,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,title,description,stock,stock_difference,price'], 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.title' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php index 6827fc4b..b18cf1f3 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php @@ -20,7 +20,8 @@ class UpsertEntriesRequest extends FormRequest return [ 'entries' => ['required', 'array', 'min:1', 'max:100'], - 'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,stock_difference,price'], 'entries.*.id' => [ 'sometimes', 'nullable', @@ -47,6 +48,7 @@ class UpsertEntriesRequest extends FormRequest ), ], 'entries.*.stock' => ['required', 'integer', 'min:0'], + 'entries.*.stock_difference' => ['nullable', 'integer'], 'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php index 164ca981..1f6872ec 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php @@ -20,7 +20,8 @@ class UpsertFoodVariantsRequest extends FormRequest return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], - 'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,stock_difference,price'], 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.event_date_id' => [ 'required', @@ -33,6 +34,7 @@ class UpsertFoodVariantsRequest extends FormRequest 'variants.*.service' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], 'variants.*.stock' => ['required', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['nullable', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php index 862a59a0..15b05967 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php @@ -39,11 +39,13 @@ class UpsertMerchandiseRequest extends FormRequest 'items.*.description' => ['sometimes', 'nullable', 'string'], 'items.*.max_units_per_user' => ['required', 'integer', 'min:1'], 'items.*.variants' => ['required', 'array', 'min:1', 'max:500'], - 'items.*.variants.*' => ['required', 'array:id,color,size,stock,price'], + 'stock_adjustment_id' => ['nullable', 'uuid'], + 'items.*.variants.*' => ['required', 'array:id,color,size,stock,stock_difference,price'], 'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'items.*.variants.*.color' => ['required', 'string', 'max:255'], 'items.*.variants.*.size' => ['required', 'string', 'max:255'], 'items.*.variants.*.stock' => ['required', 'integer', 'min:0'], + 'items.*.variants.*.stock_difference' => ['nullable', 'integer'], 'items.*.variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php index b3cb3186..9b3a9d06 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php @@ -37,7 +37,7 @@ class AccommodationResource extends JsonResource 'title' => $options->get($value)?->label ?? $value, 'value' => $value, 'description' => $variant->descripcion, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; })->values(), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php index efce8a91..7da32839 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php @@ -33,7 +33,7 @@ class EntryResource extends JsonResource 'title' => $this->nombre, 'description' => $this->descripcion, 'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(), - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => $this->precio, ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php index 436e62da..34d7abfb 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php @@ -81,7 +81,7 @@ class FoodResource extends JsonResource 'schedule' => $values->get('horario'), 'service' => $values->get('servicio'), 'description' => $variant->descripcion, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php index 2b6f2a26..369e0783 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php @@ -44,7 +44,7 @@ class MerchandiseResource extends JsonResource 'color_value' => $colorValue, 'size' => $sizeOptions->get($sizeValue)?->label ?? $sizeValue, 'size_value' => $sizeValue, - 'stock' => $variant->inventory->real_stock, + 'stock' => $variant->inventory->availableStock(), 'price' => number_format($variant->getPrice(), 2, '.', ''), ]; })->values(), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php index 6e5baae2..20e44ee6 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php @@ -39,9 +39,9 @@ class AccommodationService /** * @param array> $variants */ - public function upsertMany(Tenant $tenant, array $variants): CatalogItem + public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $attribute = $this->attribute($tenant); $accommodation = $this->accommodation($tenant, $variants); $itemAttribute = $accommodation->itemAttributes()->firstOrCreate( @@ -70,7 +70,7 @@ class AccommodationService if ($variant === null) { $this->createVariant($attribute, $accommodation, $itemAttribute, $data); } else { - $this->updateVariant($attribute, $variant, $itemAttribute, $data, $index); + $this->updateVariant($attribute, $variant, $itemAttribute, $data, $index, $stockAdjustmentId); } } @@ -212,6 +212,7 @@ class AccommodationService $this->createOption($attribute, $data['value'], $data['title']); $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $accommodation->variants()->create([ 'inventory_id' => $inventory->id, 'descripcion' => $data['description'], @@ -230,20 +231,13 @@ class AccommodationService ItemAttribute $itemAttribute, array $data, int $index, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $definition = $variant->definitions ->firstWhere('item_attribute_id', $itemAttribute->id); $option = $definition === null @@ -263,7 +257,8 @@ class AccommodationService 'descripcion' => $data['description'], 'precio' => $data['price'], ]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $variant->definitions()->updateOrCreate( ['item_attribute_id' => $itemAttribute->id], ['value' => $data['value']], diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php index 5d028f5d..5c486029 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php @@ -43,18 +43,18 @@ class EntryService * @param array> $entries * @return Collection */ - public function upsertMany(Tenant $tenant, array $entries): Collection + public function upsertMany(Tenant $tenant, array $entries, ?string $stockAdjustmentId = null): Collection { - return DB::transaction(function () use ($tenant, $entries): Collection { + return DB::transaction(function () use ($tenant, $entries, $stockAdjustmentId): Collection { $reservedSlugs = []; $category = Category::query()->firstOrCreate([ 'tenant_code' => $tenant->codigo, 'nombre' => 'Entradas', ]); - return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, &$reservedSlugs): CatalogItem { + return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, $stockAdjustmentId, &$reservedSlugs): CatalogItem { if (isset($entry['id'])) { - return $this->update($tenant, $category, $entry, $index); + return $this->update($tenant, $category, $entry, $index, $stockAdjustmentId); } $slug = $this->uniqueSlug($tenant, $entry['title'], $reservedSlugs); @@ -92,7 +92,7 @@ class EntryService } /** @param array $entry */ - private function update(Tenant $tenant, Category $category, array $entry, int $index): CatalogItem + private function update(Tenant $tenant, Category $category, array $entry, int $index, ?string $stockAdjustmentId): CatalogItem { $catalogItem = CatalogItem::query() ->whereKey($entry['id']) @@ -121,14 +121,6 @@ class EntryService ->lockForUpdate() ->firstOrFail(); - if ((int) $entry['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "entries.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $eventDateIds = collect($entry['event_date_ids']) ->map(fn ($id): int => (int) $id) ->unique() @@ -149,7 +141,8 @@ class EntryService $catalogItem->itemAttributes() ->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date')) ->update(['allow_multi_select' => true]); - $inventory->update(['real_stock' => $entry['stock']]); + $stockDifference = (int) ($entry['stock_difference'] ?? ((int) $entry['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); return $catalogItem->load([ 'variants.inventory', diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php index 88488541..8b9f4c05 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php @@ -11,9 +11,9 @@ use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Catalog\Models\ItemAttribute; use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Commerce\Catalog\Services\CatalogService; +use App\Domains\Core\Tenant\Models\Tenant; use App\Domains\Ticketing\Event\Enums\EventDateStatus; use App\Domains\Ticketing\Event\Models\EventDate; -use App\Domains\Core\Tenant\Models\Tenant; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Validation\ValidationException; @@ -50,9 +50,9 @@ class FoodService /** * @param array> $variants */ - public function upsertMany(Tenant $tenant, array $variants): CatalogItem + public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $attributes = $this->attributes($tenant); $food = $this->food($tenant, $variants); $itemAttributes = $this->itemAttributes($food, $attributes); @@ -85,7 +85,7 @@ class FoodService if ($variant === null) { $this->createVariant($food, $itemAttributes, $data); } else { - $this->updateVariant($variant, $itemAttributes, $data, $index); + $this->updateVariant($variant, $itemAttributes, $data, $index, $stockAdjustmentId); } } @@ -115,9 +115,9 @@ class FoodService /** * @param array $variants */ - public function updateHistoricalStock(Tenant $tenant, array $variants): CatalogItem + public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { - return DB::transaction(function () use ($tenant, $variants): CatalogItem { + return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem { $food = CatalogItem::query() ->forTenantCatalog($tenant) ->where('slug', 'comida') @@ -142,17 +142,9 @@ class FoodService ]); } - $stock = (int) $data['stock']; $inventory = $this->inventoryForHistoricalStockUpdate($variant); - if ($stock < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - - $inventory->update(['real_stock' => $stock]); + $stockDifference = (int) ($data['stock_difference'] ?? ((int) $data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); } return $this->current($tenant) ?? $food; @@ -181,6 +173,7 @@ class FoodService 'reserved_stock' => 0, 'real_stock' => $inventory->real_stock, ]); + $historicalInventory->recordTransferInitialization(); $variant->update(['inventory_id' => $historicalInventory->getKey()]); return $historicalInventory; @@ -384,6 +377,7 @@ class FoodService private function createVariant(CatalogItem $food, Collection $itemAttributes, array $data): void { $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $food->variants()->create([ 'event_date_id' => $data['event_date_id'], 'inventory_id' => $inventory->id, @@ -400,27 +394,21 @@ class FoodService Collection $itemAttributes, array $data, int $index, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "variants.{$index}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $variant->update([ 'event_date_id' => $data['event_date_id'], 'descripcion' => $data['description'], 'precio' => $data['price'], ]); $variant->eventDates()->sync([$data['event_date_id']]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php index 3d3183ca..735406df 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php @@ -43,9 +43,9 @@ class MerchandiseService * @param array> $items * @return Collection */ - public function upsertMany(Tenant $tenant, array $items): Collection + public function upsertMany(Tenant $tenant, array $items, ?string $stockAdjustmentId = null): Collection { - return DB::transaction(function () use ($tenant, $items): Collection { + return DB::transaction(function () use ($tenant, $items, $stockAdjustmentId): Collection { $attributes = $this->attributes($tenant); $category = Category::query()->firstOrCreate([ 'tenant_code' => $tenant->codigo, @@ -57,6 +57,7 @@ class MerchandiseService $tenant, $attributes, $category, + $stockAdjustmentId, &$reservedSlugs, ): CatalogItem { $item = isset($data['id']) @@ -101,7 +102,7 @@ class MerchandiseService if ($variant === null) { $this->createVariant($item, $itemAttributes, $variantData); } else { - $this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex); + $this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex, $stockAdjustmentId); } } @@ -342,6 +343,7 @@ class MerchandiseService array $data, ): void { $inventory = Inventory::query()->create(['real_stock' => $data['stock']]); + $inventory->recordInitialization(); $variant = $item->variants()->create([ 'inventory_id' => $inventory->id, 'precio' => $data['price'], @@ -359,22 +361,16 @@ class MerchandiseService array $data, int $itemIndex, int $variantIndex, + ?string $stockAdjustmentId, ): void { $inventory = Inventory::query() ->whereKey($variant->inventory_id) ->lockForUpdate() ->firstOrFail(); - if ($data['stock'] < $inventory->reserved_stock) { - throw ValidationException::withMessages([ - "items.{$itemIndex}.variants.{$variantIndex}.stock" => [ - 'El stock no puede ser menor que la cantidad actualmente reservada.', - ], - ]); - } - $variant->update(['precio' => $data['price']]); - $inventory->update(['real_stock' => $data['stock']]); + $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); + $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); $this->syncDefinitions($variant, $itemAttributes, $data); } -- 2.49.1 From 9db955bdcf26ca43da914cce0b3bd7f0c6868109 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 15:28:49 -0300 Subject: [PATCH 09/23] refactor(inventory): update stock validation rules and enforce stock_difference requirement --- .../UpdateHistoricalFoodStockRequest.php | 5 +-- .../UpsertAccommodationVariantsRequest.php | 33 ++++++++++++++- .../Requests/UpsertEntriesRequest.php | 18 ++++++++- .../Requests/UpsertFoodVariantsRequest.php | 18 ++++++++- .../Requests/UpsertMerchandiseRequest.php | 40 ++++++++++++++++++- .../Services/AccommodationService.php | 8 ++-- .../Services/EntryService.php | 6 ++- .../Services/FoodService.php | 16 +++++--- .../Services/MerchandiseService.php | 8 ++-- .../AccommodationControllerTest.php | 2 + .../EntryControllerTest.php | 8 ++-- .../FoodControllerTest.php | 6 ++- .../MerchandiseControllerTest.php | 4 ++ 13 files changed, 141 insertions(+), 31 deletions(-) diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php index d137b168..caa5e853 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php @@ -17,10 +17,9 @@ class UpdateHistoricalFoodStockRequest extends FormRequest return [ 'variants' => ['required', 'array', 'min:1', 'max:500'], 'stock_adjustment_id' => ['nullable', 'uuid'], - 'variants.*' => ['required', 'array:id,stock,stock_difference'], + 'variants.*' => ['required', 'array:id,stock_difference'], 'variants.*.id' => ['required', 'integer', 'distinct'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock_difference' => ['required', 'integer'], ]; } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php index 11ff365c..7e2475eb 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php @@ -3,6 +3,7 @@ namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Validator; class UpsertAccommodationVariantsRequest extends FormRequest { @@ -21,9 +22,37 @@ class UpsertAccommodationVariantsRequest extends FormRequest 'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'variants.*.title' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['sometimes', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } + + /** @return array */ + public function after(): array + { + return [ + function (Validator $validator): void { + foreach ($this->input('variants', []) as $index => $variant) { + if (! is_array($variant)) { + continue; + } + + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + } + }, + ]; + } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php index b18cf1f3..2b982850 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php @@ -47,8 +47,8 @@ class UpsertEntriesRequest extends FormRequest fn ($query) => $query->where('tenant_code', $tenantCode) ), ], - 'entries.*.stock' => ['required', 'integer', 'min:0'], - 'entries.*.stock_difference' => ['nullable', 'integer'], + 'entries.*.stock' => ['sometimes', 'integer', 'min:0'], + 'entries.*.stock_difference' => ['sometimes', 'integer'], 'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } @@ -63,6 +63,20 @@ class UpsertEntriesRequest extends FormRequest continue; } + if (isset($entry['id']) && ! array_key_exists('stock_difference', $entry)) { + $validator->errors()->add( + "entries.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una entrada.', + ); + } + + if (! isset($entry['id']) && ! array_key_exists('stock', $entry)) { + $validator->errors()->add( + "entries.{$index}.stock", + 'El stock inicial es obligatorio al crear una entrada.', + ); + } + $dateIds = $entry['event_date_ids'] ?? []; if (! is_array($dateIds)) { diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php index 1f6872ec..50b557d5 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php @@ -33,8 +33,8 @@ class UpsertFoodVariantsRequest extends FormRequest 'variants.*.schedule' => ['required', 'string', 'max:255'], 'variants.*.service' => ['required', 'string', 'max:255'], 'variants.*.description' => ['sometimes', 'nullable', 'string'], - 'variants.*.stock' => ['required', 'integer', 'min:0'], - 'variants.*.stock_difference' => ['nullable', 'integer'], + 'variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'variants.*.stock_difference' => ['sometimes', 'integer'], 'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } @@ -51,6 +51,20 @@ class UpsertFoodVariantsRequest extends FormRequest continue; } + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "variants.{$index}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + $key = implode('|', [ $variant['event_date_id'] ?? '', mb_strtolower(trim((string) ($variant['schedule'] ?? ''))), diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php index 15b05967..0e683413 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php @@ -4,6 +4,7 @@ namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use Illuminate\Validation\Validator; class UpsertMerchandiseRequest extends FormRequest { @@ -44,9 +45,44 @@ class UpsertMerchandiseRequest extends FormRequest 'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'], 'items.*.variants.*.color' => ['required', 'string', 'max:255'], 'items.*.variants.*.size' => ['required', 'string', 'max:255'], - 'items.*.variants.*.stock' => ['required', 'integer', 'min:0'], - 'items.*.variants.*.stock_difference' => ['nullable', 'integer'], + 'items.*.variants.*.stock' => ['sometimes', 'integer', 'min:0'], + 'items.*.variants.*.stock_difference' => ['sometimes', 'integer'], 'items.*.variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'], ]; } + + /** @return array */ + public function after(): array + { + return [ + function (Validator $validator): void { + foreach ($this->input('items', []) as $itemIndex => $item) { + if (! is_array($item)) { + continue; + } + + foreach ($item['variants'] ?? [] as $variantIndex => $variant) { + if (! is_array($variant)) { + continue; + } + + $prefix = "items.{$itemIndex}.variants.{$variantIndex}"; + if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) { + $validator->errors()->add( + "{$prefix}.stock_difference", + 'La diferencia de stock es obligatoria al actualizar una variante.', + ); + } + + if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) { + $validator->errors()->add( + "{$prefix}.stock", + 'El stock inicial es obligatorio al crear una variante.', + ); + } + } + } + }, + ]; + } } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php index 20e44ee6..4e33b50e 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php @@ -169,7 +169,7 @@ class AccommodationService 'title' => trim($variant['title']), 'value' => $this->valueCode($variant['title']), 'description' => $variant['description'] ?? null, - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ])->all(); } @@ -257,8 +257,10 @@ class AccommodationService 'descripcion' => $data['description'], 'precio' => $data['price'], ]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $variant->definitions()->updateOrCreate( ['item_attribute_id' => $itemAttribute->id], ['value' => $data['value']], diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php index 5c486029..06ac4e09 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php @@ -141,8 +141,10 @@ class EntryService $catalogItem->itemAttributes() ->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date')) ->update(['allow_multi_select' => true]); - $stockDifference = (int) ($entry['stock_difference'] ?? ((int) $entry['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $entry['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); return $catalogItem->load([ 'variants.inventory', diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php index 8b9f4c05..1e194eaf 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php @@ -113,7 +113,7 @@ class FoodService } /** - * @param array $variants + * @param array $variants */ public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem { @@ -143,8 +143,10 @@ class FoodService } $inventory = $this->inventoryForHistoricalStockUpdate($variant); - $stockDifference = (int) ($data['stock_difference'] ?? ((int) $data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); } return $this->current($tenant) ?? $food; @@ -294,7 +296,7 @@ class FoodService 'schedule' => $schedule->value, 'service' => $service->value, 'description' => (string) ($variant['description'] ?? ''), - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ]; })->all(); } @@ -407,8 +409,10 @@ class FoodService 'precio' => $data['price'], ]); $variant->eventDates()->sync([$data['event_date_id']]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php index 735406df..9beaac2d 100644 --- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php +++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php @@ -245,7 +245,7 @@ class MerchandiseService ...$variant, 'color' => $color->value, 'size' => $size->value, - 'stock' => (int) $variant['stock'], + ...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []), ]; })->all(); } @@ -369,8 +369,10 @@ class MerchandiseService ->firstOrFail(); $variant->update(['precio' => $data['price']]); - $stockDifference = (int) ($data['stock_difference'] ?? ($data['stock'] - $inventory->availableStock())); - $inventory->adjustAvailableStock($stockDifference, idempotencyKey: $stockAdjustmentId); + $inventory->adjustAvailableStock( + (int) $data['stock_difference'], + idempotencyKey: $stockAdjustmentId, + ); $this->syncDefinitions($variant, $itemAttributes, $data); } diff --git a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php index d04907fb..3050ac09 100644 --- a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php @@ -97,6 +97,8 @@ class AccommodationControllerTest extends TestCase $updated = $this->variantPayload('Casa Rodante Premium', 'Con electricidad', 15, 50000); $updated['id'] = $variantId; + unset($updated['stock']); + $updated['stock_difference'] = -5; $this->postJson('/api/v1/adminapp/tenant/accommodations', [ 'variants' => [ diff --git a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php index fb3b59fb..b6066fe9 100644 --- a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php @@ -194,7 +194,7 @@ class EntryControllerTest extends TestCase 'title' => 'Abono actualizado', 'description' => 'Ahora incluye ambas fechas', 'event_date_ids' => [$firstDate->id, $secondDate->id], - 'stock' => 20, + 'stock_difference' => 10, 'price' => 250, ], [ @@ -268,7 +268,7 @@ class EntryControllerTest extends TestCase 'id' => $entryId, 'title' => 'Abono editado', 'event_date_ids' => [$date->id, $otherDate->id], - 'stock' => 30, + 'stock_difference' => 10, 'price' => 200, ]], ])->assertOk() @@ -329,7 +329,7 @@ class EntryControllerTest extends TestCase 'title' => 'Entrada inválida', 'description' => null, 'event_date_ids' => [$foreignDate->id], - 'stock' => 10, + 'stock_difference' => 0, 'price' => 100, ]], ]) @@ -371,7 +371,7 @@ class EntryControllerTest extends TestCase 'title' => 'Entrada inválida', 'description' => null, 'event_date_ids' => [$eventDate->id], - 'stock' => 10, + 'stock_difference' => 0, 'price' => 100, ]], ]) diff --git a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php index bef74360..c0339163 100644 --- a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php @@ -124,6 +124,8 @@ class FoodControllerTest extends TestCase $updated = $this->variantPayload($secondDate->id, 'Cena', 'Vianda', 80, 8500); $updated['id'] = $variantId; + unset($updated['stock']); + $updated['stock_difference'] = -20; $updated['description'] = 'Cena para llevar'; $this->postJson('/api/v1/adminapp/tenant/foods', [ @@ -240,7 +242,7 @@ class FoodControllerTest extends TestCase Inventory::query()->whereKey($replacementInventoryId)->delete(); $updated = $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [ - 'variants' => [['id' => $historicalVariantId, 'stock' => 45]], + 'variants' => [['id' => $historicalVariantId, 'stock_difference' => -55]], ]) ->assertOk() ->assertJsonPath('data.history.0.variants.0.id', $historicalVariantId) @@ -258,7 +260,7 @@ class FoodControllerTest extends TestCase ]); $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [ - 'variants' => [['id' => $activeVariantId, 'stock' => 20]], + 'variants' => [['id' => $activeVariantId, 'stock_difference' => -60]], ]) ->assertUnprocessable() ->assertJsonValidationErrors(['variants.0.id']); diff --git a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php index 09752a40..7f8ddcf8 100644 --- a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php +++ b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php @@ -112,6 +112,8 @@ class MerchandiseControllerTest extends TestCase $updatedVariant = $this->variantPayload('Blanco', 'M', 80, 12500); $updatedVariant['id'] = $variantId; + unset($updatedVariant['stock']); + $updatedVariant['stock_difference'] = -20; $updatedItem = $this->itemPayload('Camiseta oficial', 2, [ $updatedVariant, $this->variantPayload('Verde', 'L', 60, 15000), @@ -234,6 +236,8 @@ class MerchandiseControllerTest extends TestCase $secondItemVariantId = $created->json('data.1.variants.0.id'); $foreignVariant = $this->variantPayload('Azul Marino', 'XL', 20, 30000); $foreignVariant['id'] = $secondItemVariantId; + unset($foreignVariant['stock']); + $foreignVariant['stock_difference'] = 0; $firstItem = $this->itemPayload('Camiseta', 3, [$foreignVariant]); $firstItem['id'] = $firstItemId; -- 2.49.1 From c5aeb197358c00f24f3d5d4c1975cdb7430770c5 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 25 Sep 2026 15:31:43 -0300 Subject: [PATCH 10/23] refactor(inventory): enhance error reporting for negative stock validation --- ...000_generate_available_inventory_stock.php | 34 +++++++++++++++++-- .../InventoryStockMovementMigrationTest.php | 6 +++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php index fe0694f0..533a02bf 100644 --- a/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php +++ b/database/migrations/2026_09_25_000000_generate_available_inventory_stock.php @@ -52,8 +52,38 @@ return new class extends Migration private function assertNonNegative(string $expression, string $reason): void { - if (DB::table('inventories')->whereRaw("({$expression}) < 0")->exists()) { - throw new RuntimeException("Hay inventarios inconsistentes: {$reason}."); + $invalidInventories = DB::table('inventories') + ->select([ + 'id', + 'real_stock', + 'sold_units', + 'refunded_units', + 'reserved_stock', + 'entry_reserved_stock', + ]) + ->selectRaw("({$expression}) as calculated_stock") + ->whereRaw("({$expression}) < 0") + ->orderBy('id') + ->limit(20) + ->get(); + + if ($invalidInventories->isNotEmpty()) { + $details = $invalidInventories + ->map(static fn (object $inventory): string => sprintf( + 'id=%d [real=%d, vendidas=%d, reintegradas=%d, reservadas=%d, reservas_entradas=%d, resultado=%d]', + $inventory->id, + $inventory->real_stock, + $inventory->sold_units, + $inventory->refunded_units, + $inventory->reserved_stock, + $inventory->entry_reserved_stock, + $inventory->calculated_stock, + )) + ->implode('; '); + + throw new RuntimeException( + "Hay inventarios inconsistentes: {$reason}. Inventarios detectados (máximo 20): {$details}." + ); } } }; diff --git a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php index c70c29ee..8946f515 100644 --- a/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php +++ b/tests/Feature/Migrations/InventoryStockMovementMigrationTest.php @@ -113,12 +113,16 @@ class InventoryStockMovementMigrationTest extends TestCase public function test_migration_rejects_an_inventory_with_negative_available_stock(): void { DB::table('inventories')->insert([ + 'id' => 23, 'real_stock' => 1, 'reserved_stock' => 2, ]); $this->expectException(\RuntimeException::class); - $this->expectExceptionMessage('stock disponible actual es negativo'); + $this->expectExceptionMessage( + 'stock disponible actual es negativo. Inventarios detectados (máximo 20): ' + .'id=23 [real=1, vendidas=0, reintegradas=0, reservadas=2, reservas_entradas=0, resultado=-1]' + ); $this->stockMigration()->up(); } -- 2.49.1 From bb4495c6cc7abacd15d60cf66339c739d9ac7527 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 08:56:35 -0300 Subject: [PATCH 11/23] feat(users): add event_id to users table and update related resources --- .../Resources/AdministratorResource.php | 1 + app/Domains/Core/Auth/Models/User.php | 14 ++++- .../Core/Auth/Resources/UserResource.php | 1 + ..._01_000000_add_event_id_to_users_table.php | 28 +++++++++ .../Auth/UserAuthorizationRelationsTest.php | 3 + .../Migrations/AddEventIdToUsersTest.php | 57 +++++++++++++++++++ 6 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 database/migrations/2026_10_01_000000_add_event_id_to_users_table.php create mode 100644 tests/Feature/Migrations/AddEventIdToUsersTest.php diff --git a/app/Domains/Core/Administrator/Resources/AdministratorResource.php b/app/Domains/Core/Administrator/Resources/AdministratorResource.php index 6abf6340..03c9b72e 100644 --- a/app/Domains/Core/Administrator/Resources/AdministratorResource.php +++ b/app/Domains/Core/Administrator/Resources/AdministratorResource.php @@ -18,6 +18,7 @@ class AdministratorResource extends JsonResource 'dni' => $this->dni, 'email' => $this->email, 'rol_codigo' => $this->rol_codigo, + 'event_id' => $this->event_id, 'role' => $this->whenLoaded('role', fn () => [ 'codigo' => $this->role?->codigo, 'nombre' => $this->role?->nombre, diff --git a/app/Domains/Core/Auth/Models/User.php b/app/Domains/Core/Auth/Models/User.php index b01b2125..7282794a 100644 --- a/app/Domains/Core/Auth/Models/User.php +++ b/app/Domains/Core/Auth/Models/User.php @@ -2,11 +2,12 @@ namespace App\Domains\Core\Auth\Models; +use App\Domains\Commerce\Catalog\Models\Category; use App\Domains\Core\Authorization\Enums\RoleCode; use App\Domains\Core\Authorization\Models\Role; -use App\Domains\Commerce\Catalog\Models\Category; -use App\Domains\Ticketing\Event\Models\EventDateChangeView; use App\Domains\Core\Tenant\Models\Tenant; +use App\Domains\Ticketing\Event\Models\Event; +use App\Domains\Ticketing\Event\Models\EventDateChangeView; use App\Domains\Ticketing\Ticket\Models\ScanAttempt; use Database\Factories\UserFactory; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -20,7 +21,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Laravel\Sanctum\HasApiTokens; -#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])] +#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])] #[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])] class User extends Authenticatable { @@ -86,6 +87,12 @@ class User extends Authenticatable return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo'); } + /** @return BelongsTo */ + public function event(): BelongsTo + { + return $this->belongsTo(Event::class); + } + /** @return BelongsToMany */ public function scanCategories(): BelongsToMany { @@ -103,6 +110,7 @@ class User extends Authenticatable protected function casts(): array { return [ + 'event_id' => 'integer', 'email_verified_at' => 'datetime', 'password' => 'hashed', 'failed_login_attempts' => 'integer', diff --git a/app/Domains/Core/Auth/Resources/UserResource.php b/app/Domains/Core/Auth/Resources/UserResource.php index 8a8ddbac..cc8b4a99 100644 --- a/app/Domains/Core/Auth/Resources/UserResource.php +++ b/app/Domains/Core/Auth/Resources/UserResource.php @@ -24,6 +24,7 @@ class UserResource extends JsonResource 'telefono' => $this->telefono, 'rol_codigo' => $this->rol_codigo, 'tenant_codigo' => $this->tenant_codigo, + 'event_id' => $this->event_id, 'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories ->map(fn ($category) => [ 'id' => $category->id, diff --git a/database/migrations/2026_10_01_000000_add_event_id_to_users_table.php b/database/migrations/2026_10_01_000000_add_event_id_to_users_table.php new file mode 100644 index 00000000..f351604f --- /dev/null +++ b/database/migrations/2026_10_01_000000_add_event_id_to_users_table.php @@ -0,0 +1,28 @@ +foreignId('event_id') + ->nullable() + ->after('tenant_codigo') + ->constrained('events') + ->cascadeOnUpdate() + ->restrictOnDelete(); + }); + } + + public function down(): void + { + Schema::table('users', function (Blueprint $table): void { + $table->dropForeign(['event_id']); + $table->dropColumn('event_id'); + }); + } +}; diff --git a/tests/Feature/Auth/UserAuthorizationRelationsTest.php b/tests/Feature/Auth/UserAuthorizationRelationsTest.php index d0719b65..e8ae4373 100644 --- a/tests/Feature/Auth/UserAuthorizationRelationsTest.php +++ b/tests/Feature/Auth/UserAuthorizationRelationsTest.php @@ -17,6 +17,7 @@ class UserAuthorizationRelationsTest extends TestCase $this->assertTrue(Schema::hasColumns('users', [ 'rol_codigo', 'tenant_codigo', + 'event_id', ])); } @@ -28,5 +29,7 @@ class UserAuthorizationRelationsTest extends TestCase $this->assertNull($user->tenant_codigo); $this->assertSame(RoleCode::User->value, $user->role->codigo); $this->assertNull($user->tenant); + $this->assertNull($user->event_id); + $this->assertNull($user->event); } } diff --git a/tests/Feature/Migrations/AddEventIdToUsersTest.php b/tests/Feature/Migrations/AddEventIdToUsersTest.php new file mode 100644 index 00000000..88de36cf --- /dev/null +++ b/tests/Feature/Migrations/AddEventIdToUsersTest.php @@ -0,0 +1,57 @@ +id(); + }); + Schema::create('users', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_codigo')->nullable(); + $table->softDeletes(); + $table->timestamps(); + }); + DB::table('users')->insert(['id' => 1, 'tenant_codigo' => 'legacy']); + DB::table('events')->insert(['id' => 42]); + + $migration = require database_path('migrations/2026_10_01_000000_add_event_id_to_users_table.php'); + $migration->up(); + + $legacy = User::query()->findOrFail(1); + $this->assertNull($legacy->event_id); + $this->assertNull($legacy->event); + $this->assertSame('legacy', $legacy->tenant_codigo); + + $legacy->update(['event_id' => '42']); + $user = $legacy->fresh(); + $this->assertSame(42, $user->event_id); + $this->assertSame(42, $user->event->id); + $this->assertSame(42, UserResource::make($user)->resolve(new Request)['event_id']); + $this->assertSame(42, AdministratorResource::make($user)->resolve(new Request)['event_id']); + + try { + DB::table('events')->where('id', 42)->delete(); + $this->fail('An assigned event must not be deleted.'); + } catch (QueryException $exception) { + $this->assertStringContainsString('FOREIGN KEY', $exception->getMessage()); + } + + $migration->down(); + $this->assertFalse(Schema::hasColumn('users', 'event_id')); + $this->assertSame('legacy', DB::table('users')->where('id', 1)->value('tenant_codigo')); + } +} -- 2.49.1 From 31955f862d645d7d62d7b0f168f7d3d4ddbcebac Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:20:43 -0300 Subject: [PATCH 12/23] feat(sale): implement event scope for sales, totals, and modifications; add tests for event-based access --- .../Services/PurchaseRefundSummaryService.php | 6 +- .../Controllers/AdminApp/SaleController.php | 23 +-- .../Sale/Services/AdminAppSaleService.php | 69 ++++--- .../Commerce/Sale/documentacion/README.md | 4 + .../Sale/AdminAppSaleEventScopeTest.php | 183 ++++++++++++++++++ 5 files changed, 243 insertions(+), 42 deletions(-) create mode 100644 tests/Feature/Sale/AdminAppSaleEventScopeTest.php diff --git a/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php b/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php index 9c113035..dffbb7aa 100644 --- a/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php +++ b/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php @@ -8,12 +8,14 @@ use Illuminate\Database\Eloquent\Builder; class PurchaseRefundSummaryService { - public function totalForTenant(Tenant $tenant): string + public function totalForTenant(Tenant $tenant, ?int $eventId = null): string { $total = TicketRefund::query() ->whereHas( 'purchaseItem.purchase', - fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo) + fn (Builder $query): Builder => $query + ->where('tenant_codigo', $tenant->codigo) + ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId)) ) ->sum('amount'); diff --git a/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php b/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php index bb94f0dc..e9cdc514 100644 --- a/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php +++ b/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php @@ -32,10 +32,10 @@ class SaleController extends Controller $tenant = $request->user()->tenant()->firstOrFail(); return SaleResource::collection( - $this->saleService->sales($tenant, $request->validated()) + $this->saleService->sales($tenant, $request->validated(), $request->user()->event_id) )->additional([ - 'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant), - 'refunded_total' => $this->saleService->refundedTotal($tenant), + 'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id), + 'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id), ]); } @@ -43,7 +43,7 @@ class SaleController extends Controller { $tenant = $request->user()->tenant()->firstOrFail(); - return new SaleDetailResource($this->saleService->detail($tenant, $sale)); + return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id)); } public function tickets(Request $request, int $sale): AnonymousResourceCollection @@ -51,7 +51,7 @@ class SaleController extends Controller $tenant = $request->user()->tenant()->firstOrFail(); return SaleTicketResource::collection( - $this->saleService->tickets($tenant, $sale) + $this->saleService->tickets($tenant, $sale, $request->user()->event_id) ); } @@ -59,14 +59,14 @@ class SaleController extends Controller { $tenant = $request->user()->tenant()->firstOrFail(); - return new SaleResource($this->saleService->confirm($tenant, $sale)); + return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id)); } public function cancel(Request $request, int $sale): SaleResource { $tenant = $request->user()->tenant()->firstOrFail(); - return new SaleResource($this->saleService->cancel($tenant, $sale)); + return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id)); } public function modifications( @@ -76,6 +76,7 @@ class SaleController extends Controller $this->saleService->modifications( $request->user()->tenant()->firstOrFail(), $request->validated(), + $request->user()->event_id, ) ); } @@ -86,7 +87,7 @@ class SaleController extends Controller return $this->salePdfService->downloadSales( $tenant, - $this->saleService->salesForExport($tenant, $request->validated()), + $this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } @@ -97,7 +98,7 @@ class SaleController extends Controller return $this->salePdfService->downloadModifications( $tenant, - $this->saleService->modificationsForExport($tenant, $request->validated()), + $this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } @@ -108,7 +109,7 @@ class SaleController extends Controller return $this->saleExcelService->downloadSales( $tenant, - $this->saleService->salesForExport($tenant, $request->validated()), + $this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } @@ -120,7 +121,7 @@ class SaleController extends Controller return $this->saleExcelService->downloadModifications( $tenant, - $this->saleService->modificationsForExport($tenant, $request->validated()), + $this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } diff --git a/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php b/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php index 79a663e5..8265e7c5 100644 --- a/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php +++ b/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php @@ -2,7 +2,6 @@ namespace App\Domains\Commerce\Sale\Services; -use App\Shared\Logging\Models\ValueChange; use App\Domains\Commerce\Purchase\Models\Purchase; use App\Domains\Commerce\Purchase\Services\CheckoutService; use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService; @@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver; use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver; +use App\Shared\Logging\Models\ValueChange; use Illuminate\Database\Eloquent\Builder; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -21,19 +21,18 @@ class AdminAppSaleService protected PurchaseRefundSummaryService $refundSummaryService, ) {} - public function confirmedSalesTotal(Tenant $tenant): string + public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string { - $total = Purchase::query() - ->where('tenant_codigo', $tenant->codigo) + $total = $this->purchasesQuery($tenant, $eventId) ->where('status', Purchase::STATUS_PAID) ->sum('total'); return number_format((float) $total, 2, '.', ''); } - public function refundedTotal(Tenant $tenant): string + public function refundedTotal(Tenant $tenant, ?int $eventId = null): string { - return $this->refundSummaryService->totalForTenant($tenant); + return $this->refundSummaryService->totalForTenant($tenant, $eventId); } /** @@ -47,43 +46,42 @@ class AdminAppSaleService * } $filters * @return LengthAwarePaginator */ - public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator + public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator { - return $this->salesQuery($tenant, $filters) + return $this->salesQuery($tenant, $filters, $eventId) ->paginateFromRequest() ->withQueryString(); } - public function detail(Tenant $tenant, int $saleId): Purchase + public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase { - return Purchase::query() - ->where('tenant_codigo', $tenant->codigo) + return $this->purchasesQuery($tenant, $eventId) ->with('items') ->findOrFail($saleId); } /** @return Collection */ - public function tickets(Tenant $tenant, int $saleId): Collection + public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection { - return $this->findForTenant($tenant, $saleId) + return $this->findForTenant($tenant, $saleId, $eventId) ->tickets() ->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund']) ->orderBy('id') ->get(); } - public function confirm(Tenant $tenant, int $saleId): Purchase + public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase { - $sale = $this->findForTenant($tenant, $saleId); + $sale = $this->findForTenant($tenant, $saleId, $eventId); return $this->saleForResponse( $this->checkoutService->confirmPaidPurchase($sale) ); } - public function cancel(Tenant $tenant, int $saleId): Purchase + public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase { - $sale = $this->findForTenant($tenant, $saleId); + $sale = $this->findForTenant($tenant, $saleId, $eventId); return $this->saleForResponse( $this->checkoutService->cancelPurchaseFromAdmin($sale) @@ -94,18 +92,18 @@ class AdminAppSaleService * @param array $filters * @return Collection */ - public function salesForExport(Tenant $tenant, array $filters = []): Collection + public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection { - return $this->salesQuery($tenant, $filters)->get(); + return $this->salesQuery($tenant, $filters, $eventId)->get(); } /** * @param array $filters * @return LengthAwarePaginator */ - public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator + public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator { - return $this->modificationsQuery($tenant, $filters) + return $this->modificationsQuery($tenant, $filters, $eventId) ->paginateFromRequest() ->withQueryString(); } @@ -114,13 +112,13 @@ class AdminAppSaleService * @param array $filters * @return Collection */ - public function modificationsForExport(Tenant $tenant, array $filters = []): Collection + public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection { - return $this->modificationsQuery($tenant, $filters)->get(); + return $this->modificationsQuery($tenant, $filters, $eventId)->get(); } /** @param array $filters */ - protected function salesQuery(Tenant $tenant, array $filters): Builder + protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder { $sortColumns = [ 'id' => 'id', @@ -137,8 +135,7 @@ class AdminAppSaleService ? $requestedDirection : 'desc'; - return Purchase::query() - ->where('tenant_codigo', $tenant->codigo) + return $this->purchasesQuery($tenant, $eventId) ->when($filters['q'] ?? null, function (Builder $query, string $search): void { $term = trim($search); @@ -176,11 +173,18 @@ class AdminAppSaleService * @param array $filters * @return Builder */ - protected function modificationsQuery(Tenant $tenant, array $filters): Builder + protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder { return ValueChange::query() ->where('tenant_code', $tenant->codigo) ->where('trackable_type', (new Purchase)->getMorphClass()) + ->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph( + 'trackable', + [Purchase::class], + fn (Builder $sales): Builder => $sales + ->where('tenant_codigo', $tenant->codigo) + ->where('event_id', $eventId), + )) ->when($filters['q'] ?? null, function (Builder $query, string $search): void { $term = trim($search); @@ -221,11 +225,18 @@ class AdminAppSaleService ->orderByDesc('id'); } - protected function findForTenant(Tenant $tenant, int $saleId): Purchase + protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase + { + return $this->purchasesQuery($tenant, $eventId) + ->findOrFail($saleId); + } + + /** @return Builder */ + protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder { return Purchase::query() ->where('tenant_codigo', $tenant->codigo) - ->findOrFail($saleId); + ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId)); } protected function saleForResponse(Purchase $sale): Purchase diff --git a/app/Domains/Commerce/Sale/documentacion/README.md b/app/Domains/Commerce/Sale/documentacion/README.md index 2c1b5fe8..9c41bff3 100644 --- a/app/Domains/Commerce/Sale/documentacion/README.md +++ b/app/Domains/Commerce/Sale/documentacion/README.md @@ -29,4 +29,8 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel. +Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant. + +El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`. + El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta. diff --git a/tests/Feature/Sale/AdminAppSaleEventScopeTest.php b/tests/Feature/Sale/AdminAppSaleEventScopeTest.php new file mode 100644 index 00000000..2dfe7f9b --- /dev/null +++ b/tests/Feature/Sale/AdminAppSaleEventScopeTest.php @@ -0,0 +1,183 @@ +id(); + $table->string('codigo'); + }); + Schema::create('users', function (Blueprint $table): void { + $table->id(); + $table->softDeletes(); + }); + Schema::create('compras', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_codigo'); + $table->unsignedBigInteger('event_id')->nullable(); + $table->string('nombre_apellido'); + $table->string('status'); + $table->decimal('total', 12, 2); + $table->timestamps(); + }); + Schema::create('compra_items', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('compra_id'); + $table->integer('cantidad'); + }); + Schema::create('tickets', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('source_purchase_item_id'); + }); + Schema::create('ticket_refunds', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('purchase_item_id'); + $table->decimal('amount', 12, 2); + }); + Schema::create('value_changes', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->string('trackable_type'); + $table->unsignedBigInteger('trackable_id'); + $table->string('attribute'); + $table->string('old_value'); + $table->string('new_value'); + $table->timestamp('changed_at'); + $table->string('actor_type'); + $table->unsignedBigInteger('user_id')->nullable(); + }); + + DB::table('tenants')->insert(['codigo' => 'onticket']); + foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) { + DB::table('compras')->insert([ + 'id' => $id, + 'tenant_codigo' => $tenant, + 'event_id' => $event, + 'nombre_apellido' => 'Cliente', + 'status' => Purchase::STATUS_PAID, + 'total' => $id * 100, + 'created_at' => now(), + 'updated_at' => now(), + ]); + DB::table('compra_items')->insert(['id' => $id, 'compra_id' => $id, 'cantidad' => 1]); + DB::table('ticket_refunds')->insert(['purchase_item_id' => $id, 'amount' => $id * 10]); + DB::table('value_changes')->insert([ + 'id' => $id, + 'tenant_code' => $tenant, + 'trackable_type' => (new Purchase)->getMorphClass(), + 'trackable_id' => $id, + 'attribute' => 'status', + 'old_value' => Purchase::STATUS_PENDING_PAYMENT, + 'new_value' => Purchase::STATUS_PAID, + 'changed_at' => now(), + 'actor_type' => 'system', + ]); + } + $this->actingAsAdministrator(10); + } + + public function test_list_totals_and_filters_cannot_escape_the_authenticated_event(): void + { + $this->getJson('/api/v1/adminapp/tenant/sales?event_id=20&q=Cliente') + ->assertOk() + ->assertJsonCount(1, 'data') + ->assertJsonPath('data.0.id', 1) + ->assertJsonPath('confirmed_sales_total', '100.00') + ->assertJsonPath('refunded_total', '10.00'); + $this->getJson('/api/v1/adminapp/tenant/sales?id=2')->assertOk()->assertJsonCount(0, 'data'); + $this->getJson('/api/v1/adminapp/tenant/sales/modifications?q=Cliente') + ->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.sale_id', 1); + } + + public function test_unscoped_administrators_keep_access_to_all_sales_in_their_tenant(): void + { + $this->actingAsAdministrator(null); + $this->getJson('/api/v1/adminapp/tenant/sales')->assertOk()->assertJsonCount(3, 'data') + ->assertJsonPath('confirmed_sales_total', '600.00')->assertJsonPath('refunded_total', '60.00'); + $this->getJson('/api/v1/adminapp/tenant/sales/modifications')->assertOk()->assertJsonCount(3, 'data'); + $this->getJson('/api/v1/adminapp/tenant/sales/2')->assertOk(); + $this->getJson('/api/v1/adminapp/tenant/sales/3')->assertOk(); + } + + public function test_foreign_and_unassigned_sales_are_inaccessible_before_any_checkout_action(): void + { + $this->mock(CheckoutService::class, function (MockInterface $mock): void { + $mock->shouldNotReceive('confirmPaidPurchase'); + $mock->shouldNotReceive('cancelPurchaseFromAdmin'); + }); + foreach ([2, 3, 4] as $id) { + $this->getJson("/api/v1/adminapp/tenant/sales/{$id}")->assertNotFound(); + $this->getJson("/api/v1/adminapp/tenant/sales/{$id}/tickets")->assertNotFound(); + $this->postJson("/api/v1/adminapp/tenant/sales/{$id}/confirm", ['event_id' => 20])->assertNotFound(); + $this->postJson("/api/v1/adminapp/tenant/sales/{$id}/cancel", ['event_id' => 20])->assertNotFound(); + } + $this->assertSame(Purchase::STATUS_PAID, DB::table('compras')->where('id', 2)->value('status')); + } + + public function test_own_event_allows_detail_tickets_and_checkout_actions(): void + { + // Empty snapshots keep this fixture focused on authorization. + DB::table('compra_items')->where('compra_id', 1)->delete(); + $this->mock(CheckoutService::class, function (MockInterface $mock): void { + foreach (['confirmPaidPurchase', 'cancelPurchaseFromAdmin'] as $method) { + $mock->shouldReceive($method)->once()->withArgs(fn (Purchase $sale): bool => $sale->id === 1) + ->andReturnUsing(fn (Purchase $sale): Purchase => $sale); + } + }); + $this->getJson('/api/v1/adminapp/tenant/sales/1')->assertOk()->assertJsonPath('data.id', 1); + $this->getJson('/api/v1/adminapp/tenant/sales/1/tickets')->assertOk(); + $this->postJson('/api/v1/adminapp/tenant/sales/1/confirm')->assertOk()->assertJsonPath('data.id', 1); + $this->postJson('/api/v1/adminapp/tenant/sales/1/cancel')->assertOk()->assertJsonPath('data.id', 1); + } + + public function test_pdf_and_excel_exports_only_receive_sales_and_history_for_the_own_event(): void + { + foreach ([AdminAppSalePdfService::class, AdminAppSaleExcelService::class] as $class) { + $this->mock($class, function (MockInterface $mock) use ($class): void { + foreach (['downloadSales', 'downloadModifications'] as $method) { + $mock->shouldReceive($method)->once()->withArgs( + fn ($tenant, Collection $rows, $timezone): bool => $tenant->codigo === 'onticket' + && $rows->pluck('id')->all() === [1] && $timezone === 'UTC' + )->andReturn($class === AdminAppSalePdfService::class + ? response('pdf') : new StreamedResponse(fn () => print ('excel'))); + } + }); + } + foreach (['pdf', 'excel', 'modifications/pdf', 'modifications/excel'] as $path) { + $this->getJson("/api/v1/adminapp/tenant/sales/{$path}?timezone=UTC&event_id=20")->assertOk(); + } + } + + private function actingAsAdministrator(?int $eventId): void + { + $user = new User; + $user->setRawAttributes([ + 'id' => 1, + 'rol_codigo' => RoleCode::AdminApp->value, + 'tenant_codigo' => 'onticket', + 'event_id' => $eventId, + ]); + Sanctum::actingAs($user); + } +} -- 2.49.1 From c7afb701966b370e8fcfd9cb8865e165cf1161f2 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:25:25 -0300 Subject: [PATCH 13/23] feat(staff): implement event scope for staff management; update controllers, services, and resources to handle event_id; add tests for event-based access --- .../AdminAppAdministratorController.php | 3 + .../Services/AdministratorService.php | 24 +-- .../Administrator/documentacion/README.md | 2 + .../Controllers/AdminAppStaffController.php | 6 +- .../Core/Staff/Resources/StaffResource.php | 1 + .../Core/Staff/Services/StaffService.php | 28 ++-- .../Core/Staff/documentacion/README.md | 2 + tests/Feature/Staff/StaffEventScopeTest.php | 158 ++++++++++++++++++ 8 files changed, 199 insertions(+), 25 deletions(-) create mode 100644 tests/Feature/Staff/StaffEventScopeTest.php diff --git a/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php b/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php index 4c3b6e80..b98e866e 100644 --- a/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php +++ b/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php @@ -20,6 +20,7 @@ class AdminAppAdministratorController extends Controller return AdministratorResource::collection($this->administratorService->list( $request->user()->tenant()->firstOrFail(), $request->string('search')->trim()->toString() ?: null, + $request->user()->event_id, )); } @@ -28,6 +29,7 @@ class AdminAppAdministratorController extends Controller return AdministratorResource::make($this->administratorService->create( $request->user()->tenant()->firstOrFail(), $request->validated(), + $request->user()->event_id, )); } @@ -37,6 +39,7 @@ class AdminAppAdministratorController extends Controller $request->user()->tenant()->firstOrFail(), $administrator, $request->validated(), + $request->user()->event_id, )); } diff --git a/app/Domains/Core/Administrator/Services/AdministratorService.php b/app/Domains/Core/Administrator/Services/AdministratorService.php index e0a786bf..043a2674 100644 --- a/app/Domains/Core/Administrator/Services/AdministratorService.php +++ b/app/Domains/Core/Administrator/Services/AdministratorService.php @@ -19,9 +19,9 @@ class AdministratorService public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {} /** @return Collection */ - public function list(Tenant $tenant, ?string $search = null): Collection + public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection { - return $this->query($tenant)->with('role') + return $this->query($tenant, $eventId)->with('role') ->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void { $query->where('nombre_apellido', 'like', "%{$search}%") ->orWhere('dni', 'like', "%{$search}%") @@ -31,14 +31,15 @@ class AdministratorService } /** @param array $data */ - public function create(Tenant $tenant, array $data): User + public function create(Tenant $tenant, array $data, ?int $eventId = null): User { - return DB::transaction(function () use ($tenant, $data): User { + return DB::transaction(function () use ($tenant, $data, $eventId): User { $administrator = User::query()->create([ ...$this->attributes($data), 'password' => Str::random(64), 'rol_codigo' => RoleCode::AdminApp->value, 'tenant_codigo' => $tenant->codigo, + 'event_id' => $eventId, ]); $this->resetPasswordAttemptService->createForAdminAppEmail( $administrator->email, @@ -50,10 +51,10 @@ class AdministratorService } /** @param array $data */ - public function update(Tenant $tenant, int $administratorId, array $data): User + public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User { - return DB::transaction(function () use ($tenant, $administratorId, $data): User { - $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId); + return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User { + $administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId); $administrator->update($this->attributes($data)); return $administrator->load('role'); @@ -66,11 +67,11 @@ class AdministratorService // Serialize deletions for this tenant, including requests already authenticated // when another administrator removes their account. Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail(); - $administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId); + $administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId); if ($administrator->is($actor)) { throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']); } - $activeAdministrators = $this->query($tenant)->lockForUpdate()->get(); + $activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get(); if ($activeAdministrators->count() <= 1) { throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']); } @@ -80,10 +81,11 @@ class AdministratorService }); } - private function query(Tenant $tenant): Builder + private function query(Tenant $tenant, ?int $eventId = null): Builder { return User::query()->where('tenant_codigo', $tenant->codigo) - ->where('rol_codigo', RoleCode::AdminApp->value); + ->where('rol_codigo', RoleCode::AdminApp->value) + ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId)); } /** @param array $data diff --git a/app/Domains/Core/Administrator/documentacion/README.md b/app/Domains/Core/Administrator/documentacion/README.md index ba506358..8c3ec561 100644 --- a/app/Domains/Core/Administrator/documentacion/README.md +++ b/app/Domains/Core/Administrator/documentacion/README.md @@ -55,6 +55,8 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten ## Verificación +Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant. + `php artisan test tests/Feature/Administrator/AdministratorControllerTest.php` Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de diff --git a/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php b/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php index 1f1d69cb..d4ef1a45 100644 --- a/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php +++ b/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php @@ -26,6 +26,7 @@ class AdminAppStaffController extends Controller return StaffResource::collection($this->staffService->list( $request->user()->tenant()->firstOrFail(), $request->string('search')->trim()->toString() ?: null, + $request->user()->event_id, )); } @@ -34,6 +35,7 @@ class AdminAppStaffController extends Controller return StaffResource::make($this->staffService->create( $request->user()->tenant()->firstOrFail(), $request->validated(), + $request->user()->event_id, )); } @@ -43,12 +45,13 @@ class AdminAppStaffController extends Controller $request->user()->tenant()->firstOrFail(), $staff, $request->validated(), + $request->user()->event_id, )); } public function destroy(Request $request, int $staff): Response { - $this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff); + $this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id); return response()->noContent(); } @@ -60,6 +63,7 @@ class AdminAppStaffController extends Controller $scanner = $this->staffService->find( $request->user()->tenant()->firstOrFail(), $staff, + $request->user()->event_id, ); return ScanAttemptResource::collection( diff --git a/app/Domains/Core/Staff/Resources/StaffResource.php b/app/Domains/Core/Staff/Resources/StaffResource.php index 5892a514..0e758799 100644 --- a/app/Domains/Core/Staff/Resources/StaffResource.php +++ b/app/Domains/Core/Staff/Resources/StaffResource.php @@ -18,6 +18,7 @@ class StaffResource extends JsonResource 'dni' => $this->dni, 'email' => $this->email, 'rol_codigo' => $this->rol_codigo, + 'event_id' => $this->event_id, 'role' => $this->whenLoaded('role', fn () => [ 'codigo' => $this->role?->codigo, 'nombre' => $this->role?->nombre, diff --git a/app/Domains/Core/Staff/Services/StaffService.php b/app/Domains/Core/Staff/Services/StaffService.php index 89ca950b..7a7d624b 100644 --- a/app/Domains/Core/Staff/Services/StaffService.php +++ b/app/Domains/Core/Staff/Services/StaffService.php @@ -2,11 +2,11 @@ namespace App\Domains\Core\Staff\Services; +use App\Domains\Commerce\Catalog\Models\Category; use App\Domains\Core\Auth\Models\ResetPasswordAttempt; use App\Domains\Core\Auth\Models\User; use App\Domains\Core\Auth\Services\ResetPasswordAttemptService; use App\Domains\Core\Authorization\Enums\RoleCode; -use App\Domains\Commerce\Catalog\Models\Category; use App\Domains\Core\Tenant\Models\Tenant; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; @@ -22,9 +22,9 @@ class StaffService ) {} /** @return Collection */ - public function list(Tenant $tenant, ?string $search = null): Collection + public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection { - return $this->staffQuery($tenant) + return $this->staffQuery($tenant, $eventId) ->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')]) ->when($search, function (Builder $query, string $search): void { $query->where(function (Builder $query) use ($search): void { @@ -52,18 +52,19 @@ class StaffService } /** @param array $data */ - public function create(Tenant $tenant, array $data): User + public function create(Tenant $tenant, array $data, ?int $eventId = null): User { $categoryIds = $this->categoryIdsFor($tenant, $data); $this->assertCategoriesBelongToTenant($tenant, $categoryIds); - return DB::transaction(function () use ($tenant, $data, $categoryIds): User { + return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User { $staff = User::query()->create([ ...Arr::only($data, ['nombre_apellido', 'dni', 'email']), 'email' => mb_strtolower(trim((string) $data['email'])), 'password' => Str::random(64), 'rol_codigo' => RoleCode::Scanner->value, 'tenant_codigo' => $tenant->codigo, + 'event_id' => $eventId, ]); $staff->scanCategories()->sync($categoryIds); $this->resetPasswordAttemptService->createForScannerEmail( @@ -76,9 +77,9 @@ class StaffService } /** @param array $data */ - public function update(Tenant $tenant, int $staffId, array $data): User + public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User { - $staff = $this->find($tenant, $staffId); + $staff = $this->find($tenant, $staffId, $eventId); $categoryIds = $this->categoryIdsFor($tenant, $data); $this->assertCategoriesBelongToTenant($tenant, $categoryIds); @@ -92,9 +93,9 @@ class StaffService }); } - public function delete(Tenant $tenant, int $staffId): void + public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void { - $staff = $this->find($tenant, $staffId); + $staff = $this->find($tenant, $staffId, $eventId); DB::transaction(function () use ($staff): void { $staff->tokens()->delete(); @@ -102,16 +103,17 @@ class StaffService }); } - public function find(Tenant $tenant, int $staffId): User + public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User { - return $this->staffQuery($tenant)->findOrFail($staffId); + return $this->staffQuery($tenant, $eventId)->findOrFail($staffId); } - private function staffQuery(Tenant $tenant): Builder + private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder { return User::query() ->where('tenant_codigo', $tenant->codigo) - ->where('rol_codigo', RoleCode::Scanner->value); + ->where('rol_codigo', RoleCode::Scanner->value) + ->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId)); } /** diff --git a/app/Domains/Core/Staff/documentacion/README.md b/app/Domains/Core/Staff/documentacion/README.md index f72d4a63..49539c01 100644 --- a/app/Domains/Core/Staff/documentacion/README.md +++ b/app/Domains/Core/Staff/documentacion/README.md @@ -18,3 +18,5 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido ## Dependencias y reglas Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado. + +Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant. diff --git a/tests/Feature/Staff/StaffEventScopeTest.php b/tests/Feature/Staff/StaffEventScopeTest.php new file mode 100644 index 00000000..2359144c --- /dev/null +++ b/tests/Feature/Staff/StaffEventScopeTest.php @@ -0,0 +1,158 @@ +id(); + $table->string('codigo'); + $table->boolean('scanner_category_validation_enabled')->default(false); + }); + Schema::create('roles', function (Blueprint $table): void { + $table->id(); + $table->string('codigo'); + $table->string('nombre'); + }); + Schema::create('users', function (Blueprint $table): void { + $table->id(); + $table->string('rol_codigo'); + $table->string('tenant_codigo'); + $table->unsignedBigInteger('event_id')->nullable(); + $table->string('nombre_apellido'); + $table->string('dni'); + $table->string('email'); + $table->string('active_email')->nullable(); + $table->string('password')->nullable(); + $table->timestamps(); + $table->softDeletes(); + }); + Schema::create('categorias', function (Blueprint $table): void { + $table->id(); + $table->string('nombre'); + $table->string('tenant_code')->nullable(); + $table->unsignedBigInteger('categoria_id')->nullable(); + }); + Schema::create('catalog_items', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('category_id'); + $table->string('tenant_code'); + $table->softDeletes(); + }); + Schema::create('category_scanners', function (Blueprint $table): void { + $table->unsignedBigInteger('user_id'); + $table->unsignedBigInteger('categoria_id'); + $table->timestamps(); + }); + Schema::create('personal_access_tokens', function (Blueprint $table): void { + $table->id(); + $table->string('tokenable_type'); + $table->unsignedBigInteger('tokenable_id'); + }); + + DB::table('tenants')->insert(['codigo' => 'onticket']); + foreach (['adminapp', 'scanner'] as $role) { + DB::table('roles')->insert(['codigo' => $role, 'nombre' => $role]); + foreach ([10, 20, null] as $eventId) { + $this->insertUser($role, 'onticket', $eventId); + } + $this->insertUser($role, 'other', 10); + } + Sanctum::actingAs(User::query()->findOrFail(1)); + } + + public function test_lists_and_searches_are_restricted_to_the_authenticated_event(): void + { + foreach (['administrators' => 1, 'staff' => 5] as $path => $id) { + foreach (['', '?search=Persona&event_id=20'] as $query) { + $this->getJson("/api/v1/adminapp/tenant/{$path}{$query}") + ->assertOk()->assertJsonCount(1, 'data') + ->assertJsonPath('data.0.id', $id)->assertJsonPath('data.0.event_id', 10); + } + } + } + + public function test_creation_inherits_the_actor_event_even_if_the_client_supplies_another(): void + { + $this->mock(ResetPasswordAttemptService::class, function (MockInterface $mock): void { + $mock->shouldReceive('createForAdminAppEmail')->once(); + $mock->shouldReceive('createForScannerEmail')->once(); + }); + foreach (['administrators' => 'adminapp', 'staff' => 'scanner'] as $path => $role) { + $this->postJson("/api/v1/adminapp/tenant/{$path}", [ + ...$this->payload("new-{$role}@example.com"), 'event_id' => 20, + ])->assertSuccessful()->assertJsonPath('data.event_id', 10); + $this->assertDatabaseHas('users', ['email' => "new-{$role}@example.com", 'event_id' => 10, 'rol_codigo' => $role]); + } + } + + public function test_foreign_and_unassigned_staff_cannot_be_edited_deleted_or_inspected(): void + { + foreach (['administrators' => [2, 3, 4], 'staff' => [6, 7, 8]] as $path => $ids) { + foreach ($ids as $id) { + $this->putJson("/api/v1/adminapp/tenant/{$path}/{$id}", $this->payload("update-{$id}@example.com"))->assertNotFound(); + $this->deleteJson("/api/v1/adminapp/tenant/{$path}/{$id}")->assertNotFound(); + $this->assertDatabaseHas('users', ['id' => $id, 'deleted_at' => null, 'email' => "person-{$id}@example.com"]); + if ($path === 'staff') { + $this->getJson("/api/v1/adminapp/tenant/staff/{$id}/scan-attempts")->assertNotFound(); + } + } + } + } + + public function test_own_staff_can_be_edited_and_deleted_without_changing_its_event(): void + { + $adminId = $this->insertUser('adminapp', 'onticket', 10); + foreach (['administrators' => $adminId, 'staff' => 5] as $path => $id) { + $this->putJson("/api/v1/adminapp/tenant/{$path}/{$id}", [ + ...$this->payload("updated-{$id}@example.com"), 'event_id' => 20, + ])->assertOk()->assertJsonPath('data.event_id', 10); + $this->deleteJson("/api/v1/adminapp/tenant/{$path}/{$id}")->assertNoContent(); + $this->assertSoftDeleted('users', ['id' => $id]); + } + } + + public function test_unscoped_actor_keeps_tenant_lists_and_creates_without_an_event(): void + { + Sanctum::actingAs(User::query()->findOrFail(3)); + $this->mock(ResetPasswordAttemptService::class, function (MockInterface $mock): void { + $mock->shouldReceive('createForAdminAppEmail')->once(); + $mock->shouldReceive('createForScannerEmail')->once(); + }); + foreach (['administrators', 'staff'] as $path) { + $this->getJson("/api/v1/adminapp/tenant/{$path}")->assertOk()->assertJsonCount(3, 'data'); + $this->postJson("/api/v1/adminapp/tenant/{$path}", $this->payload("legacy-{$path}@example.com")) + ->assertSuccessful()->assertJsonPath('data.event_id', null); + } + } + + private function insertUser(string $role, string $tenant, ?int $eventId): int + { + $id = DB::table('users')->count() + 1; + + return DB::table('users')->insertGetId([ + 'id' => $id, 'rol_codigo' => $role, 'tenant_codigo' => $tenant, + 'event_id' => $eventId, 'nombre_apellido' => 'Persona', 'dni' => '12345678', + 'email' => "person-{$id}@example.com", 'active_email' => "person-{$id}@example.com", + ]); + } + + private function payload(string $email): array + { + return ['nombre_apellido' => 'Persona editada', 'dni' => '87654321', 'email' => $email]; + } +} -- 2.49.1 From c975b5d51d7a9a1525220d15ae916a61a6edb938 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:41:26 -0300 Subject: [PATCH 14/23] feat(menu): update ticket routes to use new menu code; add tests for menu access and route validation --- .../Ticketing/Ticket/routes/adminapp.php | 12 +-- app/Shared/Forms/routes/adminapp.php | 2 +- tests/Feature/Menu/TicketMenuAccessTest.php | 76 +++++++++++++++++++ 3 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 tests/Feature/Menu/TicketMenuAccessTest.php diff --git a/app/Domains/Ticketing/Ticket/routes/adminapp.php b/app/Domains/Ticketing/Ticket/routes/adminapp.php index b785612a..17e0329a 100644 --- a/app/Domains/Ticketing/Ticket/routes/adminapp.php +++ b/app/Domains/Ticketing/Ticket/routes/adminapp.php @@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant') ->middleware(['auth:sanctum', 'adminapp.tenant']) ->group(function (): void { Route::get('tickets', [TicketController::class, 'index']) - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.index'); Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel']) ->whereNumber('ticket') - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.cancel'); Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund']) ->whereNumber('ticket') - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.calculate-refund'); Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund']) ->whereNumber('ticket') - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.refund'); Route::get('tickets/pdf', [TicketController::class, 'downloadPdf']) - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.pdf'); Route::get('tickets/excel', [TicketController::class, 'downloadExcel']) - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.tickets.excel'); }); diff --git a/app/Shared/Forms/routes/adminapp.php b/app/Shared/Forms/routes/adminapp.php index 6517d639..e77dcc63 100644 --- a/app/Shared/Forms/routes/adminapp.php +++ b/app/Shared/Forms/routes/adminapp.php @@ -23,7 +23,7 @@ Route::prefix('v1/adminapp/forms') Route::get('sale', SaleFormController::class); Route::get('staff', StaffFormController::class); Route::get('tickets-filter', TicketFilterFormController::class) - ->middleware('tenant.menu:adminapp.tickets') + ->middleware('tenant.menu:onticket.adminapp.tickets') ->name('adminapp.forms.tickets-filter'); Route::get( 'fiesta-futbol-infantil/ticket', diff --git a/tests/Feature/Menu/TicketMenuAccessTest.php b/tests/Feature/Menu/TicketMenuAccessTest.php new file mode 100644 index 00000000..a9dae0a2 --- /dev/null +++ b/tests/Feature/Menu/TicketMenuAccessTest.php @@ -0,0 +1,76 @@ + ['onticket.adminapp.tickets', 'current', true], + 'old code' => ['adminapp.tickets', 'current', false], + 'another tenant' => ['onticket.adminapp.tickets', 'other', false], + 'unrelated menu' => ['adminapp.ventas', 'current', false], + ]; + } + + #[DataProvider('menuAssignments')] + public function test_ticket_menu_requires_an_association_with_the_authenticated_tenant(string $menuCode, string $assignedTenant, bool $allowed): void + { + Schema::create('tenants', function (Blueprint $table): void { + $table->id(); + $table->string('codigo'); + }); + Schema::create('menues', function (Blueprint $table): void { + $table->id(); + $table->string('code'); + }); + Schema::create('tenants_menues', function (Blueprint $table): void { + $table->string('tenant_code'); + $table->string('menu_code'); + }); + DB::table('tenants')->insert(['codigo' => 'current']); + DB::table('menues')->insert(['code' => $menuCode]); + DB::table('tenants_menues')->insert(['tenant_code' => $assignedTenant, 'menu_code' => $menuCode]); + + $user = new User(['tenant_codigo' => 'current']); + $request = Request::create('/api/v1/adminapp/tenant/tickets'); + $request->setUserResolver(fn () => $user); + if (! $allowed) { + $this->expectException(HttpException::class); + $this->expectExceptionCode(0); + } + + try { + $response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'onticket.adminapp.tickets'); + $this->assertSame('allowed', $response->getContent()); + } catch (HttpException $exception) { + $this->assertSame(404, $exception->getStatusCode()); + throw $exception; + } + } + + public function test_all_ticket_routes_and_filter_form_use_the_updated_menu_codes(): void + { + foreach ([ + 'adminapp.tickets.index', 'adminapp.tickets.cancel', + 'adminapp.tickets.calculate-refund', 'adminapp.tickets.refund', + 'adminapp.tickets.pdf', 'adminapp.tickets.excel', 'adminapp.forms.tickets-filter', + ] as $name) { + $route = Route::getRoutes()->getByName($name); + $this->assertNotNull($route); + $this->assertContains('tenant.menu:onticket.adminapp.tickets', $route->gatherMiddleware()); + } + } +} -- 2.49.1 From 2d11263adc4b7ba58c1ab6249bbeb2746ab252a2 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:46:29 -0300 Subject: [PATCH 15/23] feat(ticket): add event_id support to ticket service methods; update search, cancel, and refund calculations --- .../Controllers/AdminApp/TicketController.php | 10 ++--- .../Ticket/Services/AdminAppTicketService.php | 42 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php index 6106ddd1..3c9bdbaa 100644 --- a/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php +++ b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php @@ -29,7 +29,7 @@ class TicketController extends Controller $tenant = $request->user()->tenant()->firstOrFail(); return new AdminAppTicketCollection( - $this->ticketService->search($tenant, $request->validated()) + $this->ticketService->search($tenant, $request->validated(), $request->user()->event_id) ); } @@ -37,7 +37,7 @@ class TicketController extends Controller { $tenant = $request->user()->tenant()->firstOrFail(); - return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket)); + return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id)); } public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource @@ -45,7 +45,7 @@ class TicketController extends Controller $tenant = $request->user()->tenant()->firstOrFail(); return new AdminAppTicketRefundCalculationResource( - $this->ticketService->calculateRefund($tenant, $ticket) + $this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id) ); } @@ -69,7 +69,7 @@ class TicketController extends Controller return $this->ticketPdfService->download( $tenant, - $this->ticketService->ticketsForExport($tenant, $request->validated()), + $this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } @@ -80,7 +80,7 @@ class TicketController extends Controller return $this->ticketExcelService->download( $tenant, - $this->ticketService->ticketsForExport($tenant, $request->validated()), + $this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id), $request->validated('timezone'), ); } diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php index 81dbfa0f..e8dc384d 100644 --- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php +++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php @@ -41,9 +41,9 @@ class AdminAppTicketService /** * @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters */ - public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult + public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult { - $query = $this->baseQuery($tenant, $filters); + $query = $this->baseQuery($tenant, $filters, $eventId); $countQuery = clone $query; $databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters); @@ -77,7 +77,7 @@ class AdminAppTicketService tickets: $tickets, scannedTickets: $scannedTickets, totalTickets: $totalTickets, - refundedTotal: $this->refundSummaryService->totalForTenant($tenant), + refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId), ); } @@ -85,9 +85,9 @@ class AdminAppTicketService * @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters * @return Collection */ - public function ticketsForExport(Tenant $tenant, array $filters = []): Collection + public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection { - $query = $this->baseQuery($tenant, $filters); + $query = $this->baseQuery($tenant, $filters, $eventId); $databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters); $tickets = $query ->with(self::RELATIONS) @@ -97,11 +97,10 @@ class AdminAppTicketService return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters); } - public function cancel(Tenant $tenant, int $ticketId): Ticket + public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket { - return DB::transaction(function () use ($tenant, $ticketId): Ticket { - $ticket = Ticket::query() - ->where('tenant_code', $tenant->codigo) + return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket { + $ticket = $this->ticketsQuery($tenant, $eventId) ->lockForUpdate() ->findOrFail($ticketId); @@ -124,10 +123,9 @@ class AdminAppTicketService * partial: string|null, * } */ - public function calculateRefund(Tenant $tenant, int $ticketId): array + public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array { - $ticket = Ticket::query() - ->where('tenant_code', $tenant->codigo) + $ticket = $this->ticketsQuery($tenant, $eventId) ->findOrFail($ticketId); if (! $ticket->can_refund()) { @@ -175,14 +173,13 @@ class AdminAppTicketService string $refundType, ?User $createdBy = null, ): Ticket { - $this->ensureRefundIsAllowed($tenant, $refundType); - return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket { - $ticket = Ticket::query() - ->where('tenant_code', $tenant->codigo) + $ticket = $this->ticketsQuery($tenant, $createdBy?->event_id) ->lockForUpdate() ->findOrFail($ticketId); + $this->ensureRefundIsAllowed($tenant, $refundType); + if (! $ticket->can_refund()) { if ($ticket->status !== Ticket::STATUS_ACTIVE) { throw ValidationException::withMessages([ @@ -314,12 +311,11 @@ class AdminAppTicketService * @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters * @return Builder */ - private function baseQuery(Tenant $tenant, array $filters): Builder + private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder { $search = trim((string) ($filters['q'] ?? '')); - $query = Ticket::query() - ->where('tenant_code', $tenant->codigo) + $query = $this->ticketsQuery($tenant, $eventId) ->when($search !== '', function (Builder $query) use ($search): void { $this->applySearchFilter($query, $search); }) @@ -359,6 +355,14 @@ class AdminAppTicketService return $query; } + /** @return Builder */ + private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder + { + return Ticket::query() + ->where('tenant_code', $tenant->codigo) + ->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId)); + } + /** @param Builder $query */ private function applySearchFilter(Builder $query, string $search): void { -- 2.49.1 From 22de61c8c03e3e82c286532a56b4499b7c957d43 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:46:47 -0300 Subject: [PATCH 16/23] feat(tests): add AdminAppTicketEventScopeTest for event-based ticket management --- .../Ticket/AdminAppTicketEventScopeTest.php | 173 ++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 tests/Feature/Ticket/AdminAppTicketEventScopeTest.php diff --git a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php new file mode 100644 index 00000000..627c5a39 --- /dev/null +++ b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php @@ -0,0 +1,173 @@ +id(); + $table->string('codigo'); + $table->string('timezone')->default('UTC'); + $table->boolean('allow_ticket_refund')->default(false); + $table->boolean('allow_ticket_total_refund')->default(false); + $table->boolean('allow_ticket_partial_refund')->default(false); + }); + Schema::create('menues', function (Blueprint $table): void { + $table->id(); + $table->string('code'); + }); + Schema::create('tenants_menues', function (Blueprint $table): void { + $table->string('tenant_code'); + $table->string('menu_code'); + }); + Schema::create('users', function (Blueprint $table): void { + $table->id(); + $table->string('nombre_apellido'); + $table->softDeletes(); + }); + Schema::create('tickets', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->unsignedBigInteger('event_id')->nullable(); + $table->string('ticket'); + foreach (['source_variant_id', 'source_catalog_item_id', 'source_purchase_item_id', 'scanner_user_id', 'user_id'] as $column) { + $table->unsignedBigInteger($column)->nullable(); + } + foreach (['used_at', 'disabled_at', 'cancelled_at', 'refunded_at'] as $column) { + $table->timestamp($column)->nullable(); + } + $table->timestamps(); + }); + Schema::create('compras', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_codigo'); + $table->unsignedBigInteger('event_id')->nullable(); + $table->string('nombre_apellido'); + }); + Schema::create('compra_items', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('compra_id'); + $table->decimal('precio_unitario', 12, 2); + }); + Schema::create('ticket_refunds', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('ticket_id')->nullable(); + $table->unsignedBigInteger('purchase_item_id'); + $table->decimal('amount', 12, 2); + }); + Schema::create('desfile_entry_reservations', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('ticket_id'); + }); + Schema::create('value_changes', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->string('trackable_type'); + $table->unsignedBigInteger('trackable_id'); + $table->string('attribute'); + $table->string('old_value')->nullable(); + $table->string('new_value')->nullable(); + $table->timestamp('changed_at'); + $table->string('actor_type'); + $table->unsignedBigInteger('user_id')->nullable(); + }); + + DB::table('tenants')->insert(['codigo' => 'onticket']); + DB::table('menues')->insert(['code' => 'onticket.adminapp.tickets']); + DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'onticket.adminapp.tickets']); + foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) { + DB::table('tickets')->insert([ + 'id' => $id, 'tenant_code' => $tenant, 'event_id' => $event, + 'ticket' => "ticket-{$id}", 'used_at' => now(), + ]); + DB::table('compras')->insert(['id' => $id, 'tenant_codigo' => $tenant, 'event_id' => $event, 'nombre_apellido' => 'Cliente']); + DB::table('compra_items')->insert(['id' => $id, 'compra_id' => $id, 'precio_unitario' => 100]); + DB::table('ticket_refunds')->insert(['purchase_item_id' => $id, 'amount' => $id * 10]); + } + $this->actingAsAdmin(10); + } + + public function test_list_counts_refunded_total_and_search_cannot_escape_the_user_event(): void + { + $this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=id&event_id=20') + ->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.id', 1) + ->assertJsonPath('scanned_tickets', 1)->assertJsonPath('total_tickets', 1) + ->assertJsonPath('refunded_total', '10.00'); + $this->getJson('/api/v1/adminapp/tenant/tickets?q=2')->assertOk()->assertJsonCount(0, 'data'); + // Status uses sorting in memory rather than the database. + $this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=status') + ->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.id', 1); + } + + public function test_foreign_unassigned_and_other_tenant_tickets_cannot_be_modified_or_refunded(): void + { + foreach ([2, 3, 4] as $id) { + $this->postJson("/api/v1/adminapp/tenant/tickets/{$id}/cancel", ['event_id' => 20])->assertNotFound(); + $this->getJson("/api/v1/adminapp/tenant/tickets/{$id}/refund")->assertNotFound(); + $this->postJson("/api/v1/adminapp/tenant/tickets/{$id}/refund", ['refund_type' => 'total', 'event_id' => 20])->assertNotFound(); + $this->assertDatabaseHas('tickets', ['id' => $id, 'cancelled_at' => null, 'refunded_at' => null]); + } + $this->assertDatabaseCount('value_changes', 0); + $this->assertDatabaseCount('ticket_refunds', 4); + } + + public function test_own_ticket_can_be_cancelled_and_refund_requests_reach_business_validation(): void + { + DB::table('tickets')->where('id', 1)->update(['used_at' => null]); + $this->getJson('/api/v1/adminapp/tenant/tickets/1/refund')->assertUnprocessable(); + $this->postJson('/api/v1/adminapp/tenant/tickets/1/refund', ['refund_type' => 'total'])->assertUnprocessable(); + $this->postJson('/api/v1/adminapp/tenant/tickets/1/cancel')->assertOk(); + $this->assertNotNull(DB::table('tickets')->where('id', 1)->value('cancelled_at')); + } + + public function test_unscoped_admin_keeps_the_tenant_scope(): void + { + $this->actingAsAdmin(null); + $this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=id') + ->assertOk()->assertJsonCount(3, 'data')->assertJsonPath('total_tickets', 3) + ->assertJsonPath('refunded_total', '60.00'); + DB::table('tickets')->where('id', 3)->update(['used_at' => null]); + $this->postJson('/api/v1/adminapp/tenant/tickets/3/cancel')->assertOk(); + $this->postJson('/api/v1/adminapp/tenant/tickets/4/cancel')->assertNotFound(); + } + + public function test_pdf_and_excel_receive_only_the_tickets_of_the_user_event(): void + { + foreach ([AdminAppTicketPdfService::class, AdminAppTicketExcelService::class] as $class) { + $this->mock($class, function (MockInterface $mock) use ($class): void { + $mock->shouldReceive('download')->once()->withArgs( + fn ($tenant, Collection $tickets, $timezone): bool => $tenant->codigo === 'onticket' + && $tickets->pluck('id')->all() === [1] && $timezone === 'UTC' + )->andReturn($class === AdminAppTicketPdfService::class + ? response('pdf') : new StreamedResponse(fn () => print('excel'))); + }); + } + foreach (['pdf', 'excel'] as $format) { + $this->getJson("/api/v1/adminapp/tenant/tickets/{$format}?timezone=UTC&event_id=20")->assertOk(); + } + } + + private function actingAsAdmin(?int $eventId): void + { + $user = new User; + $user->setRawAttributes(['id' => 1, 'rol_codigo' => 'adminapp', 'tenant_codigo' => 'onticket', 'event_id' => $eventId]); + Sanctum::actingAs($user); + } +} -- 2.49.1 From 3ddff7e0ee73767f85e0024a1fc81eebab518dc2 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 09:47:32 -0300 Subject: [PATCH 17/23] feat(tests): enhance AdminAppTicketEventScopeTest with soft deletes and active ticket filtering --- app/Domains/Ticketing/Ticket/documentacion/README.md | 6 +++++- tests/Feature/Ticket/AdminAppTicketEventScopeTest.php | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Domains/Ticketing/Ticket/documentacion/README.md b/app/Domains/Ticketing/Ticket/documentacion/README.md index e460d5c3..66b5df4c 100644 --- a/app/Domains/Ticketing/Ticket/documentacion/README.md +++ b/app/Domains/Ticketing/Ticket/documentacion/README.md @@ -82,13 +82,17 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`: - `POST /tickets/pdf`. Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú -`adminapp.tickets`: +`onticket.adminapp.tickets`: - `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye `scanned_tickets` y `total_tickets` para el tenant autenticado. `TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas. +Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant. + +La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente. + ## Dependencias y reglas Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación. diff --git a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php index 627c5a39..8820c3be 100644 --- a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php +++ b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php @@ -75,6 +75,7 @@ class AdminAppTicketEventScopeTest extends TestCase Schema::create('desfile_entry_reservations', function (Blueprint $table): void { $table->id(); $table->unsignedBigInteger('ticket_id'); + $table->softDeletes(); }); Schema::create('value_changes', function (Blueprint $table): void { $table->id(); @@ -114,6 +115,10 @@ class AdminAppTicketEventScopeTest extends TestCase // Status uses sorting in memory rather than the database. $this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=status') ->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.id', 1); + DB::table('tickets')->where('id', 1)->update(['used_at' => null]); + $this->getJson('/api/v1/adminapp/tenant/tickets?status=active') + ->assertOk()->assertJsonCount(1, 'data') + ->assertJsonPath('scanned_tickets', 0)->assertJsonPath('total_tickets', 1); } public function test_foreign_unassigned_and_other_tenant_tickets_cannot_be_modified_or_refunded(): void @@ -156,7 +161,7 @@ class AdminAppTicketEventScopeTest extends TestCase fn ($tenant, Collection $tickets, $timezone): bool => $tenant->codigo === 'onticket' && $tickets->pluck('id')->all() === [1] && $timezone === 'UTC' )->andReturn($class === AdminAppTicketPdfService::class - ? response('pdf') : new StreamedResponse(fn () => print('excel'))); + ? response('pdf') : new StreamedResponse(fn () => print ('excel'))); }); } foreach (['pdf', 'excel'] as $format) { -- 2.49.1 From e7bece5bfd92cd7e7623a51e51b2b750a1a099b8 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 10:00:54 -0300 Subject: [PATCH 18/23] Merge branch 'refactor/inventory_stock' into homo -- 2.49.1 From 856b9a670632963fc32c868ac0a7cdd48978d9c7 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Thu, 1 Oct 2026 10:29:06 -0300 Subject: [PATCH 19/23] refactor: update menu code references from 'onticket.adminapp.tickets' to 'adminapp.tickets' --- app/Domains/Ticketing/Ticket/documentacion/README.md | 2 +- app/Domains/Ticketing/Ticket/routes/adminapp.php | 12 ++++++------ app/Shared/Forms/routes/adminapp.php | 2 +- tests/Feature/Menu/TicketMenuAccessTest.php | 10 +++++----- .../Feature/Ticket/AdminAppTicketEventScopeTest.php | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/Domains/Ticketing/Ticket/documentacion/README.md b/app/Domains/Ticketing/Ticket/documentacion/README.md index 66b5df4c..1b3bf0eb 100644 --- a/app/Domains/Ticketing/Ticket/documentacion/README.md +++ b/app/Domains/Ticketing/Ticket/documentacion/README.md @@ -82,7 +82,7 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`: - `POST /tickets/pdf`. Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú -`onticket.adminapp.tickets`: +`adminapp.tickets`: - `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye `scanned_tickets` y `total_tickets` para el tenant autenticado. diff --git a/app/Domains/Ticketing/Ticket/routes/adminapp.php b/app/Domains/Ticketing/Ticket/routes/adminapp.php index 17e0329a..b785612a 100644 --- a/app/Domains/Ticketing/Ticket/routes/adminapp.php +++ b/app/Domains/Ticketing/Ticket/routes/adminapp.php @@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant') ->middleware(['auth:sanctum', 'adminapp.tenant']) ->group(function (): void { Route::get('tickets', [TicketController::class, 'index']) - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.index'); Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel']) ->whereNumber('ticket') - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.cancel'); Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund']) ->whereNumber('ticket') - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.calculate-refund'); Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund']) ->whereNumber('ticket') - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.refund'); Route::get('tickets/pdf', [TicketController::class, 'downloadPdf']) - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.pdf'); Route::get('tickets/excel', [TicketController::class, 'downloadExcel']) - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.excel'); }); diff --git a/app/Shared/Forms/routes/adminapp.php b/app/Shared/Forms/routes/adminapp.php index e77dcc63..6517d639 100644 --- a/app/Shared/Forms/routes/adminapp.php +++ b/app/Shared/Forms/routes/adminapp.php @@ -23,7 +23,7 @@ Route::prefix('v1/adminapp/forms') Route::get('sale', SaleFormController::class); Route::get('staff', StaffFormController::class); Route::get('tickets-filter', TicketFilterFormController::class) - ->middleware('tenant.menu:onticket.adminapp.tickets') + ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.forms.tickets-filter'); Route::get( 'fiesta-futbol-infantil/ticket', diff --git a/tests/Feature/Menu/TicketMenuAccessTest.php b/tests/Feature/Menu/TicketMenuAccessTest.php index a9dae0a2..48c7549a 100644 --- a/tests/Feature/Menu/TicketMenuAccessTest.php +++ b/tests/Feature/Menu/TicketMenuAccessTest.php @@ -18,9 +18,9 @@ class TicketMenuAccessTest extends TestCase public static function menuAssignments(): array { return [ - 'OnTicket' => ['onticket.adminapp.tickets', 'current', true], - 'old code' => ['adminapp.tickets', 'current', false], - 'another tenant' => ['onticket.adminapp.tickets', 'other', false], + 'new code' => ['onticket.adminapp.tickets', 'current', false], + 'old code' => ['adminapp.tickets', 'current', true], + 'another tenant' => ['adminapp.tickets', 'other', false], 'unrelated menu' => ['adminapp.ventas', 'current', false], ]; } @@ -53,7 +53,7 @@ class TicketMenuAccessTest extends TestCase } try { - $response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'onticket.adminapp.tickets'); + $response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'adminapp.tickets'); $this->assertSame('allowed', $response->getContent()); } catch (HttpException $exception) { $this->assertSame(404, $exception->getStatusCode()); @@ -70,7 +70,7 @@ class TicketMenuAccessTest extends TestCase ] as $name) { $route = Route::getRoutes()->getByName($name); $this->assertNotNull($route); - $this->assertContains('tenant.menu:onticket.adminapp.tickets', $route->gatherMiddleware()); + $this->assertContains('tenant.menu:adminapp.tickets', $route->gatherMiddleware()); } } } diff --git a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php index 8820c3be..3b698584 100644 --- a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php +++ b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php @@ -91,8 +91,8 @@ class AdminAppTicketEventScopeTest extends TestCase }); DB::table('tenants')->insert(['codigo' => 'onticket']); - DB::table('menues')->insert(['code' => 'onticket.adminapp.tickets']); - DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'onticket.adminapp.tickets']); + DB::table('menues')->insert(['code' => 'adminapp.tickets']); + DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'adminapp.tickets']); foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) { DB::table('tickets')->insert([ 'id' => $id, 'tenant_code' => $tenant, 'event_id' => $event, -- 2.49.1 From 47b2e8e030a2df9244cedf0a66440ef15906c3ce Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:03:00 -0300 Subject: [PATCH 20/23] Refactor entry reservation handling by generalizing ticket reservations - Renamed `desfile_entry_reservations` to `entry_reservations` and `desfile_reservation_batches` to `reservation_batches`. - Updated models, services, and requests to use the new `EntryReservation` model from the `Ticket` domain instead of the deleted `Desfile` model. - Introduced a new `EntryReservationPaymentType` enum to manage payment types. - Modified database migrations to ensure data integrity during the transition. - Updated tests to reflect changes in the database schema and model relationships. - Ensured that existing functionality remains intact while improving code organization and clarity. --- .../Commerce/Catalog/Models/CatalogItem.php | 13 +- .../Commerce/Catalog/Models/Variant.php | 4 +- .../Services/VariantReplacementService.php | 2 +- .../TenantTransactionResetService.php | 12 +- .../Desfile/Models/EntryReservation.php | 54 ----- .../IndexEntryReservationsRequest.php | 2 +- .../StoreEntryReservationsRequest.php | 2 +- .../Resources/EntryReservationResource.php | 1 + .../Services/EntryReservationExcelService.php | 2 +- .../Services/EntryReservationPdfService.php | 2 +- .../EntryReservationReportService.php | 2 +- .../Services/EntryReservationService.php | 15 +- .../Enums/EntryReservationPaymentType.php | 2 +- .../Ticket/Models/EntryReservation.php | 87 ++++++++ .../Ticket/Models/ReservationBatch.php | 37 ++++ .../Ticketing/Ticket/Models/Ticket.php | 1 - .../DesfileEntryReservationFormService.php | 2 +- ..._000000_generalize_ticket_reservations.php | 53 +++++ .../Desfile/EntryReservationServiceTest.php | 16 +- ...fileEntryReservationFormControllerTest.php | 4 +- .../GeneralizeTicketReservationsTest.php | 206 ++++++++++++++++++ .../Ticket/AdminAppTicketControllerTest.php | 4 +- .../Ticket/AdminAppTicketEventScopeTest.php | 2 +- .../EntryReservationSchemaTest.php | 5 +- .../Unit/Catalog/VariantAvailabilityTest.php | 6 +- .../EntryReservationTest.php | 7 +- tests/Unit/Ticket/TicketTest.php | 2 +- 27 files changed, 442 insertions(+), 103 deletions(-) delete mode 100644 app/Domains/Ticketing/Desfile/Models/EntryReservation.php rename app/Domains/Ticketing/{Desfile => Ticket}/Enums/EntryReservationPaymentType.php (92%) create mode 100644 app/Domains/Ticketing/Ticket/Models/EntryReservation.php create mode 100644 app/Domains/Ticketing/Ticket/Models/ReservationBatch.php create mode 100644 database/migrations/2026_10_02_000000_generalize_ticket_reservations.php create mode 100644 tests/Feature/Migrations/GeneralizeTicketReservationsTest.php rename tests/Feature/{Desfile => Ticket}/EntryReservationSchemaTest.php (76%) rename tests/Unit/{Desfile => Ticket}/EntryReservationTest.php (80%) diff --git a/app/Domains/Commerce/Catalog/Models/CatalogItem.php b/app/Domains/Commerce/Catalog/Models/CatalogItem.php index 9fe5d1c6..c64adb8f 100644 --- a/app/Domains/Commerce/Catalog/Models/CatalogItem.php +++ b/app/Domains/Commerce/Catalog/Models/CatalogItem.php @@ -8,6 +8,7 @@ use App\Domains\Commerce\Catalog\Enums\InventorySubject; use App\Domains\Commerce\Catalog\Services\CatalogInventoryService; use App\Domains\Core\Tenant\Models\Tenant; use App\Domains\Ticketing\Event\Models\Event; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Shared\Attachable\Models\Attachment; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -147,6 +148,12 @@ class CatalogItem extends Model return $this->hasMany(Ticket::class, 'source_catalog_item_id'); } + /** @return HasMany */ + public function entryReservations(): HasMany + { + return $this->hasMany(EntryReservation::class); + } + /** @return BelongsToMany */ public function attributes(): BelongsToMany { @@ -266,13 +273,13 @@ class CatalogItem extends Model { $this->variants ->filter(fn (Variant $variant): bool => $variant->exists) - ->loadMissing('desfileEntryReservations'); + ->loadMissing('entryReservations'); return $this->variants ->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this)) ->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates() - && (! $variant->relationLoaded('desfileEntryReservations') - || $variant->desfileEntryReservations->isEmpty()) + && (! $variant->relationLoaded('entryReservations') + || $variant->entryReservations->isEmpty()) && (($includedVariantId !== null && $variant->id === $includedVariantId) || ($variant->isSellable() && ( $this->inventory_policy === InventoryPolicy::Unlimited diff --git a/app/Domains/Commerce/Catalog/Models/Variant.php b/app/Domains/Commerce/Catalog/Models/Variant.php index dd5a622e..94786c52 100644 --- a/app/Domains/Commerce/Catalog/Models/Variant.php +++ b/app/Domains/Commerce/Catalog/Models/Variant.php @@ -2,8 +2,8 @@ namespace App\Domains\Commerce\Catalog\Models; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; use App\Domains\Ticketing\Event\Models\EventDate; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Shared\Attachable\Models\Attachment; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -76,7 +76,7 @@ class Variant extends Model } /** @return HasMany */ - public function desfileEntryReservations(): HasMany + public function entryReservations(): HasMany { return $this->hasMany(EntryReservation::class); } diff --git a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php index 317c4972..088c97c9 100644 --- a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php +++ b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php @@ -7,8 +7,8 @@ use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Catalog\Models\StockReservation; use App\Domains\Commerce\Catalog\Models\StockReservationLine; use App\Domains\Commerce\Catalog\Models\Variant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; use App\Domains\Ticketing\Event\Models\EventDate; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use Illuminate\Support\Collection; class VariantReplacementService diff --git a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php index 37931061..d6e372fd 100644 --- a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php +++ b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php @@ -25,9 +25,8 @@ class TenantTransactionResetService 'carts' => $scope['cart_ids']->count(), 'cart_items' => $scope['cart_item_ids']->count(), 'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(), - 'entry_reservations' => DB::table('desfile_entry_reservations') - ->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id', - DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->count(), + 'entry_reservations' => DB::table('entry_reservations') + ->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->count(), 'stock_reservations' => $this->reservationQuery($scope)->count(), 'purchase_changes' => DB::table('value_changes') ->where('tenant_code', $tenantCode) @@ -50,10 +49,9 @@ class TenantTransactionResetService $telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count(); $summary = [ 'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(), - 'entry_reservations_deleted' => DB::table('desfile_entry_reservations') - ->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id', - DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->delete(), - 'entry_reservation_batches_deleted' => DB::table('desfile_reservation_batches')->where('tenant_code', $tenantCode)->delete(), + 'entry_reservations_deleted' => DB::table('entry_reservations') + ->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->delete(), + 'entry_reservation_batches_deleted' => DB::table('reservation_batches')->where('tenant_code', $tenantCode)->delete(), 'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(), 'purchase_changes_deleted' => DB::table('value_changes') ->where('tenant_code', $tenantCode) diff --git a/app/Domains/Ticketing/Desfile/Models/EntryReservation.php b/app/Domains/Ticketing/Desfile/Models/EntryReservation.php deleted file mode 100644 index a9c20498..00000000 --- a/app/Domains/Ticketing/Desfile/Models/EntryReservation.php +++ /dev/null @@ -1,54 +0,0 @@ - 'integer', - 'fecha_reserva' => 'datetime', - 'importe' => 'decimal:2', - 'tipo_pago' => EntryReservationPaymentType::class, - ]; - } - - /** @return BelongsTo */ - public function variant(): BelongsTo - { - return $this->belongsTo(Variant::class)->withTrashed(); - } - - public function ticket(): BelongsTo - { - return $this->belongsTo(Ticket::class); - } - - public function inventory(): BelongsTo - { - return $this->belongsTo(Inventory::class); - } -} diff --git a/app/Domains/Ticketing/Desfile/Requests/IndexEntryReservationsRequest.php b/app/Domains/Ticketing/Desfile/Requests/IndexEntryReservationsRequest.php index e546136b..ef38d5d4 100644 --- a/app/Domains/Ticketing/Desfile/Requests/IndexEntryReservationsRequest.php +++ b/app/Domains/Ticketing/Desfile/Requests/IndexEntryReservationsRequest.php @@ -2,7 +2,7 @@ namespace App\Domains\Ticketing\Desfile\Requests; -use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType; +use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; diff --git a/app/Domains/Ticketing/Desfile/Requests/StoreEntryReservationsRequest.php b/app/Domains/Ticketing/Desfile/Requests/StoreEntryReservationsRequest.php index d4799926..1cb9cfdd 100644 --- a/app/Domains/Ticketing/Desfile/Requests/StoreEntryReservationsRequest.php +++ b/app/Domains/Ticketing/Desfile/Requests/StoreEntryReservationsRequest.php @@ -2,7 +2,7 @@ namespace App\Domains\Ticketing\Desfile\Requests; -use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType; +use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; diff --git a/app/Domains/Ticketing/Desfile/Resources/EntryReservationResource.php b/app/Domains/Ticketing/Desfile/Resources/EntryReservationResource.php index 9ef77d37..89a51d5f 100644 --- a/app/Domains/Ticketing/Desfile/Resources/EntryReservationResource.php +++ b/app/Domains/Ticketing/Desfile/Resources/EntryReservationResource.php @@ -15,6 +15,7 @@ class EntryReservationResource extends JsonResource return [ 'id' => $this->id, + 'catalog_item_id' => $this->catalog_item_id, 'variant_id' => $this->variant_id, 'ticket_id' => $this->ticket_id, 'fecha_reserva' => $this->fecha_reserva->toIso8601String(), diff --git a/app/Domains/Ticketing/Desfile/Services/EntryReservationExcelService.php b/app/Domains/Ticketing/Desfile/Services/EntryReservationExcelService.php index fb213cbc..8d391c71 100644 --- a/app/Domains/Ticketing/Desfile/Services/EntryReservationExcelService.php +++ b/app/Domains/Ticketing/Desfile/Services/EntryReservationExcelService.php @@ -3,7 +3,7 @@ namespace App\Domains\Ticketing\Desfile\Services; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use Illuminate\Support\Collection; use PhpOffice\PhpSpreadsheet\Cell\DataType; use PhpOffice\PhpSpreadsheet\Shared\Date; diff --git a/app/Domains/Ticketing/Desfile/Services/EntryReservationPdfService.php b/app/Domains/Ticketing/Desfile/Services/EntryReservationPdfService.php index 4df1da4c..c63ab332 100644 --- a/app/Domains/Ticketing/Desfile/Services/EntryReservationPdfService.php +++ b/app/Domains/Ticketing/Desfile/Services/EntryReservationPdfService.php @@ -3,7 +3,7 @@ namespace App\Domains\Ticketing\Desfile\Services; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use Barryvdh\DomPDF\Facade\Pdf; use Barryvdh\DomPDF\PDF as DomPdf; use Illuminate\Http\Response; diff --git a/app/Domains/Ticketing/Desfile/Services/EntryReservationReportService.php b/app/Domains/Ticketing/Desfile/Services/EntryReservationReportService.php index e401c5a2..a1ca4e2a 100644 --- a/app/Domains/Ticketing/Desfile/Services/EntryReservationReportService.php +++ b/app/Domains/Ticketing/Desfile/Services/EntryReservationReportService.php @@ -2,7 +2,7 @@ namespace App\Domains\Ticketing\Desfile\Services; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use Illuminate\Support\Collection; class EntryReservationReportService diff --git a/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php b/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php index e8cb948d..2f2bd734 100644 --- a/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php +++ b/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php @@ -7,9 +7,10 @@ use App\Domains\Commerce\Catalog\Models\CatalogItem; use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Core\Auth\Models\User; -use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType; use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Models\ReservationBatch; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService; use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver; @@ -139,7 +140,7 @@ class EntryReservationService return DB::transaction(function () use ($user, $key, $rows, $hash): Collection { // Serialize retries by the same administrator, including the first insert. User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail(); - $batch = DB::table('desfile_reservation_batches') + $batch = ReservationBatch::query() ->where('user_id', $user->id)->where('idempotency_key', $key)->lockForUpdate()->first(); if ($batch !== null) { abort_unless($batch->tenant_code === $user->tenant_codigo && hash_equals($batch->request_hash, $hash), 409, @@ -157,7 +158,7 @@ class EntryReservationService ->orderBy('id')->lockForUpdate()->get()->keyBy('id'); $variants->load([ 'eventDates', 'eventDate', - 'desfileEntryReservations' => fn ($query) => $query->lockForUpdate(), + 'entryReservations' => fn ($query) => $query->lockForUpdate(), ]); foreach ($variants as $variant) { $variant->setRelation('inventory', $inventories->get($variant->inventory_id)); @@ -193,10 +194,9 @@ class EntryReservationService throw ValidationException::withMessages($errors); } - $batchId = DB::table('desfile_reservation_batches')->insertGetId([ + $batch = ReservationBatch::query()->create([ 'user_id' => $user->id, 'tenant_code' => $tenant->codigo, 'idempotency_key' => $key, 'request_hash' => $hash, - 'created_at' => now(), 'updated_at' => now(), ]); foreach ($requirements as $inventoryId => $quantity) { $inventories[$inventoryId]->reserveEntry($quantity, $tracked); @@ -213,7 +213,8 @@ class EntryReservationService ]); } $reservation = EntryReservation::query()->create([ - 'batch_id' => $batchId, 'ticket_id' => $ticket->id, + 'batch_id' => $batch->id, 'ticket_id' => $ticket->id, + 'catalog_item_id' => $entry->id, 'variant_id' => $variant->id, 'inventory_id' => $variant->inventory_id, 'fecha_reserva' => now(), 'tipo_pago' => $payment, 'importe' => $payment === EntryReservationPaymentType::Free ? 0 : $variant->getPrice(), diff --git a/app/Domains/Ticketing/Desfile/Enums/EntryReservationPaymentType.php b/app/Domains/Ticketing/Ticket/Enums/EntryReservationPaymentType.php similarity index 92% rename from app/Domains/Ticketing/Desfile/Enums/EntryReservationPaymentType.php rename to app/Domains/Ticketing/Ticket/Enums/EntryReservationPaymentType.php index bec60e8d..79654871 100644 --- a/app/Domains/Ticketing/Desfile/Enums/EntryReservationPaymentType.php +++ b/app/Domains/Ticketing/Ticket/Enums/EntryReservationPaymentType.php @@ -1,6 +1,6 @@ 'integer', + 'variant_id' => 'integer', + 'fecha_reserva' => 'datetime', + 'importe' => 'decimal:2', + 'tipo_pago' => EntryReservationPaymentType::class, + ]; + } + + protected static function booted(): void + { + static::saving(function (self $reservation): void { + if ($reservation->variant_id === null) { + return; + } + + $variant = Variant::withTrashed()->findOrFail($reservation->variant_id); + // Existing variant-based callers can keep creating reservations as before. + $reservation->catalog_item_id ??= $variant->catalog_item_id; + if ($reservation->catalog_item_id !== $variant->catalog_item_id) { + throw ValidationException::withMessages([ + 'variant_id' => 'La variante no pertenece al ítem del catálogo seleccionado.', + ]); + } + }); + } + + /** @return BelongsTo */ + public function catalogItem(): BelongsTo + { + return $this->belongsTo(CatalogItem::class)->withTrashed(); + } + + /** @return BelongsTo */ + public function batch(): BelongsTo + { + return $this->belongsTo(ReservationBatch::class, 'batch_id'); + } + + /** @return BelongsTo */ + public function variant(): BelongsTo + { + return $this->belongsTo(Variant::class)->withTrashed(); + } + + public function ticket(): BelongsTo + { + return $this->belongsTo(Ticket::class); + } + + public function inventory(): BelongsTo + { + return $this->belongsTo(Inventory::class); + } +} diff --git a/app/Domains/Ticketing/Ticket/Models/ReservationBatch.php b/app/Domains/Ticketing/Ticket/Models/ReservationBatch.php new file mode 100644 index 00000000..515508c1 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Models/ReservationBatch.php @@ -0,0 +1,37 @@ + 'integer']; + } + + /** @return BelongsTo */ + public function user(): BelongsTo + { + return $this->belongsTo(User::class)->withTrashed(); + } + + /** @return BelongsTo */ + public function tenant(): BelongsTo + { + return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo'); + } + + /** @return HasMany */ + public function reservations(): HasMany + { + return $this->hasMany(EntryReservation::class, 'batch_id'); + } +} diff --git a/app/Domains/Ticketing/Ticket/Models/Ticket.php b/app/Domains/Ticketing/Ticket/Models/Ticket.php index 12560bc3..838763cc 100644 --- a/app/Domains/Ticketing/Ticket/Models/Ticket.php +++ b/app/Domains/Ticketing/Ticket/Models/Ticket.php @@ -7,7 +7,6 @@ use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Commerce\Purchase\Models\PurchaseItem; use App\Domains\Core\Auth\Models\User; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; use App\Domains\Ticketing\Event\Models\Event; use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity; use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup; diff --git a/app/Shared/Forms/Services/DesfileEntryReservationFormService.php b/app/Shared/Forms/Services/DesfileEntryReservationFormService.php index 3c37bde4..e27637e8 100644 --- a/app/Shared/Forms/Services/DesfileEntryReservationFormService.php +++ b/app/Shared/Forms/Services/DesfileEntryReservationFormService.php @@ -5,7 +5,7 @@ namespace App\Shared\Forms\Services; use App\Domains\Commerce\Catalog\Models\CatalogItem; use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType; +use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType; class DesfileEntryReservationFormService { diff --git a/database/migrations/2026_10_02_000000_generalize_ticket_reservations.php b/database/migrations/2026_10_02_000000_generalize_ticket_reservations.php new file mode 100644 index 00000000..acb8295f --- /dev/null +++ b/database/migrations/2026_10_02_000000_generalize_ticket_reservations.php @@ -0,0 +1,53 @@ +leftJoin('variantes', 'variantes.id', '=', 'reservations.variant_id') + ->leftJoin('catalog_items', 'catalog_items.id', '=', 'variantes.catalog_item_id') + ->whereNull('catalog_items.id')->exists()) { + throw new LogicException('No se puede determinar el catálogo de todas las reservas existentes.'); + } + + Schema::rename('desfile_reservation_batches', 'reservation_batches'); + Schema::rename('desfile_entry_reservations', 'entry_reservations'); + + Schema::table('entry_reservations', function (Blueprint $table): void { + $table->foreignId('catalog_item_id')->nullable() + ->constrained('catalog_items')->restrictOnDelete(); + $table->unsignedBigInteger('variant_id')->nullable()->change(); + }); + + DB::table('entry_reservations')->update([ + 'catalog_item_id' => DB::raw('(SELECT catalog_item_id FROM variantes WHERE variantes.id = entry_reservations.variant_id)'), + ]); + + Schema::table('entry_reservations', function (Blueprint $table): void { + $table->unsignedBigInteger('catalog_item_id')->nullable(false)->change(); + }); + } + + public function down(): void + { + // The old schema cannot represent tickets without variants. Never discard them. + if (DB::table('entry_reservations')->whereNull('variant_id')->exists()) { + throw new LogicException('No se puede revertir mientras existan reservas sin variante.'); + } + + Schema::table('entry_reservations', function (Blueprint $table): void { + $table->dropConstrainedForeignId('catalog_item_id'); + $table->unsignedBigInteger('variant_id')->nullable(false)->change(); + }); + + Schema::rename('entry_reservations', 'desfile_entry_reservations'); + Schema::rename('reservation_batches', 'desfile_reservation_batches'); + } +}; diff --git a/tests/Feature/Desfile/EntryReservationServiceTest.php b/tests/Feature/Desfile/EntryReservationServiceTest.php index b3c54b19..14dee02e 100644 --- a/tests/Feature/Desfile/EntryReservationServiceTest.php +++ b/tests/Feature/Desfile/EntryReservationServiceTest.php @@ -136,6 +136,7 @@ class EntryReservationServiceTest extends TestCase (require database_path('migrations/2026_09_23_010000_create_desfile_entry_reservations_table.php'))->up(); (require database_path('migrations/2026_09_24_000000_add_administrative_entry_reservation_stock.php'))->up(); (require database_path('migrations/2026_09_24_010000_add_soft_deletes_to_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_10_02_000000_generalize_ticket_reservations.php'))->up(); DB::table('tenants')->insert(['codigo' => 'desfile_pura_tendencia']); DB::table('users')->insert(['id' => 1, 'tenant_codigo' => 'desfile_pura_tendencia']); DB::table('catalog_items')->insert([ @@ -200,8 +201,8 @@ class EntryReservationServiceTest extends TestCase $replayed = $service->reserve($user, $key, $this->rows()); $this->assertSame($result->pluck('id')->all(), $replayed->pluck('id')->all()); $this->assertDatabaseCount('tickets', 2); - $this->assertDatabaseCount('desfile_entry_reservations', 2); - $this->assertDatabaseCount('desfile_reservation_batches', 1); + $this->assertDatabaseCount('entry_reservations', 2); + $this->assertDatabaseCount('reservation_batches', 1); foreach (Inventory::all() as $inventory) { $this->assertSame(1, $inventory->entry_reserved_stock); $this->assertSame(1, $inventory->real_stock); @@ -223,7 +224,7 @@ class EntryReservationServiceTest extends TestCase $this->assertStringContainsString('Tipo: NORMAL, Sector: A, Fila: 3, Asiento: 17', $error->errors()['rows.1.variant_id'][0]); } $this->assertDatabaseCount('tickets', 0); - $this->assertDatabaseCount('desfile_entry_reservations', 0); + $this->assertDatabaseCount('entry_reservations', 0); $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); } @@ -236,8 +237,8 @@ class EntryReservationServiceTest extends TestCase $this->assertSame('Ticket generation failed', $error->getMessage()); } $this->assertDatabaseCount('tickets', 0); - $this->assertDatabaseCount('desfile_entry_reservations', 0); - $this->assertDatabaseCount('desfile_reservation_batches', 0); + $this->assertDatabaseCount('entry_reservations', 0); + $this->assertDatabaseCount('reservation_batches', 0); $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); } @@ -258,7 +259,7 @@ class EntryReservationServiceTest extends TestCase $service->cancel($user, $reservation->id); - $this->assertSoftDeleted('desfile_entry_reservations', ['id' => $reservation->id]); + $this->assertSoftDeleted('entry_reservations', ['id' => $reservation->id]); $this->assertNotNull(Ticket::findOrFail($reservation->ticket_id)->cancelled_at); $this->assertSame(0, Inventory::findOrFail(1)->entry_reserved_stock); $this->assertSame(1, Inventory::findOrFail(1)->availableStock()); @@ -280,7 +281,7 @@ class EntryReservationServiceTest extends TestCase $this->assertArrayHasKey('status', $error->errors()); } - $this->assertDatabaseHas('desfile_entry_reservations', [ + $this->assertDatabaseHas('entry_reservations', [ 'id' => $reservation->id, 'deleted_at' => null, ]); @@ -443,6 +444,7 @@ class EntryReservationServiceTest extends TestCase $service = new EntryReservationService(new TicketGeneratorService($validity)); $result = $service->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); foreach ($result as $reservation) { + $this->assertSame(1, $reservation->catalog_item_id); $this->assertDatabaseHas('tickets', [ 'id' => $reservation->ticket_id, 'user_id' => 1, 'source_variant_id' => $reservation->variant_id, diff --git a/tests/Feature/Forms/AdminAppDesfileEntryReservationFormControllerTest.php b/tests/Feature/Forms/AdminAppDesfileEntryReservationFormControllerTest.php index d7a90e93..6135e909 100644 --- a/tests/Feature/Forms/AdminAppDesfileEntryReservationFormControllerTest.php +++ b/tests/Feature/Forms/AdminAppDesfileEntryReservationFormControllerTest.php @@ -99,7 +99,7 @@ class AdminAppDesfileEntryReservationFormControllerTest extends TestCase ]); } if ($state === 'administrative') { - $variant->desfileEntryReservations()->create([ + $variant->entryReservations()->create([ 'fecha_reserva' => now(), 'importe' => 0, 'tipo_pago' => 'sin_cargo', ]); } @@ -111,7 +111,7 @@ class AdminAppDesfileEntryReservationFormControllerTest extends TestCase ->assertOk()->assertJsonCount(1, 'data.variants') ->assertJsonPath('data.variants.0.id', $availableId) ->assertJsonPath('data.fields.3.options', [['value' => '1', 'label' => '1']]); - $this->assertDatabaseCount('desfile_entry_reservations', 1); + $this->assertDatabaseCount('entry_reservations', 1); $this->assertSame(1, (int) Inventory::query()->sum('reserved_stock')); } diff --git a/tests/Feature/Migrations/GeneralizeTicketReservationsTest.php b/tests/Feature/Migrations/GeneralizeTicketReservationsTest.php new file mode 100644 index 00000000..0ae1e616 --- /dev/null +++ b/tests/Feature/Migrations/GeneralizeTicketReservationsTest.php @@ -0,0 +1,206 @@ +id(); + $table->string('codigo'); + }); + Schema::create('users', function (Blueprint $table): void { + $table->id(); + $table->softDeletes(); + }); + Schema::create('catalog_items', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->softDeletes(); + }); + Schema::create('variantes', function (Blueprint $table): void { + $table->id(); + $table->unsignedBigInteger('catalog_item_id'); + $table->softDeletes(); + }); + Schema::create('tickets', fn (Blueprint $table) => $table->id()); + Schema::create('inventories', fn (Blueprint $table) => $table->id()); + (require database_path('migrations/2026_09_23_010000_create_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_09_24_000000_add_administrative_entry_reservation_stock.php'))->up(); + (require database_path('migrations/2026_09_24_010000_add_soft_deletes_to_desfile_entry_reservations_table.php'))->up(); + DB::table('users')->insert(['id' => 1]); + DB::table('tenants')->insert([ + ['codigo' => 'desfile_pura_tendencia'], ['codigo' => 'other'], + ]); + DB::table('catalog_items')->insert([ + ['id' => 1, 'tenant_code' => 'desfile_pura_tendencia'], + ['id' => 2, 'tenant_code' => 'other'], + ]); + DB::table('variantes')->insert([ + ['id' => 1, 'catalog_item_id' => 1, 'deleted_at' => null], + ['id' => 2, 'catalog_item_id' => 2, 'deleted_at' => now()], + ]); + DB::table('tickets')->insert(['id' => 10]); + DB::table('inventories')->insert(['id' => 20, 'entry_reserved_stock' => 1]); + DB::table('desfile_reservation_batches')->insert([ + 'id' => 30, 'user_id' => 1, 'tenant_code' => 'desfile_pura_tendencia', + 'idempotency_key' => 'aab7c678-7f4d-486a-87ec-7f613ad6f58d', + 'request_hash' => str_repeat('a', 64), + 'created_at' => now(), 'updated_at' => now(), + ]); + DB::table('desfile_entry_reservations')->insert([ + ['id' => 40, 'variant_id' => 1, 'ticket_id' => 10, 'inventory_id' => 20, + 'batch_id' => 30, 'fecha_reserva' => now(), 'importe' => 250, + 'tipo_pago' => 'otro_metodo', 'deleted_at' => null], + ['id' => 41, 'variant_id' => 2, 'ticket_id' => null, 'inventory_id' => null, + 'batch_id' => null, 'fecha_reserva' => now(), 'importe' => 0, + 'tipo_pago' => 'sin_cargo', 'deleted_at' => now()], + ]); + } + + private function migration(): Migration + { + return require database_path('migrations/2026_10_02_000000_generalize_ticket_reservations.php'); + } + + public function test_upgrade_preserves_reservations_batches_stock_and_deleted_history(): void + { + $this->migration()->up(); + $this->assertFalse(Schema::hasTable('desfile_entry_reservations')); + $this->assertFalse(Schema::hasTable('desfile_reservation_batches')); + $this->assertDatabaseCount('entry_reservations', 2); + $this->assertDatabaseCount('reservation_batches', 1); + $reservation = EntryReservation::findOrFail(40); + $this->assertSame(1, $reservation->catalog_item_id); + $this->assertSame(1, $reservation->catalogItem->id); + $this->assertSame(30, $reservation->batch->id); + $this->assertSame(40, $reservation->batch->reservations->sole()->id); + $this->assertSame(10, $reservation->ticket->id); + $this->assertSame('250.00', $reservation->importe); + $this->assertSame(str_repeat('a', 64), $reservation->batch->request_hash); + $this->assertSame(1, $reservation->inventory->entry_reserved_stock); + $historical = EntryReservation::withTrashed()->findOrFail(41); + $this->assertTrue($historical->trashed()); + $this->assertTrue($historical->variant->trashed()); + $this->assertSame(2, $historical->catalog_item_id); + } + + public function test_reservations_can_belong_to_other_tenants_and_have_no_variant(): void + { + $this->migration()->up(); + $batch = ReservationBatch::create([ + 'user_id' => 1, 'tenant_code' => 'other', + 'idempotency_key' => '9495eb8e-a424-4f1b-8911-e05c51e1caf7', + 'request_hash' => str_repeat('b', 64), + ]); + $reservation = $batch->reservations()->create([ + 'catalog_item_id' => 2, 'fecha_reserva' => now(), + 'tipo_pago' => 'sin_cargo', 'importe' => 0, + ]); + $this->assertNull($reservation->variant_id); + $this->assertSame('other', $reservation->catalogItem->tenant_code); + $this->assertSame('other', $reservation->batch->tenant->codigo); + $this->assertSame(1, $reservation->batch->user->id); + } + + public function test_variant_based_callers_infer_the_catalog_item(): void + { + $this->migration()->up(); + $reservation = EntryReservation::create([ + 'variant_id' => 1, 'fecha_reserva' => now(), 'tipo_pago' => 'sin_cargo', + ]); + $this->assertSame(1, $reservation->fresh()->catalog_item_id); + } + + public function test_a_variant_from_another_catalog_item_is_rejected(): void + { + $this->migration()->up(); + $this->expectException(ValidationException::class); + EntryReservation::create([ + 'catalog_item_id' => 2, 'variant_id' => 1, + 'fecha_reserva' => now(), 'tipo_pago' => 'sin_cargo', + ]); + } + + public function test_the_catalog_item_is_required_at_the_database_level(): void + { + $this->migration()->up(); + $this->expectException(QueryException::class); + DB::table('entry_reservations')->insert([ + 'fecha_reserva' => now(), 'tipo_pago' => 'sin_cargo', + ]); + } + + public function test_upgrade_preserves_foreign_keys_and_batch_idempotency(): void + { + $this->migration()->up(); + $this->assertSame([], DB::select('PRAGMA foreign_key_check')); + foreach (['catalog_items' => 1, 'variantes' => 1, 'tickets' => 10, 'inventories' => 20, 'reservation_batches' => 30] as $table => $id) { + try { + DB::table($table)->where('id', $id)->delete(); + $this->fail("Expected {$table} to remain referenced"); + } catch (QueryException) { + $this->assertDatabaseHas($table, ['id' => $id]); + } + } + $batch = ReservationBatch::findOrFail(30); + $this->expectException(QueryException::class); + ReservationBatch::create($batch->only(['user_id', 'tenant_code', 'idempotency_key', 'request_hash'])); + } + + public function test_rollback_restores_the_original_schema_and_keeps_data(): void + { + $migration = $this->migration(); + $migration->up(); + $migration->down(); + $this->assertFalse(Schema::hasTable('entry_reservations')); + $this->assertFalse(Schema::hasTable('reservation_batches')); + $this->assertDatabaseCount('desfile_entry_reservations', 2); + $this->assertDatabaseCount('desfile_reservation_batches', 1); + $this->assertFalse(Schema::hasColumn('desfile_entry_reservations', 'catalog_item_id')); + $this->assertSame([], DB::select('PRAGMA foreign_key_check')); + $migration->up(); + $this->assertSame(1, EntryReservation::findOrFail(40)->catalog_item_id); + } + + public function test_rollback_does_not_discard_reservations_without_variants(): void + { + $migration = $this->migration(); + $migration->up(); + EntryReservation::create([ + 'catalog_item_id' => 2, 'fecha_reserva' => now(), 'tipo_pago' => 'sin_cargo', + ]); + try { + $migration->down(); + $this->fail('Expected incompatible rollback to be rejected'); + } catch (\LogicException) { + $this->assertDatabaseCount('entry_reservations', 3); + $this->assertTrue(Schema::hasTable('reservation_batches')); + } + } + + public function test_an_orphaned_catalog_is_rejected_before_renaming_tables(): void + { + DB::table('variantes')->where('id', 2)->update(['catalog_item_id' => 999]); + try { + $this->migration()->up(); + $this->fail('Expected orphaned catalog to be rejected'); + } catch (\LogicException) { + $this->assertDatabaseCount('desfile_entry_reservations', 2); + $this->assertFalse(Schema::hasTable('entry_reservations')); + } + } +} diff --git a/tests/Feature/Ticket/AdminAppTicketControllerTest.php b/tests/Feature/Ticket/AdminAppTicketControllerTest.php index 20f83794..0591e37a 100644 --- a/tests/Feature/Ticket/AdminAppTicketControllerTest.php +++ b/tests/Feature/Ticket/AdminAppTicketControllerTest.php @@ -13,8 +13,8 @@ use App\Domains\Core\Authorization\Enums\RoleCode; use App\Domains\Core\Menu\Models\Menu; use App\Domains\Core\Tenant\Models\AdminWebsiteType; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Domains\Ticketing\Ticket\Models\TicketRefund; use App\Shared\Attachable\Enums\AttachmentType; diff --git a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php index 3b698584..37e3a039 100644 --- a/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php +++ b/tests/Feature/Ticket/AdminAppTicketEventScopeTest.php @@ -72,7 +72,7 @@ class AdminAppTicketEventScopeTest extends TestCase $table->unsignedBigInteger('purchase_item_id'); $table->decimal('amount', 12, 2); }); - Schema::create('desfile_entry_reservations', function (Blueprint $table): void { + Schema::create('entry_reservations', function (Blueprint $table): void { $table->id(); $table->unsignedBigInteger('ticket_id'); $table->softDeletes(); diff --git a/tests/Feature/Desfile/EntryReservationSchemaTest.php b/tests/Feature/Ticket/EntryReservationSchemaTest.php similarity index 76% rename from tests/Feature/Desfile/EntryReservationSchemaTest.php rename to tests/Feature/Ticket/EntryReservationSchemaTest.php index 7cc68d82..8c97499f 100644 --- a/tests/Feature/Desfile/EntryReservationSchemaTest.php +++ b/tests/Feature/Ticket/EntryReservationSchemaTest.php @@ -1,6 +1,6 @@ assertTrue(Schema::hasColumns('desfile_entry_reservations', [ + $this->assertTrue(Schema::hasColumns('entry_reservations', [ 'id', + 'catalog_item_id', 'variant_id', 'fecha_reserva', 'importe', diff --git a/tests/Unit/Catalog/VariantAvailabilityTest.php b/tests/Unit/Catalog/VariantAvailabilityTest.php index 24b37cd7..3260e2fa 100644 --- a/tests/Unit/Catalog/VariantAvailabilityTest.php +++ b/tests/Unit/Catalog/VariantAvailabilityTest.php @@ -6,7 +6,7 @@ use App\Domains\Commerce\Catalog\Enums\InventoryPolicy; use App\Domains\Commerce\Catalog\Models\CatalogItem; use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Commerce\Catalog\Models\Variant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use Illuminate\Database\Eloquent\Collection; use Tests\TestCase; @@ -16,10 +16,10 @@ class VariantAvailabilityTest extends TestCase { $reserved = new Variant; $reserved->id = 1; - $reserved->setRelation('desfileEntryReservations', new Collection([new EntryReservation])); + $reserved->setRelation('entryReservations', new Collection([new EntryReservation])); $available = new Variant; $available->id = 2; - $available->setRelation('desfileEntryReservations', new Collection); + $available->setRelation('entryReservations', new Collection); $item = new CatalogItem(['inventory_policy' => InventoryPolicy::Unlimited]); $item->setRelation('variants', new Collection([$reserved, $available])); diff --git a/tests/Unit/Desfile/EntryReservationTest.php b/tests/Unit/Ticket/EntryReservationTest.php similarity index 80% rename from tests/Unit/Desfile/EntryReservationTest.php rename to tests/Unit/Ticket/EntryReservationTest.php index e422a693..0610355d 100644 --- a/tests/Unit/Desfile/EntryReservationTest.php +++ b/tests/Unit/Ticket/EntryReservationTest.php @@ -1,9 +1,9 @@ assertSame([ + 'catalog_item_id', 'variant_id', 'ticket_id', 'inventory_id', diff --git a/tests/Unit/Ticket/TicketTest.php b/tests/Unit/Ticket/TicketTest.php index e0f93480..3e946958 100644 --- a/tests/Unit/Ticket/TicketTest.php +++ b/tests/Unit/Ticket/TicketTest.php @@ -6,8 +6,8 @@ use App\Domains\Commerce\Catalog\Models\CatalogItem; use App\Domains\Commerce\Catalog\Models\Variant; use App\Domains\Core\Auth\Models\User; use App\Domains\Core\Tenant\Models\Tenant; -use App\Domains\Ticketing\Desfile\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType; +use App\Domains\Ticketing\Ticket\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Models\Ticket; use App\Domains\Ticketing\Ticket\Models\ValidityTime; use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity; -- 2.49.1 From ab5bc43760df5196748c3d83a1e0753256cd49f3 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:50:39 -0300 Subject: [PATCH 21/23] feat(ticket): implement EntryReservationService for managing ticket reservations --- .../Services/EntryReservationService.php | 291 +++++++++++ .../Ticket/EntryReservationServiceTest.php | 469 ++++++++++++++++++ 2 files changed, 760 insertions(+) create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationService.php create mode 100644 tests/Feature/Ticket/EntryReservationServiceTest.php diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php new file mode 100644 index 00000000..fdae5190 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php @@ -0,0 +1,291 @@ + + */ + public function reservations(User $user, array $filters = []): LengthAwarePaginator + { + return $this->reservationsQuery($user, $filters) + ->paginate(perPage: $filters['per_page'] ?? 15, page: $filters['page'] ?? 1) + ->withQueryString(); + } + + /** + * @param array{catalog_item_id?: int, variant_id?: int, tipo_pago?: string|null} $filters + * @return Collection + */ + public function reservationsForExport(User $user, array $filters = []): Collection + { + return $this->reservationsQuery($user, $filters)->get(); + } + + public function reservationTicket(User $user, int $reservationId, ?int $catalogItemId = null): Ticket + { + $reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId]) + ->whereKey($reservationId)->whereNotNull('ticket_id') + ->with(['ticket' => fn ($query) => $query->with([ + ...TicketValidityResolver::RELATIONS, + ...TicketPresentationResolver::RELATIONS, + ])])->firstOrFail(); + + return $reservation->ticket; + } + + public function cancel(User $user, int $reservationId, ?int $catalogItemId = null): void + { + DB::transaction(function () use ($user, $reservationId, $catalogItemId): void { + $reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId]) + ->whereKey($reservationId)->lockForUpdate()->firstOrFail(); + + if ($reservation->ticket_id !== null) { + $ticket = Ticket::query()->whereKey($reservation->ticket_id)->lockForUpdate()->firstOrFail(); + if (! $ticket->can_cancel()) { + throw ValidationException::withMessages([ + 'status' => 'El ticket debe estar activo para poder cancelar la reserva.', + ]); + } + $ticket->markAsCancelled(); + $ticket->save(); + } + + if ($reservation->inventory_id !== null) { + $inventory = Inventory::query()->whereKey($reservation->inventory_id)->lockForUpdate()->firstOrFail(); + $inventory->releaseEntry(1); + } + $reservation->delete(); + }, 3); + } + + /** + * Each row reserves one unit. Prices and inventory are resolved on the server. + * + * @param list $rows + * @return Collection + */ + public function reserve(User $user, string $key, array $rows): Collection + { + $validated = Validator::make(['idempotency_key' => $key, 'rows' => $rows], [ + 'idempotency_key' => ['required', 'uuid'], + 'rows' => ['required', 'array', 'list', 'min:1', 'max:100'], + 'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'], + 'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'], + 'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'], + 'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)], + ])->validate(); + $rows = array_map(fn (array $row): array => [ + 'catalog_item_id' => (int) $row['catalog_item_id'], + 'variant_id' => isset($row['variant_id']) ? (int) $row['variant_id'] : null, + 'tipo_pago' => $row['tipo_pago'], + ], $validated['rows']); + $hash = $this->requestHash($rows); + + return DB::transaction(function () use ($user, $key, $rows, $hash): Collection { + User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail(); + $tenant = $user->tenant()->firstOrFail(); + $batch = ReservationBatch::query()->where('user_id', $user->id) + ->where('idempotency_key', $key)->lockForUpdate()->first(); + if ($batch !== null) { + abort_unless($batch->tenant_code === $tenant->codigo && $this->matchesBatch($batch, $rows, $hash), + 409, 'La clave de envío ya fue utilizada con otra selección.'); + + return $batch->reservations()->with(['catalogItem', 'variant', 'ticket'])->orderBy('id')->get(); + } + + $items = CatalogItem::query()->forTenantCatalog($tenant) + ->whereKey(array_column($rows, 'catalog_item_id'))->orderBy('id')->lockForUpdate()->get()->keyBy('id'); + $variants = Variant::query()->whereIn('catalog_item_id', $items->keys()) + ->whereKey(array_filter(array_column($rows, 'variant_id'))) + ->orderBy('id')->lockForUpdate()->get()->keyBy('id'); + $variants->load(['eventDates', 'eventDate']); + $inventoryIds = $items->pluck('inventory_id')->merge($variants->pluck('inventory_id'))->filter()->unique(); + $inventories = Inventory::query()->whereKey($inventoryIds)->orderBy('id')->lockForUpdate()->get()->keyBy('id'); + $selections = []; + $requirements = []; + $errors = []; + + foreach ($rows as $index => $row) { + $item = $items->get($row['catalog_item_id']); + $variant = $row['variant_id'] !== null ? $variants->get($row['variant_id']) : null; + $field = $this->selectionField($row, $index); + if ($item === null || ! $item->has_tickets || ! $item->isSaleOpen()) { + $errors[$field] = 'El ítem no está disponible para reservar tickets en este catálogo.'; + + continue; + } + if ($item->isBundle()) { + $errors[$field] = 'Seleccioná el ítem que emite el ticket; los paquetes requieren reservar sus componentes.'; + + continue; + } + if ($row['variant_id'] !== null) { + if ($variant === null || $variant->catalog_item_id !== $item->id) { + $errors[$field] = 'La variante no pertenece al ítem del catálogo seleccionado.'; + + continue; + } + $variant->setRelation('catalogItem', $item); + if (! $variant->isSellable()) { + $errors[$field] = 'La variante ya no está disponible.'; + + continue; + } + } elseif ($item->variants()->exists()) { + $errors["rows.{$index}.variant_id"] = 'Seleccioná una variante del ítem del catálogo.'; + + continue; + } + + $selection = $variant ?? $item; + $inventory = $inventories->get($selection->inventory_id); + $tracked = $item->inventory_policy !== InventoryPolicy::Unlimited; + if ($inventory === null && ($selection->inventory_id !== null || $tracked)) { + $errors[$field] = 'La selección no tiene un inventario disponible.'; + + continue; + } + $selection->setRelation('inventory', $inventory); + $selections[$index] = ['item' => $item, 'variant' => $variant, 'inventory' => $inventory]; + if ($inventory !== null) { + $requirement = $requirements[$inventory->id] ?? ['quantity' => 0, 'tracked' => false]; + $requirements[$inventory->id] = [ + 'quantity' => $requirement['quantity'] + 1, + 'tracked' => $requirement['tracked'] || $tracked, + ]; + } + } + if ($errors !== []) { + throw ValidationException::withMessages($errors); + } + + foreach ($requirements as $inventoryId => $requirement) { + if ($requirement['tracked'] && $inventories[$inventoryId]->availableStock() < $requirement['quantity']) { + foreach ($selections as $index => $selection) { + if ($selection['inventory']?->id === $inventoryId) { + $errors[$this->selectionField($rows[$index], $index)] = 'No hay stock suficiente para reservar la selección.'; + } + } + } + } + if ($errors !== []) { + throw ValidationException::withMessages($errors); + } + + $batch = ReservationBatch::query()->create([ + 'user_id' => $user->id, 'tenant_code' => $tenant->codigo, + 'idempotency_key' => $key, 'request_hash' => $hash, + ]); + foreach ($requirements as $inventoryId => $requirement) { + $inventories[$inventoryId]->reserveEntry($requirement['quantity'], $requirement['tracked']); + } + + $reservations = collect(); + foreach ($selections as $index => $selection) { + $item = $selection['item']; + $variant = $selection['variant']; + try { + $ticket = $this->tickets->generate($item, $user, 1, $variant?->id)->sole(); + } catch (TicketGenerationException $exception) { + throw ValidationException::withMessages([ + $this->selectionField($rows[$index], $index) => 'No se pudo emitir el ticket. '.$exception->getMessage(), + ]); + } + $payment = EntryReservationPaymentType::from($rows[$index]['tipo_pago']); + $reservation = EntryReservation::query()->create([ + 'batch_id' => $batch->id, 'ticket_id' => $ticket->id, + 'catalog_item_id' => $variant?->catalog_item_id ?? $item->id, + 'variant_id' => $variant?->id, 'inventory_id' => $selection['inventory']?->id, + 'fecha_reserva' => now(), 'tipo_pago' => $payment, + 'importe' => $payment === EntryReservationPaymentType::Free ? 0 : ($variant ?? $item)->getPrice(), + ]); + $reservations->push($reservation->setRelation('ticket', $ticket) + ->setRelation('catalogItem', $item)->setRelation('variant', $variant)); + } + + return $reservations; + }, 3); + } + + /** @param array $filters */ + private function reservationsQuery(User $user, array $filters = []): Builder + { + abort_unless($user->tenant_codigo !== null && $user->tenant_codigo !== '', 403); + + return EntryReservation::query() + ->whereHas('catalogItem', fn (Builder $query) => $query->where('tenant_code', $user->tenant_codigo)) + ->when($filters['catalog_item_id'] ?? null, fn (Builder $query, int $id) => $query->where('catalog_item_id', $id)) + ->when($filters['variant_id'] ?? null, fn (Builder $query, int $id) => $query->where('variant_id', $id)) + ->when($filters['tipo_pago'] ?? null, fn (Builder $query, string $type) => $query->where('tipo_pago', $type)) + ->with(['catalogItem', 'variant']) + ->orderByDesc('fecha_reserva')->orderByDesc('id'); + } + + /** @param array{variant_id: int|null} $row */ + private function selectionField(array $row, int $index): string + { + return "rows.{$index}.".($row['variant_id'] !== null ? 'variant_id' : 'catalog_item_id'); + } + + /** @param list $rows */ + private function requestHash(array $rows): string + { + $normalized = collect($rows)->sortBy([ + ['catalog_item_id', 'asc'], ['variant_id', 'asc'], ['tipo_pago', 'asc'], + ])->values()->all(); + + return hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR)); + } + + /** @param list $rows */ + private function matchesBatch(ReservationBatch $batch, array $rows, string $hash): bool + { + if (hash_equals($batch->request_hash, $hash)) { + return true; + } + if (collect($rows)->contains(fn (array $row) => $row['variant_id'] === null)) { + return false; + } + + // Older batches fingerprinted variant and payment only. Check the persisted + // catalog IDs too, so compatibility cannot replay a different catalog item. + $legacyRows = collect($rows)->map(fn (array $row) => [ + 'variant_id' => $row['variant_id'], 'tipo_pago' => $row['tipo_pago'], + ])->sortBy('variant_id')->values()->all(); + $legacyHash = hash('sha256', json_encode($legacyRows, JSON_THROW_ON_ERROR)); + if (! hash_equals($batch->request_hash, $legacyHash)) { + return false; + } + $storedRows = $batch->reservations()->withTrashed()->get()->map(fn (EntryReservation $reservation) => [ + 'catalog_item_id' => $reservation->catalog_item_id, + 'variant_id' => $reservation->variant_id, + 'tipo_pago' => $reservation->tipo_pago->value, + ])->all(); + + return hash_equals($this->requestHash($storedRows), $hash); + } +} diff --git a/tests/Feature/Ticket/EntryReservationServiceTest.php b/tests/Feature/Ticket/EntryReservationServiceTest.php new file mode 100644 index 00000000..e62f6109 --- /dev/null +++ b/tests/Feature/Ticket/EntryReservationServiceTest.php @@ -0,0 +1,469 @@ +id(); + $table->string('tenant_codigo'); + $table->softDeletes(); + }); + Schema::create('tenants', function (Blueprint $table): void { + $table->id(); + $table->string('codigo')->unique(); + $table->unsignedBigInteger('active_event_id')->nullable(); + }); + Schema::create('catalog_items', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->string('slug'); + $table->string('nombre')->default('Entrada'); + $table->string('type')->default('standard'); + $table->unsignedBigInteger('inventory_id')->nullable(); + $table->string('inventory_policy'); + $table->decimal('precio', 10, 2); + $table->timestamp('sales_end_at')->nullable(); + $table->softDeletes(); + $table->boolean('has_tickets')->default(true); + $table->unsignedBigInteger('event_id')->nullable(); + }); + Schema::create('inventories', function (Blueprint $table): void { + $table->id(); + foreach (['real_stock', 'reserved_stock', 'sold_units', 'refunded_units'] as $column) { + $table->integer($column)->default(0); + } + }); + Schema::create('variantes', function (Blueprint $table): void { + $table->id(); + $table->foreignId('catalog_item_id'); + $table->foreignId('inventory_id'); + $table->decimal('precio', 10, 2); + $table->unsignedBigInteger('event_date_id')->nullable(); + $table->unsignedBigInteger('replaced_by_variant_id')->nullable(); + $table->timestamp('sales_disabled_at')->nullable(); + $table->softDeletes(); + }); + Schema::create('event_dates', function (Blueprint $table): void { + $table->id(); + $table->date('date'); + $table->time('time_start')->nullable(); + $table->unsignedBigInteger('rescheduled_to_event_date_id')->nullable(); + $table->timestamp('suspended_at')->nullable(); + }); + Schema::create('attribute', function (Blueprint $table): void { + $table->id(); + $table->string('codigo'); + $table->string('type')->default('string'); + }); + Schema::create('item_attributes', function (Blueprint $table): void { + $table->id(); + $table->foreignId('catalog_item_id'); + $table->foreignId('attribute_id'); + $table->boolean('allow_multi_select')->default(false); + $table->integer('sort_order')->default(0); + }); + Schema::create('attribute_options', function (Blueprint $table): void { + $table->id(); + $table->foreignId('attribute_id'); + $table->string('value'); + $table->string('label'); + $table->integer('sort_order')->default(0); + }); + Schema::create('variant_values', function (Blueprint $table): void { + $table->id(); + $table->foreignId('variant_id'); + $table->foreignId('item_attribute_id'); + $table->string('value'); + }); + Schema::create('variant_event_dates', function (Blueprint $table): void { + $table->foreignId('variant_id'); + $table->foreignId('event_date_id'); + }); + Schema::create('tickets', function (Blueprint $table): void { + $table->id(); + $table->foreignId('user_id'); + $table->foreignId('source_variant_id')->nullable(); + $table->string('tenant_code')->nullable(); + $table->uuid('ticket')->nullable()->unique(); + $table->unsignedBigInteger('source_catalog_item_id')->nullable(); + $table->unsignedBigInteger('source_purchase_item_id')->nullable(); + $table->unsignedBigInteger('event_id')->nullable(); + $table->timestamp('used_at')->nullable(); + $table->timestamp('disabled_at')->nullable(); + $table->timestamp('cancelled_at')->nullable(); + $table->timestamp('refunded_at')->nullable(); + }); + Schema::create('value_changes', function (Blueprint $table): void { + $table->id(); + $table->morphs('trackable'); + $table->string('tenant_code'); + $table->string('attribute'); + $table->text('old_value')->nullable(); + $table->text('new_value')->nullable(); + $table->timestamp('changed_at'); + $table->string('actor_type'); + $table->foreignId('user_id')->nullable(); + }); + (require database_path('migrations/2026_09_23_010000_create_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_09_24_000000_add_administrative_entry_reservation_stock.php'))->up(); + (require database_path('migrations/2026_09_24_010000_add_soft_deletes_to_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_10_02_000000_generalize_ticket_reservations.php'))->up(); + DB::table('tenants')->insert(['codigo' => 'ticket_shop']); + DB::table('users')->insert(['id' => 1, 'tenant_codigo' => 'ticket_shop']); + DB::table('catalog_items')->insert([ + 'id' => 1, 'tenant_code' => 'ticket_shop', 'slug' => 'entrada', + 'inventory_policy' => 'tracked', 'precio' => 100, + ]); + foreach ([1, 2] as $id) { + DB::table('inventories')->insert(['id' => $id, 'real_stock' => 3]); + DB::table('variantes')->insert(['id' => $id, 'catalog_item_id' => 1, 'inventory_id' => $id, 'precio' => 250]); + } + DB::table('tenants')->insert(['codigo' => 'other']); + DB::table('users')->insert(['id' => 2, 'tenant_codigo' => 'other']); + DB::table('inventories')->insert(['id' => 3, 'real_stock' => 3]); + DB::table('catalog_items')->insert([ + ['id' => 2, 'tenant_code' => 'ticket_shop', 'slug' => 'general', 'inventory_policy' => 'tracked', 'inventory_id' => 3, 'precio' => 700], + ['id' => 3, 'tenant_code' => 'other', 'slug' => 'other', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 900], + ['id' => 4, 'tenant_code' => 'ticket_shop', 'slug' => 'unlimited', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 500], + ]); + foreach (['tipo' => 'NORMAL', 'sector' => 'A', 'fila' => '3', 'asiento' => '17'] as $code => $value) { + $attributeId = DB::table('attribute')->insertGetId(['codigo' => $code]); + $itemAttributeId = DB::table('item_attributes')->insertGetId([ + 'catalog_item_id' => 1, + 'attribute_id' => $attributeId, + ]); + DB::table('attribute_options')->insert([ + 'attribute_id' => $attributeId, + 'value' => $value, + 'label' => $value, + ]); + foreach ([1, 2] as $variantId) { + DB::table('variant_values')->insert([ + 'variant_id' => $variantId, 'item_attribute_id' => $itemAttributeId, 'value' => $value, + ]); + } + } + } + + private function service(bool $failSecond = false): EntryReservationService + { + $generator = Mockery::mock(TicketGeneratorService::class); + $generator->shouldReceive('generate')->andReturnUsing(function ($item, $user, $quantity, $variantId) use ($failSecond) { + if ($failSecond && $item->id === 2) { + throw new \RuntimeException('Ticket generation failed'); + } + + return collect([Ticket::create([ + 'tenant_code' => $item->tenant_code, 'user_id' => $user->id, + 'source_catalog_item_id' => $item->id, 'source_variant_id' => $variantId, + 'ticket' => (string) Str::uuid(), + ])]); + }); + + return new EntryReservationService($generator); + } + + private function rows(): array + { + return [ + ['catalog_item_id' => 1, 'variant_id' => 1, 'tipo_pago' => 'sin_cargo'], + ['catalog_item_id' => 2, 'tipo_pago' => 'otro_metodo'], + ]; + } + + public function test_reserves_multiple_items_with_and_without_variants_and_replays_the_batch(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $result = $service->reserve($user, $key, $this->rows()); + $this->assertSame([1, 2], $result->pluck('catalog_item_id')->all()); + $this->assertSame([1, null], $result->pluck('variant_id')->all()); + $this->assertSame(['0.00', '700.00'], $result->pluck('importe')->all()); + $replay = $service->reserve($user, $key, array_reverse($this->rows())); + $this->assertSame($result->pluck('id')->all(), $replay->pluck('id')->all()); + $this->assertDatabaseCount('tickets', 2); + $this->assertDatabaseCount('entry_reservations', 2); + $this->assertDatabaseCount('reservation_batches', 1); + $this->assertSame(1, Inventory::findOrFail(1)->entry_reserved_stock); + $this->assertSame(1, Inventory::findOrFail(3)->entry_reserved_stock); + } + + public function test_repeated_variants_use_stock_instead_of_assuming_a_unique_seat(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $row = $this->rows()[0]; + $service->reserve($user, (string) Str::uuid(), [$row, $row]); + $service->reserve($user, (string) Str::uuid(), [$row]); + $this->assertSame(3, Inventory::findOrFail(1)->entry_reserved_stock); + $this->expectException(ValidationException::class); + $service->reserve($user, (string) Str::uuid(), [$row]); + } + + public function test_shared_inventory_is_checked_for_the_entire_batch(): void + { + DB::table('catalog_items')->where('id', 2)->update(['inventory_id' => 1]); + DB::table('inventories')->where('id', 1)->update(['real_stock' => 1]); + try { + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); + $this->fail('Expected insufficient shared stock'); + } catch (ValidationException $error) { + $this->assertSame(['rows.0.variant_id', 'rows.1.catalog_item_id'], array_keys($error->errors())); + } + $this->assertDatabaseCount('tickets', 0); + $this->assertDatabaseCount('reservation_batches', 0); + $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); + } + + public function test_ticket_failure_rolls_back_the_entire_batch(): void + { + try { + $this->service(true)->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); + $this->fail('Expected ticket failure'); + } catch (\RuntimeException $error) { + $this->assertSame('Ticket generation failed', $error->getMessage()); + } + $this->assertDatabaseCount('tickets', 0); + $this->assertDatabaseCount('entry_reservations', 0); + $this->assertDatabaseCount('reservation_batches', 0); + $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); + } + + public function test_an_item_from_another_tenant_is_rejected(): void + { + $this->expectException(ValidationException::class); + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), [ + ['catalog_item_id' => 3, 'tipo_pago' => 'sin_cargo'], + ]); + } + + public function test_a_variant_from_another_item_is_rejected(): void + { + $this->expectException(ValidationException::class); + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), [ + ['catalog_item_id' => 2, 'variant_id' => 1, 'tipo_pago' => 'sin_cargo'], + ]); + } + + public function test_a_variant_is_required_when_the_item_has_variants(): void + { + $this->expectException(ValidationException::class); + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), [ + ['catalog_item_id' => 1, 'tipo_pago' => 'sin_cargo'], + ]); + } + + public function test_disabled_variants_and_items_without_tickets_are_rejected(): void + { + DB::table('variantes')->where('id', 1)->update(['sales_disabled_at' => now()]); + DB::table('catalog_items')->where('id', 2)->update(['has_tickets' => false]); + try { + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); + $this->fail('Expected unavailable selection'); + } catch (ValidationException $error) { + $this->assertSame(['rows.0.variant_id', 'rows.1.catalog_item_id'], array_keys($error->errors())); + } + $this->assertDatabaseCount('entry_reservations', 0); + } + + public function test_the_active_event_limits_the_catalog_for_new_reservations(): void + { + DB::table('tenants')->where('codigo', 'ticket_shop')->update(['active_event_id' => 10]); + DB::table('catalog_items')->where('id', 1)->update(['event_id' => 10]); + DB::table('catalog_items')->where('id', 2)->update(['event_id' => 20]); + $this->expectException(ValidationException::class); + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); + } + + public function test_unlimited_items_can_emit_tickets_without_inventory(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $reservation = $service->reserve($user, (string) Str::uuid(), [ + ['catalog_item_id' => 4, 'tipo_pago' => 'otro_metodo'], + ])->sole(); + $this->assertNull($reservation->inventory_id); + $this->assertNull($reservation->variant_id); + $this->assertSame('500.00', $reservation->importe); + $service->cancel($user, $reservation->id); + $this->assertSoftDeleted('entry_reservations', ['id' => $reservation->id]); + } + + public function test_filters_and_exports_are_scoped_by_tenant_and_catalog_item(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $service->reserve($user, (string) Str::uuid(), $this->rows()); + $service->reserve(User::findOrFail(2), (string) Str::uuid(), [ + ['catalog_item_id' => 3, 'tipo_pago' => 'sin_cargo'], + ]); + $this->assertSame(2, $service->reservations($user)->total()); + $this->assertSame(1, $service->reservations($user, ['catalog_item_id' => 2, 'tipo_pago' => 'otro_metodo'])->total()); + $this->assertSame(1, $service->reservations($user, ['variant_id' => 1, 'per_page' => 1])->total()); + $this->assertSame(2, $service->reservationsForExport($user)->count()); + $this->assertSame(2, $service->reservationsForExport($user, ['catalog_item_id' => 2])->sole()->catalog_item_id); + $this->assertSame(0, $service->reservations($user, ['catalog_item_id' => 3])->total()); + } + + public function test_cancel_releases_stock_and_cancels_the_ticket_without_a_variant(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $reservation = $service->reserve($user, (string) Str::uuid(), [$this->rows()[1]])->sole(); + $service->cancel($user, $reservation->id, 2); + $this->assertSoftDeleted('entry_reservations', ['id' => $reservation->id]); + $this->assertNotNull(Ticket::findOrFail($reservation->ticket_id)->cancelled_at); + $this->assertSame(0, Inventory::findOrFail(3)->entry_reserved_stock); + $this->assertSame(0, $service->reservations($user)->total()); + } + + public function test_another_tenant_cannot_cancel_a_reservation(): void + { + $service = $this->service(); + $reservation = $service->reserve(User::findOrFail(1), (string) Str::uuid(), [$this->rows()[0]])->sole(); + $this->expectException(ModelNotFoundException::class); + $service->cancel(User::findOrFail(2), $reservation->id); + } + + public function test_cancellation_can_be_restricted_to_one_catalog_item_by_an_adapter(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $reservation = $service->reserve($user, (string) Str::uuid(), [$this->rows()[0]])->sole(); + $this->expectException(ModelNotFoundException::class); + $service->cancel($user, $reservation->id, 2); + } + + public function test_cancellation_does_not_release_stock_for_a_used_ticket(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $reservation = $service->reserve($user, (string) Str::uuid(), [$this->rows()[0]])->sole(); + Ticket::whereKey($reservation->ticket_id)->update(['used_at' => now()]); + try { + $service->cancel($user, $reservation->id); + $this->fail('Expected active ticket requirement'); + } catch (ValidationException $error) { + $this->assertArrayHasKey('status', $error->errors()); + } + $this->assertSame(1, Inventory::findOrFail(1)->entry_reserved_stock); + $this->assertDatabaseHas('entry_reservations', ['id' => $reservation->id, 'deleted_at' => null]); + } + + public function test_a_reused_key_with_a_different_item_is_rejected(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $service->reserve($user, $key, [$this->rows()[1]]); + try { + $service->reserve($user, $key, [['catalog_item_id' => 4, 'tipo_pago' => 'otro_metodo']]); + $this->fail('Expected idempotency conflict'); + } catch (HttpException $error) { + $this->assertSame(409, $error->getStatusCode()); + } + $this->assertDatabaseCount('tickets', 1); + } + + public function test_clients_cannot_supply_the_price(): void + { + $this->expectException(ValidationException::class); + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), [ + [...$this->rows()[0], 'importe' => 10], + ]); + } + + public function test_old_variant_only_batch_hashes_replay_including_cancelled_history(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $rows = [ + ['catalog_item_id' => 1, 'variant_id' => 1, 'tipo_pago' => 'sin_cargo'], + ['catalog_item_id' => 1, 'variant_id' => 2, 'tipo_pago' => 'otro_metodo'], + ]; + $result = $service->reserve($user, $key, $rows); + $legacyRows = array_map(fn ($row) => ['variant_id' => $row['variant_id'], 'tipo_pago' => $row['tipo_pago']], $rows); + DB::table('reservation_batches')->update([ + 'request_hash' => hash('sha256', json_encode($legacyRows, JSON_THROW_ON_ERROR)), + ]); + $service->cancel($user, $result->first()->id); + $replay = $service->reserve($user, $key, array_reverse($rows)); + $this->assertSame($result->last()->id, $replay->sole()->id); + $this->assertDatabaseCount('tickets', 2); + $this->assertDatabaseCount('reservation_batches', 1); + $this->assertSame(0, Inventory::findOrFail(1)->entry_reserved_stock); + $this->assertSame(1, Inventory::findOrFail(2)->entry_reserved_stock); + } + + public function test_old_batch_hashes_cannot_replay_with_a_different_catalog_item(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $service->reserve($user, $key, [$this->rows()[0]]); + DB::table('reservation_batches')->update([ + 'request_hash' => hash('sha256', json_encode([ + ['variant_id' => 1, 'tipo_pago' => 'sin_cargo'], + ], JSON_THROW_ON_ERROR)), + ]); + try { + $service->reserve($user, $key, [ + ['catalog_item_id' => 2, 'variant_id' => 1, 'tipo_pago' => 'sin_cargo'], + ]); + $this->fail('Expected legacy idempotency conflict'); + } catch (HttpException $error) { + $this->assertSame(409, $error->getStatusCode()); + } + $this->assertDatabaseCount('tickets', 1); + } + + public function test_ticket_download_selection_uses_tenant_and_catalog_item_scope(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $reservation = $service->reserve($user, (string) Str::uuid(), [$this->rows()[1]])->sole(); + $this->assertSame($reservation->ticket_id, $service->reservationTicket($user, $reservation->id, 2)->id); + $this->expectException(ModelNotFoundException::class); + $service->reservationTicket(User::findOrFail(2), $reservation->id); + } + + public function test_real_ticket_generator_links_each_catalog_item_and_optional_variant(): void + { + $validity = Mockery::mock(TicketValidityResolver::class); + $validity->shouldReceive('resolveVariant')->andReturn(ResolvedTicketValidity::unrestricted()); + $service = new EntryReservationService(new TicketGeneratorService($validity)); + $result = $service->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); + foreach ($result as $reservation) { + $this->assertDatabaseHas('tickets', [ + 'id' => $reservation->ticket_id, 'tenant_code' => 'ticket_shop', + 'source_catalog_item_id' => $reservation->catalog_item_id, + 'source_variant_id' => $reservation->variant_id, 'source_purchase_item_id' => null, + ]); + } + } +} -- 2.49.1 From f10237eb1f487b04c9fe65f500caa9f31bf6d7ca Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:50:47 -0300 Subject: [PATCH 22/23] feat(ticket): implement DesfileEntryReservationController and related services for ticket reservations --- ... => DesfileEntryReservationController.php} | 16 +- .../DesfileEntryReservationPolicy.php | 31 +++ .../DesfileEntryReservationService.php | 123 +++++++++ .../Services/EntryReservationService.php | 241 ------------------ app/Domains/Ticketing/Desfile/routes/api.php | 14 +- .../Services/EntryReservationPolicy.php | 21 ++ .../Services/EntryReservationService.php | 10 +- .../Desfile/EntryReservationServiceTest.php | 133 +++++++++- .../Ticket/EntryReservationServiceTest.php | 40 +++ 9 files changed, 365 insertions(+), 264 deletions(-) rename app/Domains/Ticketing/Desfile/Controllers/{EntryReservationController.php => DesfileEntryReservationController.php} (84%) create mode 100644 app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationPolicy.php create mode 100644 app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationService.php delete mode 100644 app/Domains/Ticketing/Desfile/Services/EntryReservationService.php create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationPolicy.php diff --git a/app/Domains/Ticketing/Desfile/Controllers/EntryReservationController.php b/app/Domains/Ticketing/Desfile/Controllers/DesfileEntryReservationController.php similarity index 84% rename from app/Domains/Ticketing/Desfile/Controllers/EntryReservationController.php rename to app/Domains/Ticketing/Desfile/Controllers/DesfileEntryReservationController.php index f9e1cc2b..abab64b4 100644 --- a/app/Domains/Ticketing/Desfile/Controllers/EntryReservationController.php +++ b/app/Domains/Ticketing/Desfile/Controllers/DesfileEntryReservationController.php @@ -6,18 +6,18 @@ use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource; +use App\Domains\Ticketing\Desfile\Services\DesfileEntryReservationService; use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService; use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService; -use App\Domains\Ticketing\Desfile\Services\EntryReservationService; use App\Domains\Ticketing\Ticket\Services\TicketPdfService; use App\Http\Controllers\Controller; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; use Illuminate\Http\Response; use Symfony\Component\HttpFoundation\StreamedResponse; -class EntryReservationController extends Controller +class DesfileEntryReservationController extends Controller { - public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection + public function index(IndexEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection { return EntryReservationResource::collection( $service->reservations($request->user(), $request->validated()), @@ -26,7 +26,7 @@ class EntryReservationController extends Controller public function downloadPdf( ExportEntryReservationsRequest $request, - EntryReservationService $service, + DesfileEntryReservationService $service, EntryReservationPdfService $pdf, ): Response { $user = $request->user(); @@ -40,7 +40,7 @@ class EntryReservationController extends Controller public function downloadExcel( ExportEntryReservationsRequest $request, - EntryReservationService $service, + DesfileEntryReservationService $service, EntryReservationExcelService $excel, ): StreamedResponse { $user = $request->user(); @@ -55,7 +55,7 @@ class EntryReservationController extends Controller public function downloadTicketPdf( IndexEntryReservationsRequest $request, int $reservation, - EntryReservationService $service, + DesfileEntryReservationService $service, TicketPdfService $pdf, ): Response { $user = $request->user(); @@ -66,7 +66,7 @@ class EntryReservationController extends Controller ); } - public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection + public function store(StoreEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection { return EntryReservationResource::collection($service->reserve( $request->user(), $request->validated('idempotency_key'), $request->validated('rows'), @@ -76,7 +76,7 @@ class EntryReservationController extends Controller public function destroy( IndexEntryReservationsRequest $request, int $reservation, - EntryReservationService $service, + DesfileEntryReservationService $service, ): Response { $service->cancel($request->user(), $reservation); diff --git a/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationPolicy.php b/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationPolicy.php new file mode 100644 index 00000000..fcf1a4ba --- /dev/null +++ b/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationPolicy.php @@ -0,0 +1,31 @@ + $selection) { + $variant = $selection['variant']; + if ($variant === null || $selection['inventory'] === null + || isset($seen[$variant->id]) + || $variant->entryReservations()->lockForUpdate()->get()->isNotEmpty()) { + $errors["rows.{$index}.variant_id"] = 'La entrada ya no está disponible.'; + } + if ($variant !== null) { + $seen[$variant->id] = true; + } + } + + if ($errors !== []) { + throw ValidationException::withMessages($errors); + } + } +} diff --git a/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationService.php b/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationService.php new file mode 100644 index 00000000..efade1e3 --- /dev/null +++ b/app/Domains/Ticketing/Desfile/Services/DesfileEntryReservationService.php @@ -0,0 +1,123 @@ + + */ + public function reservations(User $user, array $filters = []): LengthAwarePaginator + { + $result = $this->reservations->reservations($user, [ + ...$filters, 'catalog_item_id' => $this->entryId($user), + ]); + $result->getCollection()->loadMissing(self::SELECTION_RELATIONS); + + return $result; + } + + /** + * @param array{tipo_pago?: string|null} $filters + * @return Collection + */ + public function reservationsForExport(User $user, array $filters = []): Collection + { + return $this->reservations->reservationsForExport($user, [ + ...$filters, 'catalog_item_id' => $this->entryId($user), + ])->loadMissing(self::SELECTION_RELATIONS); + } + + public function reservationTicket(User $user, int $reservationId): Ticket + { + return $this->reservations->reservationTicket($user, $reservationId, $this->entryId($user)); + } + + public function cancel(User $user, int $reservationId): void + { + $this->reservations->cancel($user, $reservationId, $this->entryId($user)); + } + + /** @param list $rows */ + public function reserve(User $user, string $key, array $rows): Collection + { + $this->authorize($user); + $entry = CatalogItem::query()->where('tenant_code', $user->tenant_codigo) + ->where('slug', 'entrada')->firstOrFail(); + $catalogRows = array_map(fn (array $row): array => [ + ...$row, 'catalog_item_id' => $entry->id, + ], $rows); + + try { + return $this->reservations->reserve($user, $key, $catalogRows, $this->policy) + ->loadMissing(self::SELECTION_RELATIONS); + } catch (ValidationException $exception) { + // Keep the row fields used by the form and describe the selected seat. + $variants = $entry->variants()->whereKey(array_column($rows, 'variant_id')) + ->with(['definitions.itemAttribute.attribute.options'])->get()->keyBy('id'); + $errors = []; + foreach ($exception->errors() as $field => $messages) { + if (preg_match('/^rows\.(\d+)\.variant_id$/', $field, $match)) { + $index = (int) $match[1]; + $label = $this->entryLabel($variants->get($rows[$index]['variant_id'] ?? null), $index); + $messages = array_map(fn (string $message): string => $label.': '.$message, $messages); + } + $errors[$field] = $messages; + } + + throw ValidationException::withMessages($errors); + } + } + + private function authorize(User $user): void + { + abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); + } + + private function entryId(User $user): int + { + $this->authorize($user); + + // Historical reservations remain accessible when the active event changes. + // A missing entry must not remove the catalog filter from the generic query. + return CatalogItem::query()->where('tenant_code', $user->tenant_codigo) + ->where('slug', 'entrada')->value('id') ?? -1; + } + + private function entryLabel(?Variant $variant, int $index): string + { + if ($variant === null) { + return 'Entrada '.($index + 1); + } + + $values = $variant->selectionValues(); + + return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento']) + ->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar')) + ->implode(', '); + } +} diff --git a/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php b/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php deleted file mode 100644 index 2f2bd734..00000000 --- a/app/Domains/Ticketing/Desfile/Services/EntryReservationService.php +++ /dev/null @@ -1,241 +0,0 @@ - - */ - public function reservations(User $user, array $filters = []): LengthAwarePaginator - { - abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); - - return $this->reservationsQuery($user, $filters) - ->paginate( - perPage: $filters['per_page'] ?? 15, - pageName: 'page', - page: $filters['page'] ?? 1, - ) - ->withQueryString(); - } - - /** - * @param array{tipo_pago?: string|null} $filters - * @return Collection - */ - public function reservationsForExport(User $user, array $filters = []): Collection - { - abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); - - return $this->reservationsQuery($user, $filters)->get(); - } - - public function reservationTicket(User $user, int $reservationId): Ticket - { - abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); - - $reservation = EntryReservation::query() - ->whereKey($reservationId) - ->whereNotNull('ticket_id') - ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query - ->where('tenant_code', $user->tenant_codigo) - ->where('slug', 'entrada')) - ->with(['ticket' => fn ($query) => $query->with([ - ...TicketValidityResolver::RELATIONS, - ...TicketPresentationResolver::RELATIONS, - ])]) - ->firstOrFail(); - - return $reservation->ticket; - } - - public function cancel(User $user, int $reservationId): void - { - abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); - - DB::transaction(function () use ($user, $reservationId): void { - $reservation = EntryReservation::query() - ->whereKey($reservationId) - ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query - ->where('tenant_code', $user->tenant_codigo) - ->where('slug', 'entrada')) - ->lockForUpdate() - ->firstOrFail(); - - if ($reservation->ticket_id !== null) { - $ticket = Ticket::query()->lockForUpdate()->findOrFail($reservation->ticket_id); - - if (! $ticket->can_cancel()) { - throw ValidationException::withMessages([ - 'status' => 'El ticket debe estar activo para poder cancelar la reserva.', - ]); - } - - $ticket->markAsCancelled(); - $ticket->save(); - } - - if ($reservation->inventory_id !== null) { - $inventory = Inventory::query()->lockForUpdate()->findOrFail($reservation->inventory_id); - $inventory->releaseEntry(1); - } - - $reservation->delete(); - }, 3); - } - - /** @param array{tipo_pago?: string|null} $filters */ - private function reservationsQuery(User $user, array $filters = []): Builder - { - return EntryReservation::query() - ->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query - ->where('tenant_code', $user->tenant_codigo) - ->where('slug', 'entrada')) - ->when( - $filters['tipo_pago'] ?? null, - fn (Builder $query, string $paymentType): Builder => $query->where('tipo_pago', $paymentType), - ) - ->with([ - 'variant.catalogItem.itemAttributes.attribute.options', - 'variant.definitions.itemAttribute.attribute.options', - 'variant.eventDates', - 'variant.eventDate', - ]) - ->orderByDesc('fecha_reserva') - ->orderByDesc('id'); - } - - /** @param list $rows */ - public function reserve(User $user, string $key, array $rows): Collection - { - abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403); - $normalized = collect($rows)->map(fn (array $row): array => [ - 'variant_id' => (int) $row['variant_id'], 'tipo_pago' => $row['tipo_pago'], - ])->sortBy('variant_id')->values()->all(); - $hash = hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR)); - - return DB::transaction(function () use ($user, $key, $rows, $hash): Collection { - // Serialize retries by the same administrator, including the first insert. - User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail(); - $batch = ReservationBatch::query() - ->where('user_id', $user->id)->where('idempotency_key', $key)->lockForUpdate()->first(); - if ($batch !== null) { - abort_unless($batch->tenant_code === $user->tenant_codigo && hash_equals($batch->request_hash, $hash), 409, - 'La clave de envío ya fue utilizada con otras entradas.'); - - return EntryReservation::query()->where('batch_id', $batch->id)->with('ticket')->orderBy('id')->get(); - } - - $tenant = $user->tenant()->firstOrFail(); - $entry = CatalogItem::query()->forTenantCatalog($tenant)->where('slug', 'entrada') - ->lockForUpdate()->firstOrFail(); - $ids = array_column($rows, 'variant_id'); - $variants = $entry->variants()->whereKey($ids)->orderBy('id')->lockForUpdate()->get(); - $inventories = Inventory::query()->whereKey($variants->pluck('inventory_id')->filter()->unique()) - ->orderBy('id')->lockForUpdate()->get()->keyBy('id'); - $variants->load([ - 'eventDates', 'eventDate', - 'entryReservations' => fn ($query) => $query->lockForUpdate(), - ]); - foreach ($variants as $variant) { - $variant->setRelation('inventory', $inventories->get($variant->inventory_id)); - } - $entry->setRelation('variants', $variants); - $available = $entry->visibleVariants()->keyBy('id'); - $requirements = []; - $errors = []; - foreach ($rows as $index => $row) { - $variant = $available->get($row['variant_id']); - if ($variant === null || $variant->inventory === null) { - $errors["rows.{$index}.variant_id"] = $this->entryLabel($variants->firstWhere('id', $row['variant_id']), $index).': la entrada ya no está disponible.'; - - continue; - } - $requirements[$variant->inventory_id] = ($requirements[$variant->inventory_id] ?? 0) + 1; - } - if ($errors !== []) { - throw ValidationException::withMessages($errors); - } - $tracked = $entry->inventory_policy !== InventoryPolicy::Unlimited; - foreach ($requirements as $inventoryId => $quantity) { - if ($tracked && $inventories[$inventoryId]->availableStock() < $quantity) { - foreach ($rows as $index => $row) { - $variant = $available[$row['variant_id']]; - if ($variant->inventory_id === $inventoryId) { - $errors["rows.{$index}.variant_id"] = $this->entryLabel($variant, $index).': no hay stock suficiente para reservar las entradas seleccionadas.'; - } - } - } - } - if ($errors !== []) { - throw ValidationException::withMessages($errors); - } - - $batch = ReservationBatch::query()->create([ - 'user_id' => $user->id, 'tenant_code' => $tenant->codigo, - 'idempotency_key' => $key, 'request_hash' => $hash, - ]); - foreach ($requirements as $inventoryId => $quantity) { - $inventories[$inventoryId]->reserveEntry($quantity, $tracked); - } - $reservations = collect(); - foreach ($rows as $index => $row) { - $variant = $available[$row['variant_id']]; - $payment = EntryReservationPaymentType::from($row['tipo_pago']); - try { - $ticket = $this->tickets->generate($entry, $user, 1, $variant->id)->sole(); - } catch (TicketGenerationException $exception) { - throw ValidationException::withMessages([ - "rows.{$index}.variant_id" => $this->entryLabel($variant, $index).': no se pudo emitir el ticket. '.$exception->getMessage(), - ]); - } - $reservation = EntryReservation::query()->create([ - 'batch_id' => $batch->id, 'ticket_id' => $ticket->id, - 'catalog_item_id' => $entry->id, - 'variant_id' => $variant->id, 'inventory_id' => $variant->inventory_id, - 'fecha_reserva' => now(), 'tipo_pago' => $payment, - 'importe' => $payment === EntryReservationPaymentType::Free ? 0 : $variant->getPrice(), - ]); - $reservations->push($reservation->setRelation('ticket', $ticket)); - } - - return $reservations; - }, 3); - } - - private function entryLabel(?Variant $variant, int $index): string - { - if ($variant === null) { - return 'Entrada '.($index + 1); - } - - $values = $variant->selectionValues(); - - return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento']) - ->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar')) - ->implode(', '); - } -} diff --git a/app/Domains/Ticketing/Desfile/routes/api.php b/app/Domains/Ticketing/Desfile/routes/api.php index f588ecdf..b4bb51b3 100644 --- a/app/Domains/Ticketing/Desfile/routes/api.php +++ b/app/Domains/Ticketing/Desfile/routes/api.php @@ -1,26 +1,26 @@ middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.index'); -Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf']) +Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [DesfileEntryReservationController::class, 'downloadPdf']) ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.pdf'); -Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel']) +Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [DesfileEntryReservationController::class, 'downloadExcel']) ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.excel'); -Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf']) +Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [DesfileEntryReservationController::class, 'downloadTicketPdf']) ->whereNumber('reservation') ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.ticket.pdf'); -Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store']) +Route::post('v1/adminapp/tenant/desfile/entry-reservations', [DesfileEntryReservationController::class, 'store']) ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.store'); -Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy']) +Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [DesfileEntryReservationController::class, 'destroy']) ->whereNumber('reservation') ->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas']) ->name('adminapp.desfile.entry-reservations.destroy'); diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationPolicy.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationPolicy.php new file mode 100644 index 00000000..2debd5ac --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationPolicy.php @@ -0,0 +1,21 @@ + $selections + * + * @throws ValidationException + */ + public function validate(array $selections): void; +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php index fdae5190..3b64572f 100644 --- a/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php @@ -13,8 +13,8 @@ use App\Domains\Ticketing\Ticket\Models\EntryReservation; use App\Domains\Ticketing\Ticket\Models\ReservationBatch; use App\Domains\Ticketing\Ticket\Models\Ticket; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; @@ -88,7 +88,7 @@ class EntryReservationService * @param list $rows * @return Collection */ - public function reserve(User $user, string $key, array $rows): Collection + public function reserve(User $user, string $key, array $rows, ?EntryReservationPolicy $policy = null): Collection { $validated = Validator::make(['idempotency_key' => $key, 'rows' => $rows], [ 'idempotency_key' => ['required', 'uuid'], @@ -105,7 +105,7 @@ class EntryReservationService ], $validated['rows']); $hash = $this->requestHash($rows); - return DB::transaction(function () use ($user, $key, $rows, $hash): Collection { + return DB::transaction(function () use ($user, $key, $rows, $hash, $policy): Collection { User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail(); $tenant = $user->tenant()->firstOrFail(); $batch = ReservationBatch::query()->where('user_id', $user->id) @@ -183,6 +183,8 @@ class EntryReservationService throw ValidationException::withMessages($errors); } + $policy?->validate($selections); + foreach ($requirements as $inventoryId => $requirement) { if ($requirement['tracked'] && $inventories[$inventoryId]->availableStock() < $requirement['quantity']) { foreach ($selections as $index => $selection) { @@ -204,7 +206,7 @@ class EntryReservationService $inventories[$inventoryId]->reserveEntry($requirement['quantity'], $requirement['tracked']); } - $reservations = collect(); + $reservations = new Collection; foreach ($selections as $index => $selection) { $item = $selection['item']; $variant = $selection['variant']; diff --git a/tests/Feature/Desfile/EntryReservationServiceTest.php b/tests/Feature/Desfile/EntryReservationServiceTest.php index 14dee02e..866b55ef 100644 --- a/tests/Feature/Desfile/EntryReservationServiceTest.php +++ b/tests/Feature/Desfile/EntryReservationServiceTest.php @@ -9,15 +9,18 @@ use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest; use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource; +use App\Domains\Ticketing\Desfile\Services\DesfileEntryReservationPolicy; +use App\Domains\Ticketing\Desfile\Services\DesfileEntryReservationService; use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService; use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService; use App\Domains\Ticketing\Desfile\Services\EntryReservationReportService; -use App\Domains\Ticketing\Desfile\Services\EntryReservationService; use App\Domains\Ticketing\Ticket\Models\Ticket; +use App\Domains\Ticketing\Ticket\Services\EntryReservationService as TicketEntryReservationService; use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity; use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService; use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver; use Barryvdh\DomPDF\ServiceProvider as DomPdfServiceProvider; +use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Schema\Blueprint; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -166,7 +169,12 @@ class EntryReservationServiceTest extends TestCase } } - private function service(bool $failSecond = false): EntryReservationService + private function service(bool $failSecond = false): DesfileEntryReservationService + { + return new DesfileEntryReservationService($this->ticketService($failSecond), new DesfileEntryReservationPolicy); + } + + private function ticketService(bool $failSecond = false): TicketEntryReservationService { $generator = Mockery::mock(TicketGeneratorService::class); $generator->shouldReceive('generate')->andReturnUsing(function ($entry, $user, $quantity, $variantId) use ($failSecond) { @@ -183,7 +191,7 @@ class EntryReservationServiceTest extends TestCase return collect([Ticket::query()->findOrFail($id)]); }); - return new EntryReservationService($generator); + return new TicketEntryReservationService($generator); } private function rows(): array @@ -251,6 +259,120 @@ class EntryReservationServiceTest extends TestCase $service->reserve($user, (string) Str::uuid(), $this->rows()); } + public function test_a_seat_cannot_be_reserved_twice_even_when_inventory_has_more_stock(): void + { + DB::table('inventories')->where('id', 1)->update(['real_stock' => 3]); + $service = $this->service(); + $user = User::findOrFail(1); + $row = $this->rows()[0]; + $reservation = $service->reserve($user, (string) Str::uuid(), [$row])->sole(); + + try { + $service->reserve($user, (string) Str::uuid(), [$row]); + $this->fail('Expected a unique seat despite remaining stock'); + } catch (ValidationException $error) { + $this->assertArrayHasKey('rows.0.variant_id', $error->errors()); + $this->assertStringContainsString('Asiento: 17', $error->errors()['rows.0.variant_id'][0]); + } + $this->assertDatabaseCount('tickets', 1); + $this->assertDatabaseCount('reservation_batches', 1); + $this->assertSame(1, Inventory::findOrFail(1)->entry_reserved_stock); + + $service->cancel($user, $reservation->id); + $replacement = $service->reserve($user, (string) Str::uuid(), [$row])->sole(); + $this->assertNotSame($reservation->id, $replacement->id); + $this->assertSame(1, Inventory::findOrFail(1)->entry_reserved_stock); + } + + public function test_duplicate_seats_in_one_batch_are_rejected_without_changing_stock(): void + { + DB::table('inventories')->where('id', 1)->update(['real_stock' => 3]); + $row = $this->rows()[0]; + try { + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), [$row, $row]); + $this->fail('Expected duplicate seat validation'); + } catch (ValidationException $error) { + $this->assertArrayHasKey('rows.1.variant_id', $error->errors()); + } + $this->assertDatabaseCount('tickets', 0); + $this->assertDatabaseCount('reservation_batches', 0); + $this->assertSame(0, Inventory::findOrFail(1)->entry_reserved_stock); + } + + public function test_legacy_batches_replay_after_cancellation_and_an_active_event_change(): void + { + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $result = $service->reserve($user, $key, $this->rows()); + DB::table('reservation_batches')->update([ + 'request_hash' => hash('sha256', json_encode($this->rows(), JSON_THROW_ON_ERROR)), + ]); + $service->cancel($user, $result->first()->id); + DB::table('tenants')->update(['active_event_id' => 20]); + + $replay = $service->reserve($user, $key, array_reverse($this->rows())); + + $this->assertSame($result->last()->id, $replay->sole()->id); + $this->assertSame($result->last()->id, $service->reservations($user)->sole()->id); + $this->assertSame($result->last()->ticket_id, $service->reservationTicket($user, $result->last()->id)->id); + $this->assertSame('NORMAL', $replay->sole()->variant->selectionValues()->get('tipo')); + $this->assertDatabaseCount('tickets', 2); + $this->assertDatabaseCount('reservation_batches', 1); + } + + public function test_desfile_cannot_list_export_download_or_cancel_other_catalog_item_reservations(): void + { + DB::table('catalog_items')->insert([ + 'id' => 2, 'tenant_code' => 'desfile_pura_tendencia', 'slug' => 'other-ticket', + 'inventory_policy' => 'tracked', 'precio' => 100, + ]); + DB::table('inventories')->insert(['id' => 3, 'real_stock' => 1]); + DB::table('variantes')->insert(['id' => 3, 'catalog_item_id' => 2, 'inventory_id' => 3, 'precio' => 100]); + $user = User::findOrFail(1); + $other = $this->ticketService()->reserve($user, (string) Str::uuid(), [ + ['catalog_item_id' => 2, 'variant_id' => 3, 'tipo_pago' => 'sin_cargo'], + ])->sole(); + $service = $this->service(); + $own = $service->reserve($user, (string) Str::uuid(), [$this->rows()[0]])->sole(); + + $this->assertSame([$own->id], $service->reservations($user)->pluck('id')->all()); + $this->assertSame([$own->id], $service->reservationsForExport($user)->pluck('id')->all()); + foreach (['reservationTicket', 'cancel'] as $method) { + try { + $service->$method($user, $other->id); + $this->fail('Expected the Desfile catalog scope'); + } catch (ModelNotFoundException) { + $this->assertNull(Ticket::findOrFail($other->ticket_id)->cancelled_at); + } + } + + DB::table('catalog_items')->where('id', 1)->update(['deleted_at' => now()]); + $this->assertSame(0, $service->reservations($user)->total()); + $this->assertCount(0, $service->reservationsForExport($user)); + } + + public function test_desfile_service_rejects_other_tenants_for_every_operation(): void + { + $user = new User(['tenant_codigo' => 'other']); + $service = $this->service(); + $operations = [ + fn () => $service->reservations($user), + fn () => $service->reservationsForExport($user), + fn () => $service->reservationTicket($user, 1), + fn () => $service->cancel($user, 1), + fn () => $service->reserve($user, (string) Str::uuid(), $this->rows()), + ]; + foreach ($operations as $operation) { + try { + $operation(); + $this->fail('Expected the Desfile tenant restriction'); + } catch (HttpException $error) { + $this->assertSame(403, $error->getStatusCode()); + } + } + } + public function test_it_cancels_the_ticket_releases_stock_and_soft_deletes_the_reservation(): void { $service = $this->service(); @@ -441,7 +563,10 @@ class EntryReservationServiceTest extends TestCase $validity->shouldReceive('resolveVariant')->andReturn( ResolvedTicketValidity::unrestricted(), ); - $service = new EntryReservationService(new TicketGeneratorService($validity)); + $service = new DesfileEntryReservationService( + new TicketEntryReservationService(new TicketGeneratorService($validity)), + new DesfileEntryReservationPolicy, + ); $result = $service->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows()); foreach ($result as $reservation) { $this->assertSame(1, $reservation->catalog_item_id); diff --git a/tests/Feature/Ticket/EntryReservationServiceTest.php b/tests/Feature/Ticket/EntryReservationServiceTest.php index e62f6109..7f73c3d2 100644 --- a/tests/Feature/Ticket/EntryReservationServiceTest.php +++ b/tests/Feature/Ticket/EntryReservationServiceTest.php @@ -5,6 +5,7 @@ namespace Tests\Feature\Ticket; use App\Domains\Commerce\Catalog\Models\Inventory; use App\Domains\Core\Auth\Models\User; use App\Domains\Ticketing\Ticket\Models\Ticket; +use App\Domains\Ticketing\Ticket\Services\EntryReservationPolicy; use App\Domains\Ticketing\Ticket\Services\EntryReservationService; use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity; use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService; @@ -224,6 +225,45 @@ class EntryReservationServiceTest extends TestCase $service->reserve($user, (string) Str::uuid(), [$row]); } + public function test_custom_policy_validates_resolved_selections_inside_the_transaction_before_stock_changes(): void + { + $policy = Mockery::mock(EntryReservationPolicy::class); + $policy->shouldReceive('validate')->once()->andReturnUsing(function (array $selections): void { + $this->assertGreaterThan(0, DB::transactionLevel()); + $this->assertSame(1, $selections[0]['item']->id); + $this->assertSame(1, $selections[0]['variant']->id); + $this->assertSame(2, $selections[1]['item']->id); + $this->assertNull($selections[1]['variant']); + $this->assertSame(0, $selections[0]['inventory']->entry_reserved_stock); + throw ValidationException::withMessages(['rows.0.variant_id' => 'Custom selection rule.']); + }); + + try { + $this->service()->reserve(User::findOrFail(1), (string) Str::uuid(), $this->rows(), $policy); + $this->fail('Expected custom selection validation'); + } catch (ValidationException $error) { + $this->assertSame(['rows.0.variant_id' => ['Custom selection rule.']], $error->errors()); + } + $this->assertDatabaseCount('tickets', 0); + $this->assertDatabaseCount('reservation_batches', 0); + $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); + } + + public function test_idempotent_replays_do_not_validate_the_custom_policy_again(): void + { + $policy = Mockery::mock(EntryReservationPolicy::class); + $policy->shouldReceive('validate')->once(); + $service = $this->service(); + $user = User::findOrFail(1); + $key = (string) Str::uuid(); + $result = $service->reserve($user, $key, $this->rows(), $policy); + $replay = $service->reserve($user, $key, array_reverse($this->rows()), $policy); + + $this->assertSame($result->pluck('id')->all(), $replay->pluck('id')->all()); + $this->assertDatabaseCount('tickets', 2); + $this->assertSame(1, Inventory::findOrFail(1)->entry_reserved_stock); + } + public function test_shared_inventory_is_checked_for_the_entire_batch(): void { DB::table('catalog_items')->where('id', 2)->update(['inventory_id' => 1]); -- 2.49.1 From 45e92602ed375ea57a54fd3bd2dfa811fe4500a9 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 12:20:25 -0300 Subject: [PATCH 23/23] feat(ticketing): add entry reservations management for admin app - Introduced new routes for entry reservations in admin app, including form, index, store, and download functionalities. - Created a migration to add the "Reserva de Tickets" menu item to the admin app. - Updated MenuSeeder to include the new menu item for ticket reservations. - Developed a PDF view for entry reservations. - Implemented tests for the EntryReservationController and EntryReservationService to ensure proper functionality and access control. - Refactored test setup to use a dedicated schema creation trait for better isolation and maintainability. --- .../AdminApp/EntryReservationController.php | 94 ++++++ .../ExportEntryReservationsRequest.php | 13 + .../IndexEntryReservationsRequest.php | 26 ++ .../StoreEntryReservationsRequest.php | 21 ++ .../EntryReservationFormResource.php | 14 + .../Resources/EntryReservationResource.php | 28 ++ .../Services/EntryReservationExcelService.php | 89 +++++ .../Services/EntryReservationFormService.php | 65 ++++ .../Services/EntryReservationPdfService.php | 51 +++ .../EntryReservationReportService.php | 21 ++ .../Services/EntryReservationService.php | 30 +- .../Ticketing/Ticket/routes/adminapp.php | 13 + ..._add_ticket_reservations_adminapp_menu.php | 82 +++++ database/seeders/MenuSeeder.php | 7 + .../pdf/adminapp/entry-reservations.blade.php | 57 ++++ tests/Feature/Seeders/MenuSeederTest.php | 2 + .../Ticket/EntryReservationControllerTest.php | 313 ++++++++++++++++++ .../Ticket/EntryReservationServiceTest.php | 147 +------- .../CreatesTicketReservationSchema.php | 156 +++++++++ 19 files changed, 1081 insertions(+), 148 deletions(-) create mode 100644 app/Domains/Ticketing/Ticket/Controllers/AdminApp/EntryReservationController.php create mode 100644 app/Domains/Ticketing/Ticket/Requests/ExportEntryReservationsRequest.php create mode 100644 app/Domains/Ticketing/Ticket/Requests/IndexEntryReservationsRequest.php create mode 100644 app/Domains/Ticketing/Ticket/Requests/StoreEntryReservationsRequest.php create mode 100644 app/Domains/Ticketing/Ticket/Resources/EntryReservationFormResource.php create mode 100644 app/Domains/Ticketing/Ticket/Resources/EntryReservationResource.php create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationExcelService.php create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationFormService.php create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationPdfService.php create mode 100644 app/Domains/Ticketing/Ticket/Services/EntryReservationReportService.php create mode 100644 database/migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php create mode 100644 resources/views/pdf/adminapp/entry-reservations.blade.php create mode 100644 tests/Feature/Ticket/EntryReservationControllerTest.php create mode 100644 tests/Support/CreatesTicketReservationSchema.php diff --git a/app/Domains/Ticketing/Ticket/Controllers/AdminApp/EntryReservationController.php b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/EntryReservationController.php new file mode 100644 index 00000000..33883b42 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/EntryReservationController.php @@ -0,0 +1,94 @@ +get( + $request->user()->tenant()->firstOrFail(), $request->user()->event_id, + )); + } + + public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection + { + return EntryReservationResource::collection( + $service->reservations($request->user(), $request->validated()), + ); + } + + public function downloadPdf( + ExportEntryReservationsRequest $request, + EntryReservationService $service, + EntryReservationPdfService $pdf, + ): Response { + $user = $request->user(); + + return $pdf->download( + $user->tenant()->firstOrFail(), + $service->reservationsForExport($user, $request->validated()), + $request->validated('timezone'), + ); + } + + public function downloadExcel( + ExportEntryReservationsRequest $request, + EntryReservationService $service, + EntryReservationExcelService $excel, + ): StreamedResponse { + $user = $request->user(); + + return $excel->download( + $user->tenant()->firstOrFail(), + $service->reservationsForExport($user, $request->validated()), + $request->validated('timezone'), + ); + } + + public function downloadTicketPdf( + IndexEntryReservationsRequest $request, + int $reservation, + EntryReservationService $service, + TicketPdfService $pdf, + ): Response { + $user = $request->user(); + + return $pdf->download( + $user->tenant()->firstOrFail(), + collect([$service->reservationTicket($user, $reservation)]), + ); + } + + public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection + { + return EntryReservationResource::collection($service->reserve( + $request->user(), $request->validated('idempotency_key'), $request->validated('rows'), + )); + } + + public function destroy( + IndexEntryReservationsRequest $request, + int $reservation, + EntryReservationService $service, + ): Response { + $service->cancel($request->user(), $reservation); + + return response()->noContent(); + } +} diff --git a/app/Domains/Ticketing/Ticket/Requests/ExportEntryReservationsRequest.php b/app/Domains/Ticketing/Ticket/Requests/ExportEntryReservationsRequest.php new file mode 100644 index 00000000..f9bbdff2 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Requests/ExportEntryReservationsRequest.php @@ -0,0 +1,13 @@ + ['required', 'string', new ValidTimezone]]; + } +} diff --git a/app/Domains/Ticketing/Ticket/Requests/IndexEntryReservationsRequest.php b/app/Domains/Ticketing/Ticket/Requests/IndexEntryReservationsRequest.php new file mode 100644 index 00000000..0e848970 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Requests/IndexEntryReservationsRequest.php @@ -0,0 +1,26 @@ +user()?->tenant_codigo === 'onticket'; + } + + public function rules(): array + { + return [ + 'catalog_item_id' => ['sometimes', 'nullable', 'integer', 'min:1'], + 'variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'], + 'tipo_pago' => ['sometimes', 'nullable', Rule::enum(EntryReservationPaymentType::class)], + 'page' => ['sometimes', 'integer', 'min:1'], + 'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'], + ]; + } +} diff --git a/app/Domains/Ticketing/Ticket/Requests/StoreEntryReservationsRequest.php b/app/Domains/Ticketing/Ticket/Requests/StoreEntryReservationsRequest.php new file mode 100644 index 00000000..e5b2282f --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Requests/StoreEntryReservationsRequest.php @@ -0,0 +1,21 @@ + ['required', 'uuid'], + 'rows' => ['required', 'array', 'list', 'min:1', 'max:100'], + 'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'], + 'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'], + 'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'], + 'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)], + ]; + } +} diff --git a/app/Domains/Ticketing/Ticket/Resources/EntryReservationFormResource.php b/app/Domains/Ticketing/Ticket/Resources/EntryReservationFormResource.php new file mode 100644 index 00000000..6697a907 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Resources/EntryReservationFormResource.php @@ -0,0 +1,14 @@ +resource; + } +} diff --git a/app/Domains/Ticketing/Ticket/Resources/EntryReservationResource.php b/app/Domains/Ticketing/Ticket/Resources/EntryReservationResource.php new file mode 100644 index 00000000..58c11168 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Resources/EntryReservationResource.php @@ -0,0 +1,28 @@ + $this->id, + 'catalog_item_id' => $this->catalog_item_id, + 'variant_id' => $this->variant_id, + 'catalog_item' => ['id' => $this->catalog_item_id, 'name' => $this->catalogItem?->nombre], + 'variant' => $this->variant === null ? null : [ + 'id' => $this->variant_id, + 'label' => $this->variant->getSelectionLabel(), + ], + 'ticket_id' => $this->ticket_id, + 'fecha_reserva' => $this->fecha_reserva->toIso8601String(), + 'tipo_pago' => $this->tipo_pago->value, + 'tipo_pago_label' => $this->tipo_pago->label(), + 'importe' => $this->importe, + ]; + } +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationExcelService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationExcelService.php new file mode 100644 index 00000000..8cf3164a --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationExcelService.php @@ -0,0 +1,89 @@ + $reservations */ + public function download(Tenant $tenant, Collection $reservations, string $timeZone): StreamedResponse + { + $generatedAt = now(); + $rows = $this->report->rows($reservations); + $spreadsheet = new Spreadsheet; + $spreadsheet->getProperties() + ->setCreator('Shopit') + ->setTitle('Reservas de tickets') + ->setSubject($tenant->nombre); + $sheet = $spreadsheet->getActiveSheet(); + $sheet->setTitle('Reservas'); + $sheet->fromArray([ + 'Ítem', + 'Variante', + 'ID', + 'Fecha', + 'Importe', + 'Pago', + ], null, 'A1'); + + foreach ($rows as $index => $reservation) { + $row = $index + 2; + foreach (['A' => 'item', 'B' => 'variant'] as $column => $key) { + $sheet->setCellValueExplicit("{$column}{$row}", $reservation[$key], DataType::TYPE_STRING); + } + $sheet->setCellValueExplicit( + "C{$row}", + $reservation['ticket_id'] === null ? '-' : (string) $reservation['ticket_id'], + DataType::TYPE_STRING, + ); + $sheet->setCellValue( + "D{$row}", + Date::dateTimeToExcel($reservation['fecha_reserva']->copy()->timezone($timeZone)), + ); + if ($reservation['importe'] !== null) { + $sheet->setCellValue("E{$row}", (float) $reservation['importe']); + } + $sheet->setCellValueExplicit("F{$row}", $reservation['pago'], DataType::TYPE_STRING); + } + + $lastRow = max(2, $rows->count() + 1); + $sheet->getStyle("D2:D{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm'); + $sheet->getStyle("E2:E{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00'); + $sheet->getStyle('A1:F1')->applyFromArray([ + 'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']], + 'fill' => [ + 'fillType' => Fill::FILL_SOLID, + 'startColor' => ['rgb' => '26382E'], + ], + 'alignment' => ['vertical' => Alignment::VERTICAL_CENTER], + ]); + $sheet->getRowDimension(1)->setRowHeight(24); + $sheet->freezePane('A2'); + $sheet->setAutoFilter("A1:F{$lastRow}"); + foreach (['A' => 30, 'B' => 60, 'C' => 16, 'D' => 20, 'E' => 16, 'F' => 18] as $column => $width) { + $sheet->getColumnDimension($column)->setWidth($width); + } + + $filename = 'reservas_tickets_'.$tenant->codigo.'_' + .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx'; + + return response()->streamDownload(function () use ($spreadsheet): void { + (new Xlsx($spreadsheet))->save('php://output'); + $spreadsheet->disconnectWorksheets(); + }, $filename, [ + 'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + ]); + } +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationFormService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationFormService.php new file mode 100644 index 00000000..93492cdb --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationFormService.php @@ -0,0 +1,65 @@ +where('tenant_code', $tenant->codigo)->where('has_tickets', true) + ->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId)) + ->with([ + 'inventory', 'itemAttributes.attribute.options', + 'variants' => fn ($query) => $query->orderBy('id'), + 'variants.inventory', 'variants.definitions.itemAttribute.attribute.options', + 'variants.eventDates', 'variants.eventDate', + ])->orderBy('nombre')->orderBy('id')->get(); + + $filterItems = $items->map(fn (CatalogItem $item): array => [ + 'id' => $item->id, 'name' => $item->nombre, + 'variants' => $item->variants->map(function (Variant $variant) use ($item): array { + $variant->setRelation('catalogItem', $item); + + return ['id' => $variant->id, 'label' => $variant->getSelectionLabel()]; + })->values()->all(), + ])->values()->all(); + + $reservationEventId = $eventId ?? $tenant->active_event_id; + $available = $items->filter(fn (CatalogItem $item): bool => ! $item->isBundle() + && $item->isSaleOpen() + && ($reservationEventId === null || $item->event_id === $reservationEventId)) + ->map(function (CatalogItem $item): ?array { + $tracked = $item->inventory_policy !== InventoryPolicy::Unlimited; + $requiresVariant = $item->variants->isNotEmpty(); + $variants = $item->variants->filter(function (Variant $variant) use ($item, $tracked): bool { + $variant->setRelation('catalogItem', $item); + + return $variant->isSellable() + && (! $tracked || ($variant->inventory?->availableStock() ?? 0) > 0); + })->map(fn (Variant $variant): array => [ + 'id' => $variant->id, 'label' => $variant->getSelectionLabel(), + 'price' => $variant->getPrice(), + 'available_stock' => $tracked ? $variant->inventory->availableStock() : null, + ])->values()->all(); + if (($requiresVariant && $variants === []) + || (! $requiresVariant && $tracked && ($item->inventory?->availableStock() ?? 0) <= 0)) { + return null; + } + + return [ + 'id' => $item->id, 'name' => $item->nombre, 'price' => $item->getPrice(), + 'requires_variant' => $requiresVariant, 'variants' => $variants, + 'available_stock' => $tracked ? $item->inventory?->availableStock() : null, + ]; + })->filter()->values()->all(); + + return ['payment_types' => EntryReservationPaymentType::options(), 'items' => $available, 'filter_items' => $filterItems]; + } +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationPdfService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationPdfService.php new file mode 100644 index 00000000..bf9c6d97 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationPdfService.php @@ -0,0 +1,51 @@ + $reservations */ + public function download(Tenant $tenant, Collection $reservations, string $timeZone): Response + { + $generatedAt = now(); + $rows = $this->report->rows($reservations); + $pdf = Pdf::loadView('pdf.adminapp.entry-reservations', [ + 'tenant' => $tenant, + 'reservations' => $rows, + 'generatedAt' => $generatedAt, + 'timeZone' => $timeZone, + ])->setPaper('a4', 'landscape'); + + $this->addPageNumbers($pdf); + + return $pdf->download( + 'reservas_tickets_'.$tenant->codigo.'_' + .$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf' + ); + } + + private function addPageNumbers(DomPdf $pdf): void + { + $pdf->render(); + $domPdf = $pdf->getDomPDF(); + $font = $domPdf->getFontMetrics()->getFont('DejaVu Sans'); + + $domPdf->getCanvas()->page_text( + 385, + 575, + 'Página {PAGE_NUM} de {PAGE_COUNT}', + $font, + 7, + [0.48, 0.52, 0.49], + ); + } +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationReportService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationReportService.php new file mode 100644 index 00000000..61dc8ca6 --- /dev/null +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationReportService.php @@ -0,0 +1,21 @@ +values()->map(fn (EntryReservation $reservation): array => [ + 'item' => $reservation->catalogItem?->nombre ?? '-', + 'variant' => $reservation->variant?->getSelectionLabel() ?? 'Sin variante', + 'ticket_id' => $reservation->ticket_id, + 'fecha_reserva' => $reservation->fecha_reserva, + 'importe' => $reservation->importe, + 'pago' => $reservation->tipo_pago->label(), + ]); + } +} diff --git a/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php index 3b64572f..ae6f1675 100644 --- a/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php +++ b/app/Domains/Ticketing/Ticket/Services/EntryReservationService.php @@ -23,6 +23,14 @@ use Illuminate\Validation\ValidationException; /** Application workflow for one ticket per selected catalog item / variant. */ class EntryReservationService { + private const SELECTION_RELATIONS = [ + 'catalogItem', + 'variant.catalogItem.itemAttributes.attribute.options', + 'variant.definitions.itemAttribute.attribute.options', + 'variant.eventDates', + 'variant.eventDate', + ]; + public function __construct(private readonly TicketGeneratorService $tickets) {} /** @@ -114,10 +122,21 @@ class EntryReservationService abort_unless($batch->tenant_code === $tenant->codigo && $this->matchesBatch($batch, $rows, $hash), 409, 'La clave de envío ya fue utilizada con otra selección.'); - return $batch->reservations()->with(['catalogItem', 'variant', 'ticket'])->orderBy('id')->get(); + // A scope change must not expose any part of a previously submitted batch. + if ($user->event_id !== null) { + abort_if($batch->reservations()->withTrashed() + ->whereDoesntHave('catalogItem', fn (Builder $query) => $query + ->where('tenant_code', $user->tenant_codigo) + ->where('event_id', $user->event_id)) + ->exists(), 403); + } + + return $batch->reservations()->with([...self::SELECTION_RELATIONS, 'ticket'])->orderBy('id')->get(); } - $items = CatalogItem::query()->forTenantCatalog($tenant) + $eventId = $user->event_id ?? $tenant->active_event_id; + $items = CatalogItem::query()->where('tenant_code', $tenant->codigo) + ->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId)) ->whereKey(array_column($rows, 'catalog_item_id'))->orderBy('id')->lockForUpdate()->get()->keyBy('id'); $variants = Variant::query()->whereIn('catalog_item_id', $items->keys()) ->whereKey(array_filter(array_column($rows, 'variant_id'))) @@ -229,7 +248,7 @@ class EntryReservationService ->setRelation('catalogItem', $item)->setRelation('variant', $variant)); } - return $reservations; + return $reservations->loadMissing(self::SELECTION_RELATIONS); }, 3); } @@ -239,11 +258,12 @@ class EntryReservationService abort_unless($user->tenant_codigo !== null && $user->tenant_codigo !== '', 403); return EntryReservation::query() - ->whereHas('catalogItem', fn (Builder $query) => $query->where('tenant_code', $user->tenant_codigo)) + ->whereHas('catalogItem', fn (Builder $query) => $query->where('tenant_code', $user->tenant_codigo) + ->when($user->event_id !== null, fn (Builder $query) => $query->where('event_id', $user->event_id))) ->when($filters['catalog_item_id'] ?? null, fn (Builder $query, int $id) => $query->where('catalog_item_id', $id)) ->when($filters['variant_id'] ?? null, fn (Builder $query, int $id) => $query->where('variant_id', $id)) ->when($filters['tipo_pago'] ?? null, fn (Builder $query, string $type) => $query->where('tipo_pago', $type)) - ->with(['catalogItem', 'variant']) + ->with(self::SELECTION_RELATIONS) ->orderByDesc('fecha_reserva')->orderByDesc('id'); } diff --git a/app/Domains/Ticketing/Ticket/routes/adminapp.php b/app/Domains/Ticketing/Ticket/routes/adminapp.php index b785612a..4b29034c 100644 --- a/app/Domains/Ticketing/Ticket/routes/adminapp.php +++ b/app/Domains/Ticketing/Ticket/routes/adminapp.php @@ -1,11 +1,24 @@ middleware(['auth:sanctum', 'adminapp.tenant']) ->group(function (): void { + Route::prefix('entry-reservations')->middleware('tenant.menu:adminapp.ticket-reservations') + ->group(function (): void { + Route::get('form', [EntryReservationController::class, 'form'])->name('adminapp.entry-reservations.form'); + Route::get('/', [EntryReservationController::class, 'index'])->name('adminapp.entry-reservations.index'); + Route::post('/', [EntryReservationController::class, 'store'])->name('adminapp.entry-reservations.store'); + Route::get('pdf', [EntryReservationController::class, 'downloadPdf'])->name('adminapp.entry-reservations.pdf'); + Route::get('excel', [EntryReservationController::class, 'downloadExcel'])->name('adminapp.entry-reservations.excel'); + Route::get('{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf']) + ->whereNumber('reservation')->name('adminapp.entry-reservations.ticket.pdf'); + Route::delete('{reservation}', [EntryReservationController::class, 'destroy']) + ->whereNumber('reservation')->name('adminapp.entry-reservations.destroy'); + }); Route::get('tickets', [TicketController::class, 'index']) ->middleware('tenant.menu:adminapp.tickets') ->name('adminapp.tickets.index'); diff --git a/database/migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php b/database/migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php new file mode 100644 index 00000000..0edcecbd --- /dev/null +++ b/database/migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php @@ -0,0 +1,82 @@ +where('code', 'main.adminapp')->exists()) { + // Reference data is added by seeders on fresh installations. + return; + } + + $now = now(); + + DB::transaction(function () use ($now): void { + DB::table('menues')->updateOrInsert( + ['code' => self::MENU_CODE], + [ + 'label' => 'Reserva de Tickets', + 'parent_menu_code' => 'main.adminapp', + 'content_type' => 'dynamic', + 'static_content_schema' => null, + 'route' => '/admin/ticket-reservations', + 'created_at' => $now, + 'updated_at' => $now, + ], + ); + + DB::table('tenants_menues') + ->where('menu_code', self::MENU_CODE) + ->where('tenant_code', '!=', self::TENANT_CODE) + ->delete(); + + if (DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) { + DB::table('tenants_menues')->updateOrInsert( + [ + 'tenant_code' => self::TENANT_CODE, + 'menu_code' => self::MENU_CODE, + ], + [ + 'static_content' => null, + 'created_at' => $now, + 'updated_at' => $now, + ], + ); + } + + DB::table('roles') + ->whereIn('codigo', ['admin', 'adminapp']) + ->pluck('codigo') + ->each(function (string $roleCode): void { + DB::table('roles_menues')->updateOrInsert([ + 'rol_codigo' => $roleCode, + 'menu_codigo' => self::MENU_CODE, + ]); + }); + }); + } + + public function down(): void + { + DB::transaction(function (): void { + DB::table('tenants_menues') + ->where('menu_code', self::MENU_CODE) + ->delete(); + + DB::table('roles_menues') + ->where('menu_codigo', self::MENU_CODE) + ->delete(); + + DB::table('menues') + ->where('code', self::MENU_CODE) + ->delete(); + }); + } +}; diff --git a/database/seeders/MenuSeeder.php b/database/seeders/MenuSeeder.php index 25a61dcb..e5bf7197 100644 --- a/database/seeders/MenuSeeder.php +++ b/database/seeders/MenuSeeder.php @@ -100,6 +100,12 @@ class MenuSeeder extends Seeder 'parent_menu_code' => 'main.adminapp', 'route' => '/admin/tickets', ], + [ + 'code' => 'adminapp.ticket-reservations', + 'label' => 'Reserva de Tickets', + 'parent_menu_code' => 'main.adminapp', + 'route' => '/admin/ticket-reservations', + ], [ 'code' => 'adminapp.fiesta-futbol-infantil.entradas', 'label' => 'Entradas', @@ -318,6 +324,7 @@ class MenuSeeder extends Seeder 'adminapp.desfile.reservas', ]; $onTicketMenuCodes = [ + 'adminapp.ticket-reservations', 'event.index', 'event.category', 'event.detail', diff --git a/resources/views/pdf/adminapp/entry-reservations.blade.php b/resources/views/pdf/adminapp/entry-reservations.blade.php new file mode 100644 index 00000000..eb6e41b6 --- /dev/null +++ b/resources/views/pdf/adminapp/entry-reservations.blade.php @@ -0,0 +1,57 @@ + + + + + + + +

Reservas de tickets

+

{{ $tenant->nombre }} · Generado el {{ $generatedAt->copy()->timezone($timeZone)->format('d/m/Y H:i') }}

+ +
+ Reservas incluidas: {{ $reservations->count() }} +
+ + + + + + + + + + + + + + @forelse ($reservations as $reservation) + + + + + + + + + @empty + + @endforelse + +
ÍtemVarianteIDFechaImportePago
{{ $reservation['item'] }}{{ $reservation['variant'] }}{{ $reservation['ticket_id'] ?? '-' }}{{ $reservation['fecha_reserva']->copy()->timezone($timeZone)->format('d/m/Y H:i') }}{{ $reservation['importe'] === null ? '-' : '$'.number_format((float) $reservation['importe'], 2, ',', '.') }}{{ $reservation['pago'] }}
No hay reservas para los criterios seleccionados.
+ + diff --git a/tests/Feature/Seeders/MenuSeederTest.php b/tests/Feature/Seeders/MenuSeederTest.php index 10d323c6..11c0b5f0 100644 --- a/tests/Feature/Seeders/MenuSeederTest.php +++ b/tests/Feature/Seeders/MenuSeederTest.php @@ -54,6 +54,8 @@ class MenuSeederTest extends TestCase ...$expectedMenus, ...$fiestaCategoryMenus, 'adminapp.desfile.entradas' => ['Entradas', '/admin/desfile/entradas'], + 'adminapp.desfile.reservas' => ['Reserva de Tickets', '/admin/desfile/reservas'], + 'adminapp.ticket-reservations' => ['Reserva de Tickets', '/admin/ticket-reservations'], ]))->sort()->values()->all(), $adminApp->children->pluck('code')->sort()->values()->all() ); diff --git a/tests/Feature/Ticket/EntryReservationControllerTest.php b/tests/Feature/Ticket/EntryReservationControllerTest.php new file mode 100644 index 00000000..59501b33 --- /dev/null +++ b/tests/Feature/Ticket/EntryReservationControllerTest.php @@ -0,0 +1,313 @@ +createTicketReservationSchema('onticket'); + $this->app->register(DomPdfServiceProvider::class); + Schema::table('users', fn (Blueprint $table) => $table->string('rol_codigo')->default('adminapp')); + Schema::table('tenants', fn (Blueprint $table) => $table->string('nombre')->default('OnTicket')); + Schema::create('menues', function (Blueprint $table): void { + $table->string('code')->primary(); + $table->string('label')->nullable(); + $table->string('parent_menu_code')->nullable(); + $table->string('content_type')->default('dynamic'); + $table->text('static_content_schema')->nullable(); + $table->string('route')->nullable(); + $table->timestamps(); + }); + Schema::create('tenants_menues', function (Blueprint $table): void { + $table->string('tenant_code'); + $table->string('menu_code'); + $table->text('static_content')->nullable(); + $table->timestamps(); + $table->unique(['tenant_code', 'menu_code']); + }); + Schema::create('roles', function (Blueprint $table): void { + $table->id(); + $table->string('codigo')->unique(); + }); + Schema::create('roles_menues', function (Blueprint $table): void { + $table->string('rol_codigo'); + $table->string('menu_codigo'); + $table->unique(['rol_codigo', 'menu_codigo']); + }); + DB::table('menues')->insert(['code' => 'main.adminapp', 'label' => 'Administración']); + DB::table('roles')->insert([['codigo' => 'admin'], ['codigo' => 'adminapp'], ['codigo' => 'user']]); + $this->migration()->up(); + $validity = Mockery::mock(TicketValidityResolver::class); + $validity->shouldReceive('resolveVariant')->andReturn(ResolvedTicketValidity::unrestricted()); + $validity->shouldReceive('resolveTicket')->andReturn(ResolvedTicketValidity::unrestricted()); + $this->app->instance(TicketValidityResolver::class, $validity); + } + + private function migration() + { + return require database_path('migrations/2026_10_02_010000_add_ticket_reservations_adminapp_menu.php'); + } + + private function login(int $id = 1): void + { + Sanctum::actingAs(User::findOrFail($id)); + } + + private function payload(): array + { + return ['idempotency_key' => (string) Str::uuid(), 'rows' => [ + ['catalog_item_id' => 1, 'variant_id' => 1, 'tipo_pago' => 'otro_metodo'], + ['catalog_item_id' => 2, 'variant_id' => null, 'tipo_pago' => 'sin_cargo'], + ]]; + } + + public function test_menu_migration_and_seeder_only_assign_onticket_and_admin_roles(): void + { + DB::table('tenants_menues')->insert(['tenant_code' => 'other', 'menu_code' => 'adminapp.ticket-reservations']); + $this->migration()->up(); + $this->assertSame(['onticket'], DB::table('tenants_menues')->where('menu_code', 'adminapp.ticket-reservations')->pluck('tenant_code')->all()); + $this->assertSame(['admin', 'adminapp'], DB::table('roles_menues')->where('menu_codigo', 'adminapp.ticket-reservations')->orderBy('rol_codigo')->pluck('rol_codigo')->all()); + $this->seed(MenuSeeder::class); + $this->assertDatabaseHas('menues', ['code' => 'adminapp.ticket-reservations', 'parent_menu_code' => 'main.adminapp', 'route' => '/admin/ticket-reservations']); + $this->assertSame(['onticket'], DB::table('tenants_menues')->where('menu_code', 'adminapp.ticket-reservations')->pluck('tenant_code')->all()); + $this->assertDatabaseMissing('roles_menues', ['rol_codigo' => 'user', 'menu_codigo' => 'adminapp.ticket-reservations']); + $this->migration()->down(); + $this->assertDatabaseMissing('menues', ['code' => 'adminapp.ticket-reservations']); + $this->assertDatabaseHas('menues', ['code' => 'main.adminapp']); + } + + public function test_authentication_adminapp_role_and_menu_are_required(): void + { + $this->getJson(self::URL.'/form')->assertUnauthorized(); + $this->login(); + DB::table('users')->where('id', 1)->update(['rol_codigo' => 'user']); + $this->login(); + $this->getJson(self::URL)->assertForbidden(); + DB::table('users')->where('id', 1)->update(['rol_codigo' => 'adminapp']); + $this->login(); + DB::table('tenants_menues')->delete(); + $this->getJson(self::URL.'/form')->assertNotFound(); + $this->postJson(self::URL, $this->payload())->assertNotFound(); + } + + public function test_other_tenant_is_rejected_even_if_the_menu_is_assigned(): void + { + DB::table('tenants_menues')->insert(['tenant_code' => 'other', 'menu_code' => 'adminapp.ticket-reservations']); + $this->login(2); + foreach (['', '/form', '/pdf', '/excel', '/1/ticket/pdf'] as $suffix) { + $this->getJson(self::URL.$suffix)->assertForbidden(); + } + $this->postJson(self::URL, $this->payload())->assertForbidden(); + $this->deleteJson(self::URL.'/1')->assertForbidden(); + } + + public function test_form_uses_generic_variants_and_keeps_reserved_variants_with_remaining_stock(): void + { + $this->login(); + $this->postJson(self::URL, $this->payload())->assertOk(); + $form = $this->getJson(self::URL.'/form')->assertOk(); + $this->assertSame([1, 2, 4], array_column($form->json('data.items'), 'id')); + $this->assertSame(2, $form->json('data.items.0.variants.0.available_stock')); + $this->assertSame(250, $form->json('data.items.0.variants.0.price')); + $this->assertStringContainsString('NORMAL', $form->json('data.items.0.variants.0.label')); + $form->assertJsonPath('data.items.1.requires_variant', false)->assertJsonPath('data.items.2.available_stock', null); + DB::table('variantes')->where('id', 2)->update(['sales_disabled_at' => now()]); + DB::table('inventories')->where('id', 1)->update(['real_stock' => 1]); + DB::table('catalog_items')->where('id', 2)->update(['sales_end_at' => now()->subMinute()]); + $hidden = $this->getJson(self::URL.'/form')->assertOk(); + $this->assertSame([4], array_column($hidden->json('data.items'), 'id')); + $this->assertSame([1, 2, 4], array_column($hidden->json('data.filter_items'), 'id')); + } + + public function test_active_event_only_limits_new_selections_and_not_history(): void + { + $this->login(); + $this->postJson(self::URL, $this->payload())->assertOk(); + DB::table('tenants')->where('codigo', 'onticket')->update(['active_event_id' => 10]); + DB::table('catalog_items')->where('id', 4)->update(['event_id' => 10]); + $form = $this->getJson(self::URL.'/form')->assertOk(); + $this->assertSame([4], array_column($form->json('data.items'), 'id')); + $this->getJson(self::URL)->assertOk()->assertJsonPath('meta.total', 2); + } + + public function test_reserves_mixed_items_replays_filters_and_cancels_with_the_real_generator(): void + { + $this->login(); + $payload = $this->payload(); + $created = $this->postJson(self::URL, $payload)->assertOk(); + $created->assertJsonPath('data.0.catalog_item_id', 1)->assertJsonPath('data.0.importe', '250.00') + ->assertJsonPath('data.1.variant', null)->assertJsonPath('data.1.importe', '0.00'); + $replay = $this->postJson(self::URL, $payload)->assertOk(); + $this->assertSame($created->json('data'), $replay->json('data')); + $this->getJson(self::URL.'?catalog_item_id=1&variant_id=1&tipo_pago=otro_metodo&per_page=1') + ->assertOk()->assertJsonPath('meta.total', 1)->assertJsonPath('data.0.variant.id', 1); + $this->assertDatabaseCount('tickets', 2); + $this->assertDatabaseHas('tickets', ['source_catalog_item_id' => 2, 'source_variant_id' => null]); + $id = $created->json('data.0.id'); + $ticketId = $created->json('data.0.ticket_id'); + $this->deleteJson(self::URL.'/'.$id)->assertNoContent(); + $this->assertNotNull(Ticket::findOrFail($ticketId)->cancelled_at); + $this->assertSame(0, Inventory::findOrFail(1)->entry_reserved_stock); + $this->getJson(self::URL)->assertOk()->assertJsonPath('meta.total', 1); + } + + public function test_invalid_selection_and_client_prices_are_rejected_atomically(): void + { + $this->login(); + $payload = $this->payload(); + $payload['rows'][0]['catalog_item_id'] = 3; + $this->postJson(self::URL, $payload)->assertUnprocessable()->assertJsonValidationErrors('rows.0.variant_id'); + $payload = $this->payload(); + $payload['rows'][1]['importe'] = 1; + $this->postJson(self::URL, $payload)->assertUnprocessable()->assertJsonValidationErrors('rows.1'); + $this->assertDatabaseCount('tickets', 0); + $this->assertSame(0, (int) Inventory::sum('entry_reserved_stock')); + } + + public function test_exports_use_generic_columns_filters_and_timezone(): void + { + $this->login(); + $this->postJson(self::URL, $this->payload())->assertOk(); + $query = '?catalog_item_id=2&timezone=America/Argentina/Buenos_Aires'; + $this->getJson(self::URL.'/pdf?timezone=invalid')->assertUnprocessable(); + $pdf = $this->get(self::URL.'/pdf'.$query)->assertOk()->assertHeader('Content-Type', 'application/pdf'); + $this->assertStringStartsWith('%PDF', $pdf->getContent()); + $excel = $this->get(self::URL.'/excel'.$query)->assertOk(); + $content = $excel->streamedContent(); + $this->assertStringStartsWith('PK', $content); + $filename = tempnam(sys_get_temp_dir(), 'ticket-reservations-test-'); + try { + file_put_contents($filename, $content); + $sheet = IOFactory::load($filename)->getActiveSheet(); + $this->assertSame(['Ítem', 'Variante', 'ID', 'Fecha', 'Importe', 'Pago'], $sheet->rangeToArray('A1:F1')[0]); + $this->assertSame(2, $sheet->getHighestRow()); + $this->assertSame('Sin variante', $sheet->getCell('B2')->getValue()); + $this->assertSame('Sin cargo', $sheet->getCell('F2')->getValue()); + $this->assertSame('dd/mm/yyyy hh:mm', $sheet->getStyle('D2')->getNumberFormat()->getFormatCode()); + } finally { + unlink($filename); + } + } + + public function test_individual_ticket_download_and_cancellation_are_scoped_by_tenant(): void + { + $this->login(); + $created = $this->postJson(self::URL, $this->payload())->assertOk(); + $pdf = Mockery::mock(TicketPdfService::class); + $pdf->shouldReceive('download')->once()->andReturnUsing(function ($tenant, $tickets) use ($created) { + $this->assertSame('onticket', $tenant->codigo); + $this->assertSame($created->json('data.0.ticket_id'), $tickets->sole()->id); + + return response('%PDF-test', 200, ['Content-Type' => 'application/pdf']); + }); + $this->app->instance(TicketPdfService::class, $pdf); + $this->get(self::URL.'/'.$created->json('data.0.id').'/ticket/pdf')->assertOk(); + $foreign = $this->app->make(EntryReservationService::class) + ->reserve(User::findOrFail(2), (string) Str::uuid(), [ + ['catalog_item_id' => 3, 'tipo_pago' => 'sin_cargo'], + ])->sole(); + $this->getJson(self::URL.'/'.$foreign->id.'/ticket/pdf')->assertNotFound(); + $this->deleteJson(self::URL.'/'.$foreign->id)->assertNotFound(); + $this->assertNull(Ticket::findOrFail($foreign->ticket_id)->cancelled_at); + } + + public function test_user_event_scope_limits_form_filters_history_exports_and_individual_actions(): void + { + DB::table('catalog_items')->where('id', 1)->update(['event_id' => 10]); + DB::table('catalog_items')->whereIn('id', [2, 4])->update(['event_id' => 20]); + $this->login(); + $created = $this->postJson(self::URL, $this->payload())->assertOk(); + $ownId = $created->json('data.0.id'); + $outsideId = $created->json('data.1.id'); + DB::table('users')->where('id', 1)->update(['event_id' => 10]); + DB::table('tenants')->where('codigo', 'onticket')->update(['active_event_id' => 20]); + $this->login(); + + $form = $this->getJson(self::URL.'/form')->assertOk(); + $this->assertSame([1], array_column($form->json('data.items'), 'id')); + $this->assertSame([1], array_column($form->json('data.filter_items'), 'id')); + $this->getJson(self::URL)->assertOk()->assertJsonPath('meta.total', 1)->assertJsonPath('data.0.id', $ownId); + $this->getJson(self::URL.'?catalog_item_id=2&event_id=20')->assertOk()->assertJsonPath('meta.total', 0); + $this->getJson(self::URL.'/'.$outsideId.'/ticket/pdf')->assertNotFound(); + $this->deleteJson(self::URL.'/'.$outsideId)->assertNotFound(); + $this->assertNull(Ticket::findOrFail($created->json('data.1.ticket_id'))->cancelled_at); + + $pdf = Mockery::mock(EntryReservationPdfService::class); + $pdf->shouldReceive('download')->once()->andReturnUsing(function ($tenant, $reservations) use ($ownId) { + $this->assertSame([$ownId], $reservations->pluck('id')->all()); + + return response('%PDF-test', 200); + }); + $this->app->instance(EntryReservationPdfService::class, $pdf); + $this->get(self::URL.'/pdf?timezone=UTC')->assertOk(); + $excel = Mockery::mock(EntryReservationExcelService::class); + $excel->shouldReceive('download')->once()->andReturnUsing(function ($tenant, $reservations) use ($ownId) { + $this->assertSame([$ownId], $reservations->pluck('id')->all()); + + return response()->streamDownload(fn () => print ('test'), 'reservations.xlsx'); + }); + $this->app->instance(EntryReservationExcelService::class, $excel); + $this->get(self::URL.'/excel?timezone=UTC')->assertOk(); + $this->deleteJson(self::URL.'/'.$ownId)->assertNoContent(); + } + + public function test_user_event_scope_overrides_active_event_for_new_reservations_and_rejects_other_items(): void + { + DB::table('catalog_items')->where('id', 1)->update(['event_id' => 10]); + DB::table('catalog_items')->where('id', 2)->update(['event_id' => 20]); + DB::table('tenants')->where('codigo', 'onticket')->update(['active_event_id' => 20]); + DB::table('users')->where('id', 1)->update(['event_id' => 10]); + $this->login(); + $this->postJson(self::URL, $this->payload())->assertUnprocessable()->assertJsonValidationErrors('rows.1.catalog_item_id'); + $this->assertDatabaseCount('tickets', 0); + $payload = $this->payload(); + $payload['rows'] = [$payload['rows'][0]]; + $created = $this->postJson(self::URL, $payload)->assertOk(); + $this->assertDatabaseHas('tickets', ['id' => $created->json('data.0.ticket_id'), 'event_id' => 10]); + $this->postJson(self::URL, $payload)->assertOk()->assertJsonPath('data.0.id', $created->json('data.0.id')); + $this->assertDatabaseCount('tickets', 1); + } + + public function test_retries_cannot_replay_a_mixed_event_batch_after_user_scope_changes(): void + { + DB::table('catalog_items')->where('id', 1)->update(['event_id' => 10]); + DB::table('catalog_items')->where('id', 2)->update(['event_id' => 20]); + $this->login(); + $payload = $this->payload(); + $created = $this->postJson(self::URL, $payload)->assertOk(); + // Cancelled rows still belong to the batch and cannot bypass the new scope. + $this->deleteJson(self::URL.'/'.$created->json('data.1.id'))->assertNoContent(); + DB::table('users')->where('id', 1)->update(['event_id' => 10]); + $this->login(); + $this->postJson(self::URL, $payload)->assertForbidden(); + $this->assertDatabaseCount('tickets', 2); + $this->assertDatabaseCount('reservation_batches', 1); + } +} diff --git a/tests/Feature/Ticket/EntryReservationServiceTest.php b/tests/Feature/Ticket/EntryReservationServiceTest.php index 7f73c3d2..1173d507 100644 --- a/tests/Feature/Ticket/EntryReservationServiceTest.php +++ b/tests/Feature/Ticket/EntryReservationServiceTest.php @@ -11,162 +11,23 @@ use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity; use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService; use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; use Illuminate\Validation\ValidationException; use Mockery; use Symfony\Component\HttpKernel\Exception\HttpException; +use Tests\Support\CreatesTicketReservationSchema; use Tests\TestCase; /** Uses real transactions on the guarded SQLite :memory: connection. */ class EntryReservationServiceTest extends TestCase { + use CreatesTicketReservationSchema; + protected function setUp(): void { parent::setUp(); - // Minimal domain schema isolates this workflow from unrelated legacy migrations. - Schema::create('users', function (Blueprint $table): void { - $table->id(); - $table->string('tenant_codigo'); - $table->softDeletes(); - }); - Schema::create('tenants', function (Blueprint $table): void { - $table->id(); - $table->string('codigo')->unique(); - $table->unsignedBigInteger('active_event_id')->nullable(); - }); - Schema::create('catalog_items', function (Blueprint $table): void { - $table->id(); - $table->string('tenant_code'); - $table->string('slug'); - $table->string('nombre')->default('Entrada'); - $table->string('type')->default('standard'); - $table->unsignedBigInteger('inventory_id')->nullable(); - $table->string('inventory_policy'); - $table->decimal('precio', 10, 2); - $table->timestamp('sales_end_at')->nullable(); - $table->softDeletes(); - $table->boolean('has_tickets')->default(true); - $table->unsignedBigInteger('event_id')->nullable(); - }); - Schema::create('inventories', function (Blueprint $table): void { - $table->id(); - foreach (['real_stock', 'reserved_stock', 'sold_units', 'refunded_units'] as $column) { - $table->integer($column)->default(0); - } - }); - Schema::create('variantes', function (Blueprint $table): void { - $table->id(); - $table->foreignId('catalog_item_id'); - $table->foreignId('inventory_id'); - $table->decimal('precio', 10, 2); - $table->unsignedBigInteger('event_date_id')->nullable(); - $table->unsignedBigInteger('replaced_by_variant_id')->nullable(); - $table->timestamp('sales_disabled_at')->nullable(); - $table->softDeletes(); - }); - Schema::create('event_dates', function (Blueprint $table): void { - $table->id(); - $table->date('date'); - $table->time('time_start')->nullable(); - $table->unsignedBigInteger('rescheduled_to_event_date_id')->nullable(); - $table->timestamp('suspended_at')->nullable(); - }); - Schema::create('attribute', function (Blueprint $table): void { - $table->id(); - $table->string('codigo'); - $table->string('type')->default('string'); - }); - Schema::create('item_attributes', function (Blueprint $table): void { - $table->id(); - $table->foreignId('catalog_item_id'); - $table->foreignId('attribute_id'); - $table->boolean('allow_multi_select')->default(false); - $table->integer('sort_order')->default(0); - }); - Schema::create('attribute_options', function (Blueprint $table): void { - $table->id(); - $table->foreignId('attribute_id'); - $table->string('value'); - $table->string('label'); - $table->integer('sort_order')->default(0); - }); - Schema::create('variant_values', function (Blueprint $table): void { - $table->id(); - $table->foreignId('variant_id'); - $table->foreignId('item_attribute_id'); - $table->string('value'); - }); - Schema::create('variant_event_dates', function (Blueprint $table): void { - $table->foreignId('variant_id'); - $table->foreignId('event_date_id'); - }); - Schema::create('tickets', function (Blueprint $table): void { - $table->id(); - $table->foreignId('user_id'); - $table->foreignId('source_variant_id')->nullable(); - $table->string('tenant_code')->nullable(); - $table->uuid('ticket')->nullable()->unique(); - $table->unsignedBigInteger('source_catalog_item_id')->nullable(); - $table->unsignedBigInteger('source_purchase_item_id')->nullable(); - $table->unsignedBigInteger('event_id')->nullable(); - $table->timestamp('used_at')->nullable(); - $table->timestamp('disabled_at')->nullable(); - $table->timestamp('cancelled_at')->nullable(); - $table->timestamp('refunded_at')->nullable(); - }); - Schema::create('value_changes', function (Blueprint $table): void { - $table->id(); - $table->morphs('trackable'); - $table->string('tenant_code'); - $table->string('attribute'); - $table->text('old_value')->nullable(); - $table->text('new_value')->nullable(); - $table->timestamp('changed_at'); - $table->string('actor_type'); - $table->foreignId('user_id')->nullable(); - }); - (require database_path('migrations/2026_09_23_010000_create_desfile_entry_reservations_table.php'))->up(); - (require database_path('migrations/2026_09_24_000000_add_administrative_entry_reservation_stock.php'))->up(); - (require database_path('migrations/2026_09_24_010000_add_soft_deletes_to_desfile_entry_reservations_table.php'))->up(); - (require database_path('migrations/2026_10_02_000000_generalize_ticket_reservations.php'))->up(); - DB::table('tenants')->insert(['codigo' => 'ticket_shop']); - DB::table('users')->insert(['id' => 1, 'tenant_codigo' => 'ticket_shop']); - DB::table('catalog_items')->insert([ - 'id' => 1, 'tenant_code' => 'ticket_shop', 'slug' => 'entrada', - 'inventory_policy' => 'tracked', 'precio' => 100, - ]); - foreach ([1, 2] as $id) { - DB::table('inventories')->insert(['id' => $id, 'real_stock' => 3]); - DB::table('variantes')->insert(['id' => $id, 'catalog_item_id' => 1, 'inventory_id' => $id, 'precio' => 250]); - } - DB::table('tenants')->insert(['codigo' => 'other']); - DB::table('users')->insert(['id' => 2, 'tenant_codigo' => 'other']); - DB::table('inventories')->insert(['id' => 3, 'real_stock' => 3]); - DB::table('catalog_items')->insert([ - ['id' => 2, 'tenant_code' => 'ticket_shop', 'slug' => 'general', 'inventory_policy' => 'tracked', 'inventory_id' => 3, 'precio' => 700], - ['id' => 3, 'tenant_code' => 'other', 'slug' => 'other', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 900], - ['id' => 4, 'tenant_code' => 'ticket_shop', 'slug' => 'unlimited', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 500], - ]); - foreach (['tipo' => 'NORMAL', 'sector' => 'A', 'fila' => '3', 'asiento' => '17'] as $code => $value) { - $attributeId = DB::table('attribute')->insertGetId(['codigo' => $code]); - $itemAttributeId = DB::table('item_attributes')->insertGetId([ - 'catalog_item_id' => 1, - 'attribute_id' => $attributeId, - ]); - DB::table('attribute_options')->insert([ - 'attribute_id' => $attributeId, - 'value' => $value, - 'label' => $value, - ]); - foreach ([1, 2] as $variantId) { - DB::table('variant_values')->insert([ - 'variant_id' => $variantId, 'item_attribute_id' => $itemAttributeId, 'value' => $value, - ]); - } - } + $this->createTicketReservationSchema(); } private function service(bool $failSecond = false): EntryReservationService diff --git a/tests/Support/CreatesTicketReservationSchema.php b/tests/Support/CreatesTicketReservationSchema.php new file mode 100644 index 00000000..3d7f2724 --- /dev/null +++ b/tests/Support/CreatesTicketReservationSchema.php @@ -0,0 +1,156 @@ +id(); + $table->string('tenant_codigo'); + $table->unsignedBigInteger('event_id')->nullable(); + $table->softDeletes(); + }); + Schema::create('tenants', function (Blueprint $table): void { + $table->id(); + $table->string('codigo')->unique(); + $table->unsignedBigInteger('active_event_id')->nullable(); + }); + Schema::create('catalog_items', function (Blueprint $table): void { + $table->id(); + $table->string('tenant_code'); + $table->string('slug'); + $table->string('nombre')->default('Entrada'); + $table->string('type')->default('standard'); + $table->unsignedBigInteger('inventory_id')->nullable(); + $table->string('inventory_policy'); + $table->decimal('precio', 10, 2); + $table->timestamp('sales_end_at')->nullable(); + $table->softDeletes(); + $table->boolean('has_tickets')->default(true); + $table->unsignedBigInteger('event_id')->nullable(); + }); + Schema::create('inventories', function (Blueprint $table): void { + $table->id(); + foreach (['real_stock', 'reserved_stock', 'sold_units', 'refunded_units'] as $column) { + $table->integer($column)->default(0); + } + }); + Schema::create('variantes', function (Blueprint $table): void { + $table->id(); + $table->foreignId('catalog_item_id'); + $table->foreignId('inventory_id'); + $table->decimal('precio', 10, 2); + $table->unsignedBigInteger('event_date_id')->nullable(); + $table->unsignedBigInteger('replaced_by_variant_id')->nullable(); + $table->timestamp('sales_disabled_at')->nullable(); + $table->softDeletes(); + }); + Schema::create('event_dates', function (Blueprint $table): void { + $table->id(); + $table->date('date'); + $table->time('time_start')->nullable(); + $table->unsignedBigInteger('rescheduled_to_event_date_id')->nullable(); + $table->timestamp('suspended_at')->nullable(); + }); + Schema::create('attribute', function (Blueprint $table): void { + $table->id(); + $table->string('codigo'); + $table->string('type')->default('string'); + }); + Schema::create('item_attributes', function (Blueprint $table): void { + $table->id(); + $table->foreignId('catalog_item_id'); + $table->foreignId('attribute_id'); + $table->boolean('allow_multi_select')->default(false); + $table->integer('sort_order')->default(0); + }); + Schema::create('attribute_options', function (Blueprint $table): void { + $table->id(); + $table->foreignId('attribute_id'); + $table->string('value'); + $table->string('label'); + $table->integer('sort_order')->default(0); + }); + Schema::create('variant_values', function (Blueprint $table): void { + $table->id(); + $table->foreignId('variant_id'); + $table->foreignId('item_attribute_id'); + $table->string('value'); + }); + Schema::create('variant_event_dates', function (Blueprint $table): void { + $table->foreignId('variant_id'); + $table->foreignId('event_date_id'); + }); + Schema::create('tickets', function (Blueprint $table): void { + $table->id(); + $table->foreignId('user_id'); + $table->foreignId('source_variant_id')->nullable(); + $table->string('tenant_code')->nullable(); + $table->uuid('ticket')->nullable()->unique(); + $table->unsignedBigInteger('source_catalog_item_id')->nullable(); + $table->unsignedBigInteger('source_purchase_item_id')->nullable(); + $table->unsignedBigInteger('event_id')->nullable(); + $table->timestamp('used_at')->nullable(); + $table->timestamp('disabled_at')->nullable(); + $table->timestamp('cancelled_at')->nullable(); + $table->timestamp('refunded_at')->nullable(); + }); + Schema::create('value_changes', function (Blueprint $table): void { + $table->id(); + $table->morphs('trackable'); + $table->string('tenant_code'); + $table->string('attribute'); + $table->text('old_value')->nullable(); + $table->text('new_value')->nullable(); + $table->timestamp('changed_at'); + $table->string('actor_type'); + $table->foreignId('user_id')->nullable(); + }); + (require database_path('migrations/2026_09_23_010000_create_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_09_24_000000_add_administrative_entry_reservation_stock.php'))->up(); + (require database_path('migrations/2026_09_24_010000_add_soft_deletes_to_desfile_entry_reservations_table.php'))->up(); + (require database_path('migrations/2026_10_02_000000_generalize_ticket_reservations.php'))->up(); + DB::table('tenants')->insert(['codigo' => $tenantCode]); + DB::table('users')->insert(['id' => 1, 'tenant_codigo' => $tenantCode]); + DB::table('catalog_items')->insert([ + 'id' => 1, 'tenant_code' => $tenantCode, 'slug' => 'entrada', + 'inventory_policy' => 'tracked', 'precio' => 100, + ]); + foreach ([1, 2] as $id) { + DB::table('inventories')->insert(['id' => $id, 'real_stock' => 3]); + DB::table('variantes')->insert(['id' => $id, 'catalog_item_id' => 1, 'inventory_id' => $id, 'precio' => 250]); + } + DB::table('tenants')->insert(['codigo' => 'other']); + DB::table('users')->insert(['id' => 2, 'tenant_codigo' => 'other']); + DB::table('inventories')->insert(['id' => 3, 'real_stock' => 3]); + DB::table('catalog_items')->insert([ + ['id' => 2, 'tenant_code' => $tenantCode, 'slug' => 'general', 'inventory_policy' => 'tracked', 'inventory_id' => 3, 'precio' => 700], + ['id' => 3, 'tenant_code' => 'other', 'slug' => 'other', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 900], + ['id' => 4, 'tenant_code' => $tenantCode, 'slug' => 'unlimited', 'inventory_policy' => 'unlimited', 'inventory_id' => null, 'precio' => 500], + ]); + foreach (['tipo' => 'NORMAL', 'sector' => 'A', 'fila' => '3', 'asiento' => '17'] as $code => $value) { + $attributeId = DB::table('attribute')->insertGetId(['codigo' => $code]); + $itemAttributeId = DB::table('item_attributes')->insertGetId([ + 'catalog_item_id' => 1, + 'attribute_id' => $attributeId, + ]); + DB::table('attribute_options')->insert([ + 'attribute_id' => $attributeId, + 'value' => $value, + 'label' => $value, + ]); + foreach ([1, 2] as $variantId) { + DB::table('variant_values')->insert([ + 'variant_id' => $variantId, 'item_attribute_id' => $itemAttributeId, 'value' => $value, + ]); + } + } + } +} -- 2.49.1