Squashed commit of the following:

commit 6ae625d4fdc11989950ef0678db62fdb52be7c8c Author: ncoronel <ncoronel@quo.ar> Date: Wed Sep 2 09:46:18 2026 -0300 refactor(tickets): enhance search functionality for tickets by client names and formatted amounts commit 098e525d32be9cb6487bc01a3d120aa0f2386a15 Author: ncoronel <ncoronel@quo.ar> Date: Wed Sep 2 09:09:30 2026 -0300 fix(tickets): protect referenced purchase items commit 210db17f2f6a6a4a509297b773a2b5d3e3149a3d Author: ncoronel <ncoronel@quo.ar> Date: Wed Sep 2 08:59:24 2026 -0300 test(tickets): cover purchase item references commit 6a004713c4bad622dfa5e26394458925db1cb5a7 Author: ncoronel <ncoronel@quo.ar> Date: Wed Sep 2 08:59:02 2026 -0300 refactor(tickets): reference purchase items directly
2026-09-02 09:47:04 -03:00
parent 836aa1afd7
commit ee906d2d2e
18 changed files with 504 additions and 85 deletions
--- a/app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php
+++ b/app/Domains/Desfile/Services/InvitationPurchaseProvisioner.php
@@ -5,6 +5,7 @@ namespace App\Domains\Desfile\Services;
 use DateTimeInterface;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use RuntimeException;

@@ -58,7 +59,7 @@ class InvitationPurchaseProvisioner
                        $allocation['type'],
                    );

