From 47b2e8e030a2df9244cedf0a66440ef15906c3ce Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:03:00 -0300 Subject: [PATCH 1/4] 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; From ab5bc43760df5196748c3d83a1e0753256cd49f3 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:50:39 -0300 Subject: [PATCH 2/4] 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, + ]); + } + } +} From f10237eb1f487b04c9fe65f500caa9f31bf6d7ca Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 11:50:47 -0300 Subject: [PATCH 3/4] 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]); From 45e92602ed375ea57a54fd3bd2dfa811fe4500a9 Mon Sep 17 00:00:00 2001 From: ncoronel Date: Fri, 2 Oct 2026 12:20:25 -0300 Subject: [PATCH 4/4] 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, + ]); + } + } + } +}