feat: enhance address handling with coordinates and integrate into event resources
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Domains\Ticketing\Event\Resources;
|
||||
|
||||
use App\Domains\Core\Address\Resources\AddressResource;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -21,6 +22,7 @@ class EventResource extends JsonResource
|
||||
'title' => $this->title,
|
||||
'subtitle' => $this->subtitle,
|
||||
'description' => $this->description,
|
||||
'address' => AddressResource::make($this->address),
|
||||
'location' => $this->location,
|
||||
'exact_location' => $this->exact_location,
|
||||
'date_text' => $this->date_text,
|
||||
|
||||
@@ -5,6 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
|
||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Core\Address\Resources\AddressResource;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
@@ -19,6 +20,7 @@ class PublicEventResource extends JsonResource
|
||||
'title' => $this->title,
|
||||
'subtitle' => $this->subtitle,
|
||||
'description' => $this->description,
|
||||
'address' => AddressResource::make($this->address),
|
||||
'location' => $this->location,
|
||||
'exact_location' => $this->exact_location,
|
||||
'date_text' => $this->date_text,
|
||||
|
||||
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace App\Domains\Ticketing\Event\Services;
|
||||
|
||||
use App\Domains\Core\Address\Models\Address;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
|
||||
class EventAddressService
|
||||
{
|
||||
/** Called inside the event update transaction, after validating the legacy location fields. */
|
||||
public function syncLocation(Event $event, bool $coordinatesProvided = false): void
|
||||
{
|
||||
$address = $event->address;
|
||||
$coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
|
||||
$values = [
|
||||
'address_text' => $event->location,
|
||||
'latitude' => $coordinates['latitude'] ?? null,
|
||||
'longitude' => $coordinates['longitude'] ?? null,
|
||||
];
|
||||
|
||||
if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Editing one event must not change the location of another event or a tenant.
|
||||
if ($address === null || $address->tenants()->exists()
|
||||
|| $address->events()->where('events.id', '!=', $event->id)->exists()) {
|
||||
$address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
|
||||
$event->address()->associate($address);
|
||||
$event->save();
|
||||
} else {
|
||||
$address->update($values);
|
||||
}
|
||||
|
||||
$event->setRelation('address', $address);
|
||||
}
|
||||
}
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
namespace App\Domains\Ticketing\Event\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -32,11 +32,12 @@ class EventService
|
||||
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
||||
private readonly VariantReplacementService $variantReplacementService,
|
||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||
private readonly EventAddressService $eventAddressService,
|
||||
) {}
|
||||
|
||||
public function forTenant(Tenant $tenant): Event
|
||||
{
|
||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $data */
|
||||
@@ -49,6 +50,7 @@ class EventService
|
||||
'location' => $data['location'],
|
||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||
]);
|
||||
$this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
|
||||
$tenant->update([
|
||||
...array_intersect_key($data, array_flip([
|
||||
'allow_ticket_refund',
|
||||
@@ -64,7 +66,7 @@ class EventService
|
||||
$this->syncLegacyContact($event, $data['contact']);
|
||||
}
|
||||
|
||||
return $event->load(['dates.validityTime', 'socialMedia']);
|
||||
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -23,11 +23,12 @@ class PublicEventService
|
||||
$query->where(function ($query) use ($term): void {
|
||||
$query->where('title', 'like', '%'.$term.'%')
|
||||
->orWhere('subtitle', 'like', '%'.$term.'%')
|
||||
->orWhere('location', 'like', '%'.$term.'%');
|
||||
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
||||
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
||||
});
|
||||
}
|
||||
|
||||
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||
}
|
||||
|
||||
public function find(Tenant $tenant, Event $event): Event
|
||||
@@ -38,6 +39,7 @@ class PublicEventService
|
||||
|
||||
return $event->load([
|
||||
'attachment',
|
||||
'address',
|
||||
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
||||
'socialMedia',
|
||||
'catalogItems.attachments',
|
||||
|
||||
@@ -27,6 +27,18 @@ Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
|
||||
copia y revierten las inserciones para evitar una migración parcial. Las migraciones
|
||||
deben ejecutarse explícitamente por quien administra la base.
|
||||
|
||||
Las respuestas públicas, administrativas y el evento del bootstrap incluyen
|
||||
`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
|
||||
se serializan como números o `null`. Los campos anteriores de la respuesta conservan
|
||||
sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
|
||||
El guardado administrativo de
|
||||
`location` y `exact_location` también actualiza `addresses`; si una dirección está
|
||||
compartida con otro evento o con un tenant, se crea una copia para el evento editado.
|
||||
El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
|
||||
todas las direcciones en contacto, la principal en el footer y la propia del evento
|
||||
en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
|
||||
coordenadas.
|
||||
|
||||
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
||||
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
||||
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
||||
|
||||
Reference in New Issue
Block a user