-                    $this->createPurchaseItem(
+                    $purchaseItemId = $this->createPurchaseItem(
                        $purchaseId,
                        $catalogItem,
                        $variant,
@@ -70,6 +71,7 @@ class InvitationPurchaseProvisioner
                    );
                    $this->createTicketAndCommitStock(
                        $purchaseId,
+                        $purchaseItemId,
                        $userId,
                        (int) $catalogItem->id,
                        $variant,
@@ -326,12 +328,13 @@ class InvitationPurchaseProvisioner
        int $seat,
        string $type,
        DateTimeInterface $now,
-    ): void {
-        if (DB::table('compra_items')
+    ): int {
+        $existingId = DB::table('compra_items')
            ->where('compra_id', $purchaseId)
            ->where('source_variant_id', $variant->id)
-            ->exists()) {
-            return;
+            ->value('id');
+        if ($existingId !== null) {
+            return (int) $existingId;
        }

        $attributes = [
@@ -341,7 +344,7 @@ class InvitationPurchaseProvisioner
            ['name' => 'Asiento', 'value' => (string) $seat],
        ];

-        DB::table('compra_items')->insert([
+        return DB::table('compra_items')->insertGetId([
            'compra_id' => $purchaseId,
            'source_catalog_item_id' => $catalogItem->id,
            'source_variant_id' => $variant->id,
@@ -367,13 +370,18 @@ class InvitationPurchaseProvisioner

    private function createTicketAndCommitStock(
        int $purchaseId,
+        int $purchaseItemId,
        int $userId,
        int $catalogItemId,
        object $variant,
        DateTimeInterface $now,
    ): void {
+        $purchaseReference = Schema::hasColumn('tickets', 'source_purchase_item_id')
+            ? ['source_purchase_item_id' => $purchaseItemId]
+            : ['source_purchase_id' => $purchaseId];
+
        if (DB::table('tickets')
-            ->where('source_purchase_id', $purchaseId)
+            ->where($purchaseReference)
            ->where('source_variant_id', $variant->id)
            ->exists()) {
            return;
@@ -420,7 +428,7 @@ class InvitationPurchaseProvisioner
            'ticket' => (string) Str::uuid(),
            'name' => null,
            'description' => null,
-            'source_purchase_id' => $purchaseId,
+            ...$purchaseReference,
            'source_catalog_item_id' => $catalogItemId,
            'source_variant_id' => $variant->id,
            'used_at' => null,
--- a/app/Domains/Notification/Services/NotificationMailService.php
+++ b/app/Domains/Notification/Services/NotificationMailService.php
@@ -138,8 +138,7 @@ class NotificationMailService
            }

            /** @var Collection<int, Ticket> $tickets */
-            $tickets = Ticket::query()
-                ->where('source_purchase_id', $purchase->getKey())
+            $tickets = $purchase->tickets()
                ->where('tenant_code', $purchase->tenant_codigo)
                ->with(TicketPresentationResolver::RELATIONS)
                ->get();
--- a/app/Domains/Purchase/Models/Purchase.php
+++ b/app/Domains/Purchase/Models/Purchase.php
@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\DB;

@@ -115,12 +116,15 @@ class Purchase extends Model
        return $this->hasMany(PurchaseItem::class, 'compra_id');
    }

-    /**
-     * @return HasMany<Ticket, $this>
-     */
-    public function tickets(): HasMany
+    /** @return HasManyThrough<Ticket, PurchaseItem, $this> */
+    public function tickets(): HasManyThrough
    {
-        return $this->hasMany(Ticket::class, 'source_purchase_id');
+        return $this->hasManyThrough(
+            Ticket::class,
+            PurchaseItem::class,
+            'compra_id',
+            'source_purchase_item_id',
+        );
    }

    /** @return BelongsTo<StockReservation, $this> */
--- a/app/Domains/Purchase/Models/PurchaseItem.php
+++ b/app/Domains/Purchase/Models/PurchaseItem.php
@@ -5,10 +5,12 @@ namespace App\Domains\Purchase\Models;
 use App\Domains\Attachable\Models\Attachment;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
+use App\Domains\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;

 #[Fillable([
    'compra_id',
@@ -56,6 +58,12 @@ class PurchaseItem extends Model
        return $this->belongsTo(Purchase::class, 'compra_id');
    }

+    /** @return HasMany<Ticket, $this> */
+    public function tickets(): HasMany
+    {
+        return $this->hasMany(Ticket::class, 'source_purchase_item_id');
+    }
+
    /** @return BelongsTo<Attachment, $this> */
    public function imageAttachment(): BelongsTo
    {
--- a/app/Domains/Ticket/Listeners/GenerateTicketsForPaidPurchase.php
+++ b/app/Domains/Ticket/Listeners/GenerateTicketsForPaidPurchase.php
@@ -42,7 +42,7 @@ class GenerateTicketsForPaidPurchase
                $user,
                $purchaseItem->cantidad,
                $purchaseItem->source_variant_id,
-                $purchase->getKey(),
+                $purchaseItem->getKey(),
            );
        }
    }
--- a/app/Domains/Ticket/Models/Ticket.php
+++ b/app/Domains/Ticket/Models/Ticket.php
@@ -5,7 +5,7 @@ namespace App\Domains\Ticket\Models;
 use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\CatalogItem;
 use App\Domains\Catalog\Models\Variant;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Ticket\Services\ResolvedTicketValidity;
 use App\Domains\Ticket\Services\ResolvedValidityGroup;
@@ -21,7 +21,7 @@ use Illuminate\Support\Collection;
 #[Fillable([
    'tenant_code',
    'ticket',
-    'source_purchase_id',
+    'source_purchase_item_id',
    'source_catalog_item_id',
    'source_variant_id',
    'used_at',
@@ -56,7 +56,7 @@ class Ticket extends Model
        return [
            'source_catalog_item_id' => 'integer',
            'source_variant_id' => 'integer',
-            'source_purchase_id' => 'integer',
+            'source_purchase_item_id' => 'integer',
            'used_at' => 'datetime',
            'scanner_user_id' => 'integer',
            'user_id' => 'integer',
@@ -81,10 +81,10 @@ class Ticket extends Model
        return $this->belongsTo(User::class, 'scanner_user_id');
    }

-    /** @return BelongsTo<Purchase, $this> */
-    public function sourcePurchase(): BelongsTo
+    /** @return BelongsTo<PurchaseItem, $this> */
+    public function sourcePurchaseItem(): BelongsTo
    {
-        return $this->belongsTo(Purchase::class, 'source_purchase_id');
+        return $this->belongsTo(PurchaseItem::class, 'source_purchase_item_id');
    }

    /** @return BelongsTo<CatalogItem, $this> */
--- a/app/Domains/Ticket/Services/AdminAppTicketRowService.php
+++ b/app/Domains/Ticket/Services/AdminAppTicketRowService.php
@@ -3,7 +3,6 @@
 namespace App\Domains\Ticket\Services;

 use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Purchase\Models\PurchaseItem;
 use App\Domains\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;

@@ -23,16 +22,16 @@ class AdminAppTicketRowService
    /** @return array<string, mixed> */
    public function details(Ticket $ticket): array
    {
-        $purchaseItem = $this->sourcePurchaseItem($ticket);
+        $purchaseItem = $ticket->sourcePurchaseItem;

        return [
-            'source_purchase_id' => $ticket->source_purchase_id,
-            'order_number' => $ticket->source_purchase_id,
+            'source_purchase_item_id' => $ticket->source_purchase_item_id,
+            'order_number' => $purchaseItem?->compra_id,
            'product' => $purchaseItem?->item_nombre
                ?? $ticket->sourceCatalogItem?->nombre
                ?? $ticket->name,
            'amount' => $purchaseItem?->precio_unitario,
-            'client' => $ticket->sourcePurchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
+            'client' => $purchaseItem?->purchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
            'status' => $ticket->status,
            'scanned_by' => $ticket->scannerUser?->nombre_apellido,
            'variant_properties' => $this->variantProperties($ticket),
@@ -175,18 +174,6 @@ class AdminAppTicketRowService
            ->implode(', ');
    }

-    private function sourcePurchaseItem(Ticket $ticket): ?PurchaseItem
-    {
-        return $ticket->sourcePurchase?->items->first(function (PurchaseItem $item) use ($ticket): bool {
-            if ($ticket->source_variant_id !== null) {
-                return $item->source_variant_id === $ticket->source_variant_id;
-            }
-
-            return $item->source_catalog_item_id === $ticket->source_catalog_item_id
-                && $item->source_variant_id === null;
-        });
-    }
-
    /** @return list<array{code: string, label: string, values: list<array{value: string, label: string}>}> */
    private function variantProperties(Ticket $ticket): array
    {
--- a/app/Domains/Ticket/Services/AdminAppTicketService.php
+++ b/app/Domains/Ticket/Services/AdminAppTicketService.php
@@ -18,7 +18,7 @@ class AdminAppTicketService
        'user',
        'scannerUser',
        'sourceCatalogItem.category',
-        'sourcePurchase.items',
+        'sourcePurchaseItem.purchase',
    ];

    public function __construct(
@@ -86,13 +86,7 @@ class AdminAppTicketService
        $query = Ticket::query()
            ->where('tenant_code', $tenant->codigo)
            ->when($search !== '', function (Builder $query) use ($search): void {
-                $query->when(
-                    ctype_digit($search),
-                    fn (Builder $searchQuery): Builder => $searchQuery
-                        ->where('tickets.id', (int) $search),
-                    fn (Builder $searchQuery): Builder => $searchQuery
-                        ->where('ticket', 'like', "%{$search}%"),
-                );
+                $this->applySearchFilter($query, $search);
            })
            ->when($filters['category'] ?? null, function (Builder $query, string $category): void {
                $query->whereHas('sourceCatalogItem.category', fn (Builder $categoryQuery): Builder => $categoryQuery
@@ -111,7 +105,7 @@ class AdminAppTicketService
                    return;
                }

-                $query->whereHas('sourcePurchase', fn (Builder $purchaseQuery): Builder => $purchaseQuery
+                $query->whereHas('sourcePurchaseItem.purchase', fn (Builder $purchaseQuery): Builder => $purchaseQuery
                    ->whereDate('created_at', $date));
            })
            ->when($filters['size'] ?? null, function (Builder $query, string $size) use ($filters): void {
@@ -123,6 +117,67 @@ class AdminAppTicketService
        return $query;
    }

+    /** @param Builder<Ticket> $query */
+    private function applySearchFilter(Builder $query, string $search): void
+    {
+        $containsPattern = '%'.mb_strtolower($search).'%';
+        $amount = $this->searchAmount($search);
+
+        $query->where(function (Builder $searchQuery) use ($search, $containsPattern, $amount): void {
+            $searchQuery
+                ->where(function (Builder $clientQuery) use ($containsPattern): void {
+                    $clientQuery
+                        ->whereHas('sourcePurchaseItem.purchase', fn (Builder $purchaseQuery): Builder => $purchaseQuery
+                            ->whereRaw('LOWER(nombre_apellido) LIKE ?', [$containsPattern]))
+                        ->orWhere(function (Builder $fallbackClientQuery) use ($containsPattern): void {
+                            $fallbackClientQuery
+                                ->where(function (Builder $missingPurchaseClientQuery): void {
+                                    $missingPurchaseClientQuery
+                                        ->whereDoesntHave('sourcePurchaseItem.purchase')
+                                        ->orWhereHas('sourcePurchaseItem.purchase', fn (Builder $purchaseQuery): Builder => $purchaseQuery
+                                            ->whereNull('nombre_apellido'));
+                                })
+                                ->whereHas('user', fn (Builder $userQuery): Builder => $userQuery
+                                    ->whereRaw('LOWER(nombre_apellido) LIKE ?', [$containsPattern]));
+                        });
+                })
+                ->orWhereHas('scannerUser', fn (Builder $scannerQuery): Builder => $scannerQuery
+                    ->whereRaw('LOWER(nombre_apellido) LIKE ?', [$containsPattern]));
+
+            if (ctype_digit($search)) {
+                $searchQuery
+                    ->orWhere('tickets.id', (int) $search)
+                    ->orWhereHas('sourcePurchaseItem', fn (Builder $purchaseItemQuery): Builder => $purchaseItemQuery
+                        ->where('compra_id', (int) $search));
+            }
+
+            if ($amount !== null) {
+                $searchQuery->orWhereHas('sourcePurchaseItem', fn (Builder $purchaseItemQuery): Builder => $purchaseItemQuery
+                    ->where('precio_unitario', $amount));
+            }
+        });
+    }
+
+    private function searchAmount(string $search): ?string
+    {
+        $value = preg_replace('/[\s$]/u', '', trim($search));
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        if (preg_match('/^\d{1,3}(?:\.\d{3})+(?:,\d{1,2})?$/', $value) === 1) {
+            $value = str_replace(['.', ','], ['', '.'], $value);
+        } elseif (preg_match('/^\d{1,3}(?:,\d{3})+(?:\.\d{1,2})?$/', $value) === 1) {
+            $value = str_replace(',', '', $value);
+        } elseif (preg_match('/^\d+(?:[.,]\d{1,2})?$/', $value) === 1) {
+            $value = str_replace(',', '.', $value);
+        } else {
+            return null;
+        }
+
+        return number_format((float) $value, 2, '.', '');
+    }
+
    /** @param Builder<Ticket> $query */
    private function applyProductFilter(Builder $query, string $category, string $product): void
    {
@@ -234,15 +289,15 @@ class AdminAppTicketService
        $direction = ($filters['sort_direction'] ?? 'asc') === 'desc' ? 'desc' : 'asc';

        $sortExpression = match ($sortBy) {
-            'order_number' => 'tickets.source_purchase_id',
+            'order_number' => $this->purchaseItemColumnQuery('compra_id'),
            'id' => 'tickets.id',
-            'amount' => $this->purchaseItemSortQuery('precio_unitario'),
+            'amount' => $this->purchaseItemColumnQuery('precio_unitario'),
            'scanned_by' => User::query()
                ->select('nombre_apellido')
                ->whereColumn('users.id', 'tickets.scanner_user_id'),
            'product' => $tenant->codigo === 'fiesta_futbol_infantil'
                ? null
-                : $this->purchaseItemSortQuery('item_nombre'),
+                : $this->purchaseItemColumnQuery('item_nombre'),
            default => null,
        };

@@ -256,25 +311,11 @@ class AdminAppTicketService
    }

    /** @return Builder<PurchaseItem> */
-    private function purchaseItemSortQuery(string $column): Builder
+    private function purchaseItemColumnQuery(string $column): Builder
    {
        return PurchaseItem::query()
            ->select($column)
-            ->whereColumn('compra_items.compra_id', 'tickets.source_purchase_id')
-            ->where(function (Builder $query): void {
-                $query
-                    ->where(function (Builder $variantQuery): void {
-                        $variantQuery
-                            ->whereNotNull('tickets.source_variant_id')
-                            ->whereColumn('compra_items.source_variant_id', 'tickets.source_variant_id');
-                    })
-                    ->orWhere(function (Builder $itemQuery): void {
-                        $itemQuery
-                            ->whereNull('tickets.source_variant_id')
-                            ->whereNull('compra_items.source_variant_id')
-                            ->whereColumn('compra_items.source_catalog_item_id', 'tickets.source_catalog_item_id');
-                    });
-            })
+            ->whereColumn('compra_items.id', 'tickets.source_purchase_item_id')
            ->limit(1);
    }

--- a/app/Domains/Ticket/Services/TicketGeneratorService.php
+++ b/app/Domains/Ticket/Services/TicketGeneratorService.php
@@ -23,13 +23,13 @@ class TicketGeneratorService
        User $user,
        int $quantity = 1,
        ?int $sourceVariantId = null,
-        ?int $sourcePurchaseId = null,
+        ?int $sourcePurchaseItemId = null,
    ): Collection {
        if ($quantity < 1) {
            throw TicketGenerationException::invalidQuantity();
        }

-        return DB::transaction(function () use ($catalogItem, $user, $quantity, $sourceVariantId, $sourcePurchaseId): Collection {
+        return DB::transaction(function () use ($catalogItem, $user, $quantity, $sourceVariantId, $sourcePurchaseItemId): Collection {
            $targets = $this->resolveTargets(
                $catalogItem,
                $quantity,
@@ -37,7 +37,7 @@ class TicketGeneratorService
            );

            return $targets->map(function (array $target) use (
-                $sourcePurchaseId,
+                $sourcePurchaseItemId,
                $user,
            ): Ticket {
                $item = $target['catalog_item'];
@@ -45,7 +45,7 @@ class TicketGeneratorService
                $ticket = Ticket::query()->create([
                    'tenant_code' => $item->tenant_code,
                    'ticket' => (string) Str::uuid(),
-                    'source_purchase_id' => $sourcePurchaseId,
+                    'source_purchase_item_id' => $sourcePurchaseItemId,
                    'source_catalog_item_id' => $item->getKey(),
                    'source_variant_id' => $variant?->getKey(),
                    'used_at' => null,
--- a/app/Domains/Ticket/documentacion/README.md
+++ b/app/Domains/Ticket/documentacion/README.md
@@ -6,7 +6,8 @@ Genera, valida, consulta y exporta entradas asociadas a compras pagadas de produ

 ## Modelo

- `Ticket`: pertenece a tenant y usuario, y conserva referencias a compra, producto, variante y usuario escáner.
+- `Ticket`: pertenece a tenant y usuario, y conserva referencias al ítem de compra que lo generó, producto,
+  variante y usuario escáner. La compra se obtiene a través de su ítem.
 - El nombre y la descripción se calculan dinámicamente desde el producto y la variante; los tickets no
  persisten una copia de esos textos.
 - `ValidityTime`: define ventanas absolutas o relativas de vigencia para fechas de evento y opciones de atributos.