Compare commits

..

23 Commits

Author SHA1 Message Date
1d58e0ad38 Merge branch 'feature/event_scoped_admin' into homo 2026-10-01 10:29:49 -03:00
856b9a6706 refactor: update menu code references from 'onticket.adminapp.tickets' to 'adminapp.tickets' 2026-10-01 10:29:06 -03:00
e7bece5bfd Merge branch 'refactor/inventory_stock' into homo 2026-10-01 10:00:54 -03:00
e2cf53eacc Merge branch 'refactor/inventory_stock' into homo 2026-10-01 10:00:41 -03:00
c7fc867905 Merge pull request 'feature/event_scoped_admin' (#14) from feature/event_scoped_admin into homo
Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-back/pulls/14
2026-10-01 12:51:08 +00:00
3ddff7e0ee feat(tests): enhance AdminAppTicketEventScopeTest with soft deletes and active ticket filtering 2026-10-01 09:47:32 -03:00
22de61c8c0 feat(tests): add AdminAppTicketEventScopeTest for event-based ticket management 2026-10-01 09:46:47 -03:00
2d11263adc feat(ticket): add event_id support to ticket service methods; update search, cancel, and refund calculations 2026-10-01 09:46:29 -03:00
c975b5d51d feat(menu): update ticket routes to use new menu code; add tests for menu access and route validation 2026-10-01 09:41:26 -03:00
c7afb70196 feat(staff): implement event scope for staff management; update controllers, services, and resources to handle event_id; add tests for event-based access 2026-10-01 09:25:25 -03:00
31955f862d feat(sale): implement event scope for sales, totals, and modifications; add tests for event-based access 2026-10-01 09:20:43 -03:00
bb4495c6cc feat(users): add event_id to users table and update related resources 2026-10-01 08:56:35 -03:00
6e1f0d731c Merge pull request 'homo' (#12) from homo into main
Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-back/pulls/12
2026-09-30 11:37:24 +00:00
fb5221854c Merge branch 'refactor/inventory_stock' of https://gitea.quo.ar/tbianchini/shopit-back into refactor/inventory_stock 2026-09-29 08:22:42 -03:00
c5aeb19735 refactor(inventory): enhance error reporting for negative stock validation 2026-09-28 19:43:15 +00:00
9db955bdcf refactor(inventory): update stock validation rules and enforce stock_difference requirement 2026-09-28 19:43:15 +00:00
e988e55b77 feat(admin-stock): apply idempotent availability deltas 2026-09-28 19:43:15 +00:00
bc60f1caa1 refactor(inventory): record stock operations consistently 2026-09-28 19:43:15 +00:00
068d5d7f4f feat(inventory): add calculated availability and movement ledger 2026-09-28 19:43:15 +00:00
82c18e9e91 Merge branch 'tenant/smep' into homo 2026-09-28 19:27:39 +00:00
dfad6fb4b0 Merge pull request 'fix/events_integrations' (#11) from fix/events_integrations into homo
Reviewed-on: https://gitea.quo.ar/tbianchini/shopit-back/pulls/11
2026-09-28 19:15:30 +00:00
3f9b773367 feat(integrations): resolve payment context from events 2026-09-28 19:14:23 +00:00
7996d53e12 feat(events): associate purchases and integrations with events 2026-09-28 19:13:36 +00:00
91 changed files with 957 additions and 2926 deletions

View File

@@ -8,12 +8,14 @@ use Illuminate\Database\Eloquent\Builder;
class PurchaseRefundSummaryService
{
public function totalForTenant(Tenant $tenant): string
public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
{
$total = TicketRefund::query()
->whereHas(
'purchaseItem.purchase',
fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
fn (Builder $query): Builder => $query
->where('tenant_codigo', $tenant->codigo)
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId))
)
->sum('amount');

View File

@@ -32,10 +32,10 @@ class SaleController extends Controller
$tenant = $request->user()->tenant()->firstOrFail();
return SaleResource::collection(
$this->saleService->sales($tenant, $request->validated())
$this->saleService->sales($tenant, $request->validated(), $request->user()->event_id)
)->additional([
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
'refunded_total' => $this->saleService->refundedTotal($tenant),
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id),
'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id),
]);
}
@@ -43,7 +43,7 @@ class SaleController extends Controller
{
$tenant = $request->user()->tenant()->firstOrFail();
return new SaleDetailResource($this->saleService->detail($tenant, $sale));
return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id));
}
public function tickets(Request $request, int $sale): AnonymousResourceCollection
@@ -51,7 +51,7 @@ class SaleController extends Controller
$tenant = $request->user()->tenant()->firstOrFail();
return SaleTicketResource::collection(
$this->saleService->tickets($tenant, $sale)
$this->saleService->tickets($tenant, $sale, $request->user()->event_id)
);
}
@@ -59,14 +59,14 @@ class SaleController extends Controller
{
$tenant = $request->user()->tenant()->firstOrFail();
return new SaleResource($this->saleService->confirm($tenant, $sale));
return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id));
}
public function cancel(Request $request, int $sale): SaleResource
{
$tenant = $request->user()->tenant()->firstOrFail();
return new SaleResource($this->saleService->cancel($tenant, $sale));
return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id));
}
public function modifications(
@@ -76,6 +76,7 @@ class SaleController extends Controller
$this->saleService->modifications(
$request->user()->tenant()->firstOrFail(),
$request->validated(),
$request->user()->event_id,
)
);
}
@@ -86,7 +87,7 @@ class SaleController extends Controller
return $this->salePdfService->downloadSales(
$tenant,
$this->saleService->salesForExport($tenant, $request->validated()),
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}
@@ -97,7 +98,7 @@ class SaleController extends Controller
return $this->salePdfService->downloadModifications(
$tenant,
$this->saleService->modificationsForExport($tenant, $request->validated()),
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}
@@ -108,7 +109,7 @@ class SaleController extends Controller
return $this->saleExcelService->downloadSales(
$tenant,
$this->saleService->salesForExport($tenant, $request->validated()),
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}
@@ -120,7 +121,7 @@ class SaleController extends Controller
return $this->saleExcelService->downloadModifications(
$tenant,
$this->saleService->modificationsForExport($tenant, $request->validated()),
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}

View File

@@ -2,7 +2,6 @@
namespace App\Domains\Commerce\Sale\Services;
use App\Shared\Logging\Models\ValueChange;
use App\Domains\Commerce\Purchase\Models\Purchase;
use App\Domains\Commerce\Purchase\Services\CheckoutService;
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
@@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant;
use App\Domains\Ticketing\Ticket\Models\Ticket;
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
use App\Shared\Logging\Models\ValueChange;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
@@ -21,19 +21,18 @@ class AdminAppSaleService
protected PurchaseRefundSummaryService $refundSummaryService,
) {}
public function confirmedSalesTotal(Tenant $tenant): string
public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
{
$total = Purchase::query()
->where('tenant_codigo', $tenant->codigo)
$total = $this->purchasesQuery($tenant, $eventId)
->where('status', Purchase::STATUS_PAID)
->sum('total');
return number_format((float) $total, 2, '.', '');
}
public function refundedTotal(Tenant $tenant): string
public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
{
return $this->refundSummaryService->totalForTenant($tenant);
return $this->refundSummaryService->totalForTenant($tenant, $eventId);
}
/**
@@ -47,43 +46,42 @@ class AdminAppSaleService
* } $filters
* @return LengthAwarePaginator<Purchase>
*/
public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
{
return $this->salesQuery($tenant, $filters)
return $this->salesQuery($tenant, $filters, $eventId)
->paginateFromRequest()
->withQueryString();
}
public function detail(Tenant $tenant, int $saleId): Purchase
public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
{
return Purchase::query()
->where('tenant_codigo', $tenant->codigo)
return $this->purchasesQuery($tenant, $eventId)
->with('items')
->findOrFail($saleId);
}
/** @return Collection<int, Ticket> */
public function tickets(Tenant $tenant, int $saleId): Collection
public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
{
return $this->findForTenant($tenant, $saleId)
return $this->findForTenant($tenant, $saleId, $eventId)
->tickets()
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
->orderBy('id')
->get();
}
public function confirm(Tenant $tenant, int $saleId): Purchase
public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
{
$sale = $this->findForTenant($tenant, $saleId);
$sale = $this->findForTenant($tenant, $saleId, $eventId);
return $this->saleForResponse(
$this->checkoutService->confirmPaidPurchase($sale)
);
}
public function cancel(Tenant $tenant, int $saleId): Purchase
public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
{
$sale = $this->findForTenant($tenant, $saleId);
$sale = $this->findForTenant($tenant, $saleId, $eventId);
return $this->saleForResponse(
$this->checkoutService->cancelPurchaseFromAdmin($sale)
@@ -94,18 +92,18 @@ class AdminAppSaleService
* @param array<string, mixed> $filters
* @return Collection<int, Purchase>
*/
public function salesForExport(Tenant $tenant, array $filters = []): Collection
public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
{
return $this->salesQuery($tenant, $filters)->get();
return $this->salesQuery($tenant, $filters, $eventId)->get();
}
/**
* @param array<string, mixed> $filters
* @return LengthAwarePaginator<ValueChange>
*/
public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
{
return $this->modificationsQuery($tenant, $filters)
return $this->modificationsQuery($tenant, $filters, $eventId)
->paginateFromRequest()
->withQueryString();
}
@@ -114,13 +112,13 @@ class AdminAppSaleService
* @param array<string, mixed> $filters
* @return Collection<int, ValueChange>
*/
public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
{
return $this->modificationsQuery($tenant, $filters)->get();
return $this->modificationsQuery($tenant, $filters, $eventId)->get();
}
/** @param array<string, mixed> $filters */
protected function salesQuery(Tenant $tenant, array $filters): Builder
protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
{
$sortColumns = [
'id' => 'id',
@@ -137,8 +135,7 @@ class AdminAppSaleService
? $requestedDirection
: 'desc';
return Purchase::query()
->where('tenant_codigo', $tenant->codigo)
return $this->purchasesQuery($tenant, $eventId)
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
$term = trim($search);
@@ -176,11 +173,18 @@ class AdminAppSaleService
* @param array<string, mixed> $filters
* @return Builder<ValueChange>
*/
protected function modificationsQuery(Tenant $tenant, array $filters): Builder
protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
{
return ValueChange::query()
->where('tenant_code', $tenant->codigo)
->where('trackable_type', (new Purchase)->getMorphClass())
->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph(
'trackable',
[Purchase::class],
fn (Builder $sales): Builder => $sales
->where('tenant_codigo', $tenant->codigo)
->where('event_id', $eventId),
))
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
$term = trim($search);
@@ -221,11 +225,18 @@ class AdminAppSaleService
->orderByDesc('id');
}
protected function findForTenant(Tenant $tenant, int $saleId): Purchase
protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
{
return $this->purchasesQuery($tenant, $eventId)
->findOrFail($saleId);
}
/** @return Builder<Purchase> */
protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder
{
return Purchase::query()
->where('tenant_codigo', $tenant->codigo)
->findOrFail($saleId);
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
}
protected function saleForResponse(Purchase $sale): Purchase

View File

@@ -29,4 +29,8 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant.
El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`.
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.

View File

@@ -1,47 +0,0 @@
<?php
namespace App\Domains\Core\Address\Models;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Domains\Ticketing\Event\Models\Event;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Address extends Model
{
protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
protected function casts(): array
{
return [
'latitude' => 'decimal:7',
'longitude' => 'decimal:7',
];
}
/** @return array{latitude: float, longitude: float}|null */
public function coordinates(): ?array
{
if ($this->latitude === null || $this->longitude === null) {
return null;
}
return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
}
/** @return HasMany<Event, $this> */
public function events(): HasMany
{
return $this->hasMany(Event::class);
}
/** @return BelongsToMany<Tenant, $this> */
public function tenants(): BelongsToMany
{
return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
->using(TenantAddress::class)
->withPivot(['id', 'is_main'])
->withTimestamps();
}
}

View File

@@ -1,33 +0,0 @@
<?php
namespace App\Domains\Core\Address\Models;
use App\Domains\Core\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\Pivot;
class TenantAddress extends Pivot
{
protected $table = 'tenant_addresses';
public $incrementing = true;
protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
protected function casts(): array
{
return ['is_main' => 'boolean'];
}
/** @return BelongsTo<Tenant, $this> */
public function tenant(): BelongsTo
{
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
}
/** @return BelongsTo<Address, $this> */
public function address(): BelongsTo
{
return $this->belongsTo(Address::class);
}
}

View File

@@ -1,22 +0,0 @@
<?php
namespace App\Domains\Core\Address\Resources;
use App\Domains\Core\Address\Models\Address;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
/** @mixin Address */
class AddressResource extends JsonResource
{
public function toArray(Request $request): array
{
return [
'id' => $this->id,
'label' => $this->label,
'address_text' => $this->address_text,
'latitude' => $this->latitude === null ? null : (float) $this->latitude,
'longitude' => $this->longitude === null ? null : (float) $this->longitude,
];
}
}

View File

@@ -20,6 +20,7 @@ class AdminAppAdministratorController extends Controller
return AdministratorResource::collection($this->administratorService->list(
$request->user()->tenant()->firstOrFail(),
$request->string('search')->trim()->toString() ?: null,
$request->user()->event_id,
));
}
@@ -28,6 +29,7 @@ class AdminAppAdministratorController extends Controller
return AdministratorResource::make($this->administratorService->create(
$request->user()->tenant()->firstOrFail(),
$request->validated(),
$request->user()->event_id,
));
}
@@ -37,6 +39,7 @@ class AdminAppAdministratorController extends Controller
$request->user()->tenant()->firstOrFail(),
$administrator,
$request->validated(),
$request->user()->event_id,
));
}

View File

@@ -18,6 +18,7 @@ class AdministratorResource extends JsonResource
'dni' => $this->dni,
'email' => $this->email,
'rol_codigo' => $this->rol_codigo,
'event_id' => $this->event_id,
'role' => $this->whenLoaded('role', fn () => [
'codigo' => $this->role?->codigo,
'nombre' => $this->role?->nombre,

View File

@@ -19,9 +19,9 @@ class AdministratorService
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
/** @return Collection<int, User> */
public function list(Tenant $tenant, ?string $search = null): Collection
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
{
return $this->query($tenant)->with('role')
return $this->query($tenant, $eventId)->with('role')
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
$query->where('nombre_apellido', 'like', "%{$search}%")
->orWhere('dni', 'like', "%{$search}%")
@@ -31,14 +31,15 @@ class AdministratorService
}
/** @param array<string, mixed> $data */
public function create(Tenant $tenant, array $data): User
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
{
return DB::transaction(function () use ($tenant, $data): User {
return DB::transaction(function () use ($tenant, $data, $eventId): User {
$administrator = User::query()->create([
...$this->attributes($data),
'password' => Str::random(64),
'rol_codigo' => RoleCode::AdminApp->value,
'tenant_codigo' => $tenant->codigo,
'event_id' => $eventId,
]);
$this->resetPasswordAttemptService->createForAdminAppEmail(
$administrator->email,
@@ -50,10 +51,10 @@ class AdministratorService
}
/** @param array<string, mixed> $data */
public function update(Tenant $tenant, int $administratorId, array $data): User
public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User
{
return DB::transaction(function () use ($tenant, $administratorId, $data): User {
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User {
$administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId);
$administrator->update($this->attributes($data));
return $administrator->load('role');
@@ -66,11 +67,11 @@ class AdministratorService
// Serialize deletions for this tenant, including requests already authenticated
// when another administrator removes their account.
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
$administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId);
if ($administrator->is($actor)) {
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
}
$activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
$activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get();
if ($activeAdministrators->count() <= 1) {
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
}
@@ -80,10 +81,11 @@ class AdministratorService
});
}
private function query(Tenant $tenant): Builder
private function query(Tenant $tenant, ?int $eventId = null): Builder
{
return User::query()->where('tenant_codigo', $tenant->codigo)
->where('rol_codigo', RoleCode::AdminApp->value);
->where('rol_codigo', RoleCode::AdminApp->value)
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
}
/** @param array<string, mixed> $data

View File

@@ -55,6 +55,8 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten
## Verificación
Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant.
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de

View File

@@ -2,11 +2,12 @@
namespace App\Domains\Core\Auth\Models;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Core\Authorization\Enums\RoleCode;
use App\Domains\Core\Authorization\Models\Role;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Domains\Ticketing\Event\Models\Event;
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
@@ -20,7 +21,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])]
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
class User extends Authenticatable
{
@@ -86,6 +87,12 @@ class User extends Authenticatable
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
}
/** @return BelongsTo<Event, $this> */
public function event(): BelongsTo
{
return $this->belongsTo(Event::class);
}
/** @return BelongsToMany<Category, $this> */
public function scanCategories(): BelongsToMany
{
@@ -103,6 +110,7 @@ class User extends Authenticatable
protected function casts(): array
{
return [
'event_id' => 'integer',
'email_verified_at' => 'datetime',
'password' => 'hashed',
'failed_login_attempts' => 'integer',

View File

@@ -24,6 +24,7 @@ class UserResource extends JsonResource
'telefono' => $this->telefono,
'rol_codigo' => $this->rol_codigo,
'tenant_codigo' => $this->tenant_codigo,
'event_id' => $this->event_id,
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
->map(fn ($category) => [
'id' => $category->id,

View File

@@ -33,11 +33,7 @@ class TenantBootstrapService
$tenant,
[
'eventDateChanges',
'menues' => fn ($query) => $query
->where(fn ($query) => $query
->where('menues.code', 'help.contact')
->orWhere('tenants_menues.is_enabled', true))
->whereHas(
'menues' => fn ($query) => $query->whereHas(
'roles',
fn ($query) => $query->where('codigo', RoleCode::User->value)
),

View File

@@ -76,7 +76,7 @@ class Menu extends Model
'codigo'
)
->using(TenantMenu::class)
->withPivot('static_content', 'is_enabled')
->withPivot('static_content')
->withTimestamps();
}

View File

@@ -16,14 +16,12 @@ class TenantMenu extends Pivot
'tenant_code',
'menu_code',
'static_content',
'is_enabled',
];
protected function casts(): array
{
return [
'static_content' => 'array',
'is_enabled' => 'boolean',
];
}

View File

@@ -26,6 +26,7 @@ class AdminAppStaffController extends Controller
return StaffResource::collection($this->staffService->list(
$request->user()->tenant()->firstOrFail(),
$request->string('search')->trim()->toString() ?: null,
$request->user()->event_id,
));
}
@@ -34,6 +35,7 @@ class AdminAppStaffController extends Controller
return StaffResource::make($this->staffService->create(
$request->user()->tenant()->firstOrFail(),
$request->validated(),
$request->user()->event_id,
));
}
@@ -43,12 +45,13 @@ class AdminAppStaffController extends Controller
$request->user()->tenant()->firstOrFail(),
$staff,
$request->validated(),
$request->user()->event_id,
));
}
public function destroy(Request $request, int $staff): Response
{
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id);
return response()->noContent();
}
@@ -60,6 +63,7 @@ class AdminAppStaffController extends Controller
$scanner = $this->staffService->find(
$request->user()->tenant()->firstOrFail(),
$staff,
$request->user()->event_id,
);
return ScanAttemptResource::collection(

View File

@@ -18,6 +18,7 @@ class StaffResource extends JsonResource
'dni' => $this->dni,
'email' => $this->email,
'rol_codigo' => $this->rol_codigo,
'event_id' => $this->event_id,
'role' => $this->whenLoaded('role', fn () => [
'codigo' => $this->role?->codigo,
'nombre' => $this->role?->nombre,

View File

@@ -2,11 +2,11 @@
namespace App\Domains\Core\Staff\Services;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
use App\Domains\Core\Authorization\Enums\RoleCode;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Core\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
@@ -22,9 +22,9 @@ class StaffService
) {}
/** @return Collection<int, User> */
public function list(Tenant $tenant, ?string $search = null): Collection
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
{
return $this->staffQuery($tenant)
return $this->staffQuery($tenant, $eventId)
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
->when($search, function (Builder $query, string $search): void {
$query->where(function (Builder $query) use ($search): void {
@@ -52,18 +52,19 @@ class StaffService
}
/** @param array<string, mixed> $data */
public function create(Tenant $tenant, array $data): User
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
{
$categoryIds = $this->categoryIdsFor($tenant, $data);
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
$staff = User::query()->create([
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
'email' => mb_strtolower(trim((string) $data['email'])),
'password' => Str::random(64),
'rol_codigo' => RoleCode::Scanner->value,
'tenant_codigo' => $tenant->codigo,
'event_id' => $eventId,
]);
$staff->scanCategories()->sync($categoryIds);
$this->resetPasswordAttemptService->createForScannerEmail(
@@ -76,9 +77,9 @@ class StaffService
}
/** @param array<string, mixed> $data */
public function update(Tenant $tenant, int $staffId, array $data): User
public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
{
$staff = $this->find($tenant, $staffId);
$staff = $this->find($tenant, $staffId, $eventId);
$categoryIds = $this->categoryIdsFor($tenant, $data);
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
@@ -92,9 +93,9 @@ class StaffService
});
}
public function delete(Tenant $tenant, int $staffId): void
public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
{
$staff = $this->find($tenant, $staffId);
$staff = $this->find($tenant, $staffId, $eventId);
DB::transaction(function () use ($staff): void {
$staff->tokens()->delete();
@@ -102,16 +103,17 @@ class StaffService
});
}
public function find(Tenant $tenant, int $staffId): User
public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
{
return $this->staffQuery($tenant)->findOrFail($staffId);
return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
}
private function staffQuery(Tenant $tenant): Builder
private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
{
return User::query()
->where('tenant_codigo', $tenant->codigo)
->where('rol_codigo', RoleCode::Scanner->value);
->where('rol_codigo', RoleCode::Scanner->value)
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
}
/**

View File

@@ -18,3 +18,5 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
## Dependencias y reglas
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant.

View File

@@ -1,31 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
use App\Domains\Core\Tenant\Services\BrandService;
use App\Domains\Core\Tenant\Services\TenantInformationService;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class BrandController extends Controller
{
public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
{
$tenant = $request->user()->tenant()->firstOrFail();
return BrandResource::make($tenantInformationService->load($tenant));
}
public function update(
UpdateBrandRequest $request,
BrandService $brandService,
TenantInformationService $tenantInformationService,
): BrandResource {
$tenant = $request->user()->tenant()->firstOrFail();
$brandService->update($tenant, $request->validated());
return BrandResource::make($tenantInformationService->load($tenant->fresh()));
}
}

View File

@@ -1,90 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class HelpMenuController extends Controller
{
private const MENU_CODES = [
'help.faq',
'help.terms-and-conditions',
];
public function index(Request $request): JsonResponse
{
$tenant = $request->user()->tenant()->firstOrFail();
$menus = $tenant->menues()
->whereIn('menues.code', self::MENU_CODES)
->get()
->keyBy('code');
return response()->json([
'data' => collect(self::MENU_CODES)->mapWithKeys(
fn (string $code): array => [$code => [
'code' => $code,
'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
'static_content' => $menus->get($code)?->pivot?->static_content
?? $this->emptyContent($code),
]]
),
]);
}
public function toggle(
Request $request,
string $menuCode,
): JsonResponse {
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
$tenant = $request->user()->tenant()->firstOrFail();
$tenantMenu = $tenant->menues()
->where('menues.code', $menuCode)
->firstOrFail();
$isEnabled = ! $tenantMenu->pivot->is_enabled;
$tenant->menues()->updateExistingPivot($menuCode, [
'is_enabled' => $isEnabled,
]);
return response()->json([
'data' => [
'code' => $tenantMenu->code,
'is_enabled' => $isEnabled,
],
]);
}
public function updateContent(
UpdateHelpMenuContentRequest $request,
string $menuCode,
): JsonResponse {
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
$tenant = $request->user()->tenant()->firstOrFail();
$tenantMenu = $tenant->menues()
->where('menues.code', $menuCode)
->firstOrFail();
$staticContent = $request->validated('static_content');
$tenant->menues()->updateExistingPivot($menuCode, [
'static_content' => $staticContent,
]);
return response()->json([
'data' => [
'code' => $tenantMenu->code,
'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
'static_content' => $staticContent,
],
]);
}
private function emptyContent(string $menuCode): array
{
return $menuCode === 'help.faq' ? [] : ['html' => ''];
}
}

View File

@@ -6,8 +6,6 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
use App\Domains\Commerce\Catalog\Models\CatalogItem;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Core\Address\Models\TenantAddress;
use App\Domains\Core\Client\Models\Client;
use App\Domains\Core\Menu\Models\Menu;
use App\Domains\Core\Menu\Models\TenantMenu;
@@ -24,7 +22,6 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
use Illuminate\Support\Facades\Schema;
#[Fillable([
@@ -311,23 +308,6 @@ class Tenant extends Model
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
}
/** @return BelongsToMany<Address, $this> */
public function addresses(): BelongsToMany
{
return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
->using(TenantAddress::class)
->withPivot(['id', 'is_main'])
->withTimestamps()
->orderByPivot('id');
}
/** @return HasOneThrough<Address, TenantAddress, $this> */
public function mainAddress(): HasOneThrough
{
return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
->where('tenant_addresses.is_main', true);
}
public function menues(): BelongsToMany
{
return $this->belongsToMany(
@@ -339,7 +319,7 @@ class Tenant extends Model
'code'
)
->using(TenantMenu::class)
->withPivot('static_content', 'is_enabled')
->withPivot('static_content')
->withTimestamps();
}
}

View File

@@ -1,31 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Requests\AdminApp;
use App\Shared\Rules\CroppedImageOrBase64Rule;
use App\Shared\Rules\ImageOrBase64Rule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateBrandRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
/** @return array<string, mixed> */
public function rules(): array
{
$shopit = $this->user()->tenant()->firstOrFail()->storefront_website_type_code === 'shopit';
return [
'nombre' => ['required', 'string', 'max:255'],
'primary_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
'footer_bg_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
'header_logo' => ['present', 'nullable', new ImageOrBase64Rule],
'footer_logo' => ['present', 'nullable', new ImageOrBase64Rule],
'banner_images' => [$shopit ? 'present' : 'prohibited', 'array', 'max:10'],
'banner_images.*' => ['required', new CroppedImageOrBase64Rule],
];
}
}

View File

@@ -1,31 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Requests\AdminApp;
use Illuminate\Foundation\Http\FormRequest;
class UpdateHelpMenuContentRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
/** @return array<string, mixed> */
public function rules(): array
{
return match ($this->route('menuCode')) {
'help.faq' => [
'static_content' => ['required', 'array'],
'static_content.*.pregunta' => ['required', 'string'],
'static_content.*.respuesta' => ['required', 'string'],
'static_content.*.is_active' => ['required', 'boolean'],
],
'help.terms-and-conditions' => [
'static_content' => ['required', 'array'],
'static_content.html' => ['present', 'nullable', 'string'],
],
default => [],
};
}
}

View File

@@ -1,104 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Resources\AdminApp;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Shared\Attachable\Models\Attachment;
use App\Shared\Attachable\Models\AttachmentCrop;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
/** @mixin Tenant */
class BrandResource extends JsonResource
{
/** @return array<string, mixed> */
public function toArray(Request $request): array
{
return [
'nombre' => $this->nombre,
'primary_color' => $this->primary_color,
'header_bg_color' => $this->header_bg_color,
'footer_color' => $this->footerColor(),
'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
'header_logo_key' => $this->headerLogo?->key,
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
'footer_logo_key' => $this->footerLogo?->key,
'can_edit_carousel' => $this->canEditCarousel(),
'banner_images' => $this->bannerImages(),
];
}
private function footerColor(): string
{
$footerColor = strtolower(trim((string) $this->footer_bg_color));
$primaryColor = strtolower(trim((string) $this->primary_color));
if ($footerColor !== '' && $footerColor === $primaryColor) {
return 'primary';
}
if (in_array($footerColor, ['#000', '#000000', 'black'], true)) {
return 'black';
}
if ($footerColor === '' || in_array($footerColor, ['#fff', '#ffffff', 'white'], true)) {
return 'white';
}
return 'primary';
}
/** @return array<int, array<string, mixed>> */
private function bannerImages(): array
{
if (! $this->canEditCarousel()) {
return [];
}
$extra = $this->websiteExtras->first(
fn ($extra) => $extra->is_enabled && $extra->websiteTypeExtra->codigo === 'carousel'
);
if ($extra === null) {
return [];
}
$images = $extra->resolvedConfig();
if (! is_array($images)) {
return [];
}
return collect($images)
->filter(fn ($image) => $image instanceof Attachment)
->map(function (Attachment $image): array {
$desktopCrop = $image->cropVariants
->firstWhere('variant', AttachmentCrop::DESKTOP);
return [
'key' => $image->key,
'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
'original_url' => $image->getTemporaryUrl(1440),
'crop' => $desktopCrop === null ? null : [
'crop_horizontal' => $desktopCrop->crop_horizontal,
'crop_vertical' => $desktopCrop->crop_vertical,
],
];
})
->values()
->all();
}
private function canEditCarousel(): bool
{
if ($this->storefront_website_type_code !== 'shopit') {
return false;
}
$extra = $this->websiteExtras->first(
fn ($extra) => $extra->websiteTypeExtra->codigo === 'carousel'
);
return $extra === null || $extra->is_enabled;
}
}

View File

@@ -1,14 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Resources;
use App\Domains\Core\Address\Resources\AddressResource;
use Illuminate\Http\Request;
class TenantAddressResource extends AddressResource
{
public function toArray(Request $request): array
{
return [...parent::toArray($request), 'is_main' => (bool) $this->pivot->is_main];
}
}

View File

@@ -3,7 +3,6 @@
namespace App\Domains\Core\Tenant\Resources;
use App\Domains\Commerce\Catalog\Models\Category;
use App\Domains\Core\Address\Resources\AddressResource;
use App\Domains\Core\Menu\Models\Menu;
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
use App\Domains\Core\Tenant\Models\Tenant;
@@ -42,8 +41,6 @@ class TenantResource extends JsonResource
'site_title' => $this->site_title ?? 'ShopitFront',
'asset_url' => config('filesystems.disks.s3.url'),
'address' => $this->address,
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
'phone' => $this->phone,
'favicon' => $this->favicon?->getTemporaryUrl(1440),
'primary_color' => $this->primary_color,
@@ -130,7 +127,6 @@ class TenantResource extends JsonResource
'subtitle' => $event->subtitle,
'description' => $event->description,
'location' => $event->location,
'address' => AddressResource::make($event->address),
'date_text' => $event->date_text,
'dates' => $event->dates
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)

View File

@@ -1,165 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Services;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Shared\Attachable\Enums\AttachmentType;
use App\Shared\Attachable\Models\Attachment;
use App\Shared\Attachable\Services\AttachmentService;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Throwable;
class BrandService
{
public function __construct(
private readonly AttachmentService $attachmentService,
private readonly WebsiteExtraService $websiteExtraService,
) {}
/** @param array<string, mixed> $data */
public function update(Tenant $tenant, array $data): void
{
$carousel = $tenant->storefront_website_type_code === 'shopit'
? $tenant->websiteExtras()->whereHas('websiteTypeExtra',
fn ($query) => $query->where('codigo', 'carousel'))->first()
: null;
$allowedBannerIds = is_array($carousel?->config) ? $carousel->config : [];
if ($carousel !== null && ! $carousel->is_enabled && ($data['banner_images'] ?? []) !== []) {
throw ValidationException::withMessages(['banner_images' => 'El carrusel está deshabilitado.']);
}
$seen = [];
foreach (['header_logo' => $tenant->header_logo_id, 'footer_logo' => $tenant->footer_logo_id] as $field => $id) {
$this->existingImage($data[$field], $id === null ? [] : [$id], $field);
}
foreach ($data['banner_images'] ?? [] as $index => $item) {
$image = is_array($item) ? $item['image'] : $item;
$attachment = $this->existingImage($image, $allowedBannerIds, "banner_images.{$index}");
if ($attachment !== null) {
if (isset($seen[$attachment->id])) {
throw ValidationException::withMessages(["banner_images.{$index}" => 'La imagen está repetida.']);
}
$seen[$attachment->id] = true;
}
}
$created = [];
try {
DB::transaction(function () use ($tenant, $data, $carousel, &$created): void {
$header = $this->logo($data['header_logo'], $tenant->header_logo_id, $tenant, $created);
$footer = $this->logo($data['footer_logo'], $tenant->footer_logo_id, $tenant, $created);
$tenant->update([
'nombre' => trim($data['nombre']),
'primary_color' => $data['primary_color'],
'footer_bg_color' => $data['footer_bg_color'],
'header_logo_id' => $header?->id,
'footer_logo_id' => $footer?->id,
]);
if ($tenant->storefront_website_type_code !== 'shopit'
|| ($carousel !== null && ! $carousel->is_enabled)) {
return;
}
$definition = $this->websiteExtraService->definitionForTenant($tenant, 'carousel');
$ids = [];
$recrops = [];
foreach ($data['banner_images'] as $item) {
$image = is_array($item) ? $item['image'] : $item;
$attachment = $this->existingImage($image, $carousel?->config ?? [], 'banner_images');
$crops = $this->crops($item);
if ($attachment === null) {
$attachment = $crops === null
? $this->attachmentService->store($image, "tenants/{$tenant->codigo}/extras/carousel")
: $this->attachmentService->storeCroppedImageVariants(
$image, "tenants/{$tenant->codigo}/extras/carousel", $crops
);
$created[] = $attachment;
} elseif ($crops !== null) {
$recrops[] = [$attachment, $crops];
}
$ids[] = $attachment->id;
}
$tenant->websiteExtras()->updateOrCreate(
['website_type_extra_id' => $definition->id],
['config' => $ids]
);
foreach ($recrops as [$attachment, $crops]) {
$this->attachmentService->updateImageCropVariants($attachment, $crops);
}
});
} catch (Throwable $error) {
foreach ($created as $attachment) {
$paths = [$attachment->path];
foreach ($attachment->cropVariants as $crop) {
if ($crop->croppedAttachment !== null) {
$paths[] = $crop->croppedAttachment->path;
}
}
Storage::disk('s3')->delete($paths);
}
throw $error;
}
}
/** @param array<int, int> $allowedIds */
private function existingImage(mixed $value, array $allowedIds, string $field): ?Attachment
{
if (! is_string($value) || ! Str::isUuid($value)) {
return null;
}
$attachment = Attachment::query()->where('key', $value)->first();
if ($attachment === null || $attachment->type !== AttachmentType::Image
|| ! in_array($attachment->id, $allowedIds, true)) {
throw ValidationException::withMessages([$field => 'La imagen no pertenece a esta marca.']);
}
return $attachment;
}
/** @param array<int, Attachment> $created */
private function logo(mixed $value, ?int $currentId, Tenant $tenant, array &$created): ?Attachment
{
if ($value === null) {
return null;
}
$existing = $this->existingImage($value, $currentId === null ? [] : [$currentId], 'logo');
if ($existing !== null) {
return $existing;
}
$attachment = $this->attachmentService->store($value, "tenants/{$tenant->codigo}/logos");
$created[] = $attachment;
return $attachment;
}
/** @return array<string, array<string, mixed>>|null */
private function crops(mixed $item): ?array
{
if (! is_array($item)) {
return null;
}
if (! isset($item['crop_horizontal'], $item['crop_vertical'])) {
return null;
}
$crop = [
'crop_horizontal' => $item['crop_horizontal'],
'crop_vertical' => $item['crop_vertical'],
];
return ['desktop' => $crop, 'mobile' => $crop];
}
}

View File

@@ -1,26 +0,0 @@
<?php
namespace App\Domains\Core\Tenant\Services;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Core\Tenant\Models\Tenant;
use Illuminate\Support\Facades\DB;
class TenantAddressService
{
public function setMainAddress(Tenant $tenant, Address $address): void
{
DB::transaction(function () use ($tenant, $address): void {
// Serialize changes for this tenant, including when it has no principal address yet.
Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
$tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
$tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
});
$tenant->unsetRelation('addresses');
$tenant->unsetRelation('mainAddress');
}
}

View File

@@ -18,12 +18,9 @@ class TenantInformationService
'footerBackgroundImage',
'storefrontWebsiteType',
'socialMedia',
'addresses',
'mainAddress',
'websiteExtras.websiteTypeExtra',
'activeEvent.dates',
'activeEvent.socialMedia',
'activeEvent.address',
];
/**

View File

@@ -1,18 +1,11 @@
<?php
use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
use Illuminate\Support\Facades\Route;
Route::prefix('v1/adminapp/tenant')
->middleware(['auth:sanctum', 'adminapp.tenant'])
->group(function (): void {
Route::get('brand', [BrandController::class, 'show']);
Route::put('brand', [BrandController::class, 'update']);
Route::get('help-menus', [HelpMenuController::class, 'index']);
Route::patch('help-menus/{menuCode}/toggle', [HelpMenuController::class, 'toggle']);
Route::put('help-menus/{menuCode}/content', [HelpMenuController::class, 'updateContent']);
Route::get('website-extras', [WebsiteExtraController::class, 'show']);
Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);

View File

@@ -5,28 +5,28 @@ use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
use Illuminate\Support\Facades\Route;
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->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'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->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'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->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'])
->whereNumber('reservation')
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->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'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->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'])
->whereNumber('reservation')
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
->name('adminapp.desfile.entry-reservations.destroy');
Route::prefix('v1/adminapp/tenant/desfile')
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
->group(function (): void {
Route::get('entries', [EntryController::class, 'show'])
->name('adminapp.desfile.entries.show');

View File

@@ -3,7 +3,6 @@
namespace App\Domains\Ticketing\Event\Models;
use App\Domains\Commerce\Catalog\Models\CatalogItem;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Core\Client\Models\Client;
use App\Domains\Core\Tenant\Models\SocialMedia;
use App\Domains\Core\Tenant\Models\Tenant;
@@ -16,14 +15,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
class Event extends Model
{
use HasFactory;
protected function casts(): array
{
return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
return ['client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
}
/** @return BelongsTo<Tenant, $this> */
@@ -38,12 +37,6 @@ class Event extends Model
return $this->belongsTo(Client::class);
}
/** @return BelongsTo<Address, $this> */
public function address(): BelongsTo
{
return $this->belongsTo(Address::class);
}
public function effectiveClient(): Client
{
return $this->client ?? $this->tenant->client;

View File

@@ -2,7 +2,6 @@
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;
@@ -22,7 +21,6 @@ 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,

View File

@@ -5,7 +5,6 @@ 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;
@@ -20,7 +19,6 @@ 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,

View File

@@ -1,37 +0,0 @@
<?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);
}
}

View File

@@ -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,12 +32,11 @@ 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', 'address']);
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
}
/** @param array<string, mixed> $data */
@@ -50,7 +49,6 @@ 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',
@@ -66,7 +64,7 @@ class EventService
$this->syncLegacyContact($event, $data['contact']);
}
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
return $event->load(['dates.validityTime', 'socialMedia']);
});
}

View File

@@ -23,12 +23,11 @@ class PublicEventService
$query->where(function ($query) use ($term): void {
$query->where('title', 'like', '%'.$term.'%')
->orWhere('subtitle', 'like', '%'.$term.'%')
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
->orWhere('location', 'like', '%'.$term.'%');
});
}
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
}
public function find(Tenant $tenant, Event $event): Event
@@ -39,7 +38,6 @@ class PublicEventService
return $event->load([
'attachment',
'address',
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
'socialMedia',
'catalogItems.attachments',

View File

@@ -13,32 +13,6 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
ubicación; no modifica los campos ni los timestamps originales, ni vincula la
dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
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

View File

@@ -19,48 +19,48 @@ Route::prefix('v1/adminapp/tenant')
->middleware("tenant.menu:{$menuCode}");
};
$visibilityRoutes('entries', 'entries', 'onticket.adminapp.fiesta-futbol-infantil.entradas');
$visibilityRoutes('foods', 'foods', 'onticket.adminapp.fiesta-futbol-infantil.comida');
$visibilityRoutes('accommodations', 'accommodations', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos');
$visibilityRoutes('merchandise', 'merchandise', 'onticket.adminapp.fiesta-futbol-infantil.merchandising');
$visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
$visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
$visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
$visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
Route::get('entries', [EntryController::class, 'index'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
->name('adminapp.fiesta-futbol-infantil.entries.index');
Route::post('entries', [EntryController::class, 'store'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
->name('adminapp.fiesta-futbol-infantil.entries.store');
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
Route::get('foods', [FoodController::class, 'index'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
->name('adminapp.fiesta-futbol-infantil.foods.index');
Route::post('foods', [FoodController::class, 'store'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
->name('adminapp.fiesta-futbol-infantil.foods.store');
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
Route::get('accommodations', [AccommodationController::class, 'index'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
Route::post('accommodations', [AccommodationController::class, 'store'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
Route::get('merchandise', [MerchandiseController::class, 'index'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
Route::post('merchandise', [MerchandiseController::class, 'store'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
});

View File

@@ -29,7 +29,7 @@ class TicketController extends Controller
$tenant = $request->user()->tenant()->firstOrFail();
return new AdminAppTicketCollection(
$this->ticketService->search($tenant, $request->validated())
$this->ticketService->search($tenant, $request->validated(), $request->user()->event_id)
);
}
@@ -37,7 +37,7 @@ class TicketController extends Controller
{
$tenant = $request->user()->tenant()->firstOrFail();
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket));
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id));
}
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
@@ -45,7 +45,7 @@ class TicketController extends Controller
$tenant = $request->user()->tenant()->firstOrFail();
return new AdminAppTicketRefundCalculationResource(
$this->ticketService->calculateRefund($tenant, $ticket)
$this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id)
);
}
@@ -69,7 +69,7 @@ class TicketController extends Controller
return $this->ticketPdfService->download(
$tenant,
$this->ticketService->ticketsForExport($tenant, $request->validated()),
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}
@@ -80,7 +80,7 @@ class TicketController extends Controller
return $this->ticketExcelService->download(
$tenant,
$this->ticketService->ticketsForExport($tenant, $request->validated()),
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
$request->validated('timezone'),
);
}

View File

@@ -41,9 +41,9 @@ class AdminAppTicketService
/**
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
*/
public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult
public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult
{
$query = $this->baseQuery($tenant, $filters);
$query = $this->baseQuery($tenant, $filters, $eventId);
$countQuery = clone $query;
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
@@ -77,7 +77,7 @@ class AdminAppTicketService
tickets: $tickets,
scannedTickets: $scannedTickets,
totalTickets: $totalTickets,
refundedTotal: $this->refundSummaryService->totalForTenant($tenant),
refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId),
);
}
@@ -85,9 +85,9 @@ class AdminAppTicketService
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
* @return Collection<int, Ticket>
*/
public function ticketsForExport(Tenant $tenant, array $filters = []): Collection
public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
{
$query = $this->baseQuery($tenant, $filters);
$query = $this->baseQuery($tenant, $filters, $eventId);
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
$tickets = $query
->with(self::RELATIONS)
@@ -97,11 +97,10 @@ class AdminAppTicketService
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
}
public function cancel(Tenant $tenant, int $ticketId): Ticket
public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket
{
return DB::transaction(function () use ($tenant, $ticketId): Ticket {
$ticket = Ticket::query()
->where('tenant_code', $tenant->codigo)
return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket {
$ticket = $this->ticketsQuery($tenant, $eventId)
->lockForUpdate()
->findOrFail($ticketId);
@@ -124,10 +123,9 @@ class AdminAppTicketService
* partial: string|null,
* }
*/
public function calculateRefund(Tenant $tenant, int $ticketId): array
public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array
{
$ticket = Ticket::query()
->where('tenant_code', $tenant->codigo)
$ticket = $this->ticketsQuery($tenant, $eventId)
->findOrFail($ticketId);
if (! $ticket->can_refund()) {
@@ -175,14 +173,13 @@ class AdminAppTicketService
string $refundType,
?User $createdBy = null,
): Ticket {
$this->ensureRefundIsAllowed($tenant, $refundType);
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
$ticket = Ticket::query()
->where('tenant_code', $tenant->codigo)
$ticket = $this->ticketsQuery($tenant, $createdBy?->event_id)
->lockForUpdate()
->findOrFail($ticketId);
$this->ensureRefundIsAllowed($tenant, $refundType);
if (! $ticket->can_refund()) {
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
throw ValidationException::withMessages([
@@ -310,12 +307,11 @@ class AdminAppTicketService
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
* @return Builder<Ticket>
*/
private function baseQuery(Tenant $tenant, array $filters): Builder
private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
{
$search = trim((string) ($filters['q'] ?? ''));
$query = Ticket::query()
->where('tenant_code', $tenant->codigo)
$query = $this->ticketsQuery($tenant, $eventId)
->when($search !== '', function (Builder $query) use ($search): void {
$this->applySearchFilter($query, $search);
})
@@ -355,6 +351,14 @@ class AdminAppTicketService
return $query;
}
/** @return Builder<Ticket> */
private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder
{
return Ticket::query()
->where('tenant_code', $tenant->codigo)
->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId));
}
/** @param Builder<Ticket> $query */
private function applySearchFilter(Builder $query, string $search): void
{

View File

@@ -82,13 +82,17 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
- `POST /tickets/pdf`.
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
`onticket.adminapp.tickets`:
`adminapp.tickets`:
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
`scanned_tickets` y `total_tickets` para el tenant autenticado.
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant.
La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente.
## Dependencias y reglas
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.

View File

@@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant')
->middleware(['auth:sanctum', 'adminapp.tenant'])
->group(function (): void {
Route::get('tickets', [TicketController::class, 'index'])
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.index');
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
->whereNumber('ticket')
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.cancel');
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
->whereNumber('ticket')
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.calculate-refund');
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
->whereNumber('ticket')
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.refund');
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.pdf');
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.tickets.excel');
});

View File

@@ -13,9 +13,6 @@ class EnsureTenantHasMenu
$tenant = $request->user()?->tenant()->first();
$hasMenu = $tenant?->menues()
->where('menues.code', $menuCode)
->where(fn ($query) => $query
->where('menues.code', 'help.contact')
->orWhere('tenants_menues.is_enabled', true))
->exists() ?? false;
abort_unless($hasMenu, 404);

View File

@@ -18,12 +18,12 @@ Route::prefix('v1/adminapp/forms')
Route::get(
'desfile/entry-reservation',
DesfileEntryReservationFormController::class
)->middleware('tenant.menu:onticket.adminapp.desfile.reservas')
)->middleware('tenant.menu:adminapp.desfile.reservas')
->name('adminapp.forms.desfile.entry-reservation');
Route::get('sale', SaleFormController::class);
Route::get('staff', StaffFormController::class);
Route::get('tickets-filter', TicketFilterFormController::class)
->middleware('tenant.menu:onticket.adminapp.tickets')
->middleware('tenant.menu:adminapp.tickets')
->name('adminapp.forms.tickets-filter');
Route::get(
'fiesta-futbol-infantil/ticket',

View File

@@ -41,7 +41,7 @@ return new class extends Migration
return;
}
$sourcePath = public_path('images/website_types/onticket/'.self::FILENAME);
$sourcePath = public_path('images/website_types/'.self::FILENAME);
if (! is_file($sourcePath)) {
throw new RuntimeException("Favicon not found at path: {$sourcePath}");

View File

@@ -1,47 +0,0 @@
<?php
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
use App\Domains\Core\Tenant\Services\AdminWebsiteTypeService;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
return new class extends Migration
{
public function up(): void
{
if (app()->environment('testing')) {
Storage::fake('s3');
}
if (! AdminWebsiteType::query()->where('codigo', 'shopit')->exists()) {
return;
}
app(AdminWebsiteTypeService::class)->updateOrCreate(
['codigo' => 'shopit'],
[
'primary_color' => '#2FD3AC',
'site_logo' => $this->uploadedImage('shopit_logo.png', 'image/png'),
'footer_logo' => $this->uploadedImage('shopit_footer_logo.png', 'image/png'),
'favicon' => $this->uploadedImage('shopit-favicon.svg', 'image/svg+xml'),
],
);
}
public function down(): void
{
// Brand assets are operational data and are intentionally preserved.
}
private function uploadedImage(string $filename, string $mimeType): UploadedFile
{
$path = public_path("images/website_types/shopit/{$filename}");
if (! is_file($path)) {
throw new RuntimeException("ShopIt image not found at path: {$path}");
}
return new UploadedFile($path, $filename, $mimeType, null, true);
}
};

View File

@@ -1,236 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class extends Migration
{
private const ONTICKET_MENUS = [
'adminapp.event' => ['onticket.adminapp.event', 'Eventos', '/admin/event'],
'adminapp.inicio' => ['onticket.adminapp.inicio', 'Inicio', '/admin/inicio'],
'adminapp.catalog' => ['onticket.adminapp.catalog', 'Catálogo', '/admin/catalog'],
'adminapp.combos' => ['onticket.adminapp.combos', 'Combos', '/admin/combos'],
'adminapp.categories' => ['onticket.adminapp.categories', 'Categorías', '/admin/categories'],
'adminapp.ventas' => ['onticket.adminapp.ventas', 'Ventas', '/admin/ventas'],
'adminapp.staff' => ['onticket.adminapp.staff', 'Usuarios', '/admin/staff'],
'adminapp.tickets' => ['onticket.adminapp.tickets', 'Tickets', '/admin/tickets'],
'adminapp.fiesta-futbol-infantil.entradas' => [
'onticket.adminapp.fiesta-futbol-infantil.entradas',
'Entradas',
'/admin/entradas',
],
'adminapp.fiesta-futbol-infantil.alojamientos' => [
'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
'Alojamientos',
'/admin/alojamientos',
],
'adminapp.fiesta-futbol-infantil.merchandising' => [
'onticket.adminapp.fiesta-futbol-infantil.merchandising',
'Merchandising',
'/admin/merchandising',
],
'adminapp.fiesta-futbol-infantil.comida' => [
'onticket.adminapp.fiesta-futbol-infantil.comida',
'Comida',
'/admin/comidas',
],
'adminapp.desfile.entradas' => [
'onticket.adminapp.desfile.entradas',
'Entradas',
'/admin/desfile/entradas',
],
'adminapp.desfile.reservas' => [
'onticket.adminapp.desfile.reservas',
'Reserva de Tickets',
'/admin/desfile/reservas',
],
];
private const SHOPIT_MENUS = [
'shopit.adminapp.marca' => ['Marca', '/admin/marca'],
'shopit.adminapp.contacto' => ['Contacto', '/admin/contacto'],
'shopit.adminapp.productos' => ['Productos', '/admin/productos'],
'shopit.adminapp.categorias' => ['Categorías', '/admin/categorias'],
'shopit.adminapp.transacciones' => ['Transacciones', '/admin/transacciones'],
'shopit.adminapp.reportes' => ['Reportes', '/admin/reportes'],
'shopit.adminapp.usuarios_roles' => ['Usuarios y roles', '/admin/usuarios-roles'],
];
private const LEGACY_SHOPIT_ADMIN_MENUS = [
'adminapp.event',
'adminapp.inicio',
'adminapp.catalog',
'adminapp.combos',
'adminapp.categories',
'adminapp.ventas',
'adminapp.staff',
];
public function up(): void
{
DB::transaction(function (): void {
if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
return;
}
foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
$this->replaceMenuCode($legacyCode, $code, $label, $route);
$this->assignMenuToAdminRoles($code);
}
foreach (self::SHOPIT_MENUS as $code => [$label, $route]) {
$this->upsertMenu($code, $label, $route);
$this->assignMenuToAdminRoles($code);
}
$shopItTenantCodes = DB::table('tenants')
->where('admin_website_type_code', 'shopit')
->pluck('codigo');
if ($shopItTenantCodes->isEmpty()) {
return;
}
$adminMenuCodes = DB::table('menues')
->where('parent_menu_code', 'main.adminapp')
->pluck('code');
DB::table('tenants_menues')
->whereIn('tenant_code', $shopItTenantCodes)
->whereIn('menu_code', $adminMenuCodes)
->delete();
foreach ($shopItTenantCodes as $tenantCode) {
$this->assignMenuToTenant($tenantCode, 'main.adminapp');
foreach (array_keys(self::SHOPIT_MENUS) as $menuCode) {
$this->assignMenuToTenant($tenantCode, $menuCode);
}
}
});
}
public function down(): void
{
DB::transaction(function (): void {
if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
return;
}
$shopItTenantCodes = DB::table('tenants')
->where('admin_website_type_code', 'shopit')
->pluck('codigo');
DB::table('tenants_menues')
->whereIn('tenant_code', $shopItTenantCodes)
->whereIn('menu_code', array_keys(self::SHOPIT_MENUS))
->delete();
DB::table('roles_menues')
->whereIn('menu_codigo', array_keys(self::SHOPIT_MENUS))
->delete();
DB::table('menues')
->whereIn('code', array_keys(self::SHOPIT_MENUS))
->delete();
foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
$this->replaceMenuCode($code, $legacyCode, $label, $route);
}
foreach ($shopItTenantCodes as $tenantCode) {
foreach (self::LEGACY_SHOPIT_ADMIN_MENUS as $menuCode) {
$this->assignMenuToTenant($tenantCode, $menuCode);
}
}
});
}
private function replaceMenuCode(
string $sourceCode,
string $targetCode,
string $label,
string $route,
): void {
$source = DB::table('menues')->where('code', $sourceCode)->first();
$this->upsertMenu($targetCode, $label, $route, $source);
if ($source === null) {
return;
}
DB::table('tenants_menues')
->where('menu_code', $sourceCode)
->get()
->each(function (object $assignment) use ($targetCode): void {
DB::table('tenants_menues')->updateOrInsert(
[
'tenant_code' => $assignment->tenant_code,
'menu_code' => $targetCode,
],
[
'static_content' => $assignment->static_content,
'created_at' => $assignment->created_at ?? now(),
'updated_at' => now(),
],
);
});
DB::table('roles_menues')
->where('menu_codigo', $sourceCode)
->pluck('rol_codigo')
->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
'rol_codigo' => $roleCode,
'menu_codigo' => $targetCode,
]));
DB::table('tenants_menues')->where('menu_code', $sourceCode)->delete();
DB::table('roles_menues')->where('menu_codigo', $sourceCode)->delete();
DB::table('menues')->where('code', $sourceCode)->delete();
}
private function upsertMenu(
string $code,
string $label,
string $route,
?object $source = null,
): void {
DB::table('menues')->updateOrInsert(
['code' => $code],
[
'label' => $source->label ?? $label,
'parent_menu_code' => 'main.adminapp',
'content_type' => $source->content_type ?? 'dynamic',
'static_content_schema' => $source->static_content_schema ?? null,
'route' => $source->route ?? $route,
'created_at' => $source->created_at ?? now(),
'updated_at' => now(),
],
);
}
private function assignMenuToAdminRoles(string $menuCode): void
{
DB::table('roles')
->whereIn('codigo', ['admin', 'adminapp'])
->pluck('codigo')
->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
'rol_codigo' => $roleCode,
'menu_codigo' => $menuCode,
]));
}
private function assignMenuToTenant(string $tenantCode, string $menuCode): void
{
DB::table('tenants_menues')->updateOrInsert(
[
'tenant_code' => $tenantCode,
'menu_code' => $menuCode,
],
[
'static_content' => null,
'created_at' => now(),
'updated_at' => now(),
],
);
}
};

View File

@@ -1,22 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('tenants_menues', function (Blueprint $table): void {
$table->boolean('is_enabled')->default(true);
});
}
public function down(): void
{
Schema::table('tenants_menues', function (Blueprint $table): void {
$table->dropColumn('is_enabled');
});
}
};

View File

@@ -1,29 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class extends Migration
{
public function up(): void
{
DB::table('menues')
->where('code', 'help.terms-and-conditions')
->update([
'content_type' => 'static',
'static_content_schema' => json_encode([
'html' => 'present|nullable|string',
], JSON_THROW_ON_ERROR),
]);
}
public function down(): void
{
DB::table('menues')
->where('code', 'help.terms-and-conditions')
->update([
'content_type' => 'dynamic',
'static_content_schema' => null,
]);
}
};

View File

@@ -1,57 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
$driver = DB::connection()->getDriverName();
if (! in_array($driver, ['mysql', 'mariadb', 'sqlite', 'pgsql', 'sqlsrv'], true)) {
throw new RuntimeException("Unsupported address database driver: {$driver}");
}
Schema::create('addresses', function (Blueprint $table): void {
$table->id();
$table->string('label');
$table->text('address_text');
$table->decimal('latitude', 10, 7)->nullable();
$table->decimal('longitude', 10, 7)->nullable();
$table->timestamps();
});
Schema::create('tenant_addresses', function (Blueprint $table) use ($driver): void {
$table->id();
$table->string('tenant_codigo');
$table->foreignId('address_id')->constrained('addresses')->cascadeOnDelete();
$table->boolean('is_main')->default(false);
$table->timestamps();
$table->foreign('tenant_codigo')->references('codigo')->on('tenants')->cascadeOnDelete();
$table->unique(['tenant_codigo', 'address_id']);
if (in_array($driver, ['mysql', 'mariadb'], true)) {
// NULL allows many secondary addresses, while a tenant code can occur only once.
$table->string('main_tenant_codigo')->nullable()
->virtualAs('CASE WHEN is_main = 1 THEN tenant_codigo ELSE NULL END');
$table->unique('main_tenant_codigo', 'tenant_addresses_one_main_per_tenant');
}
});
if (! in_array($driver, ['mysql', 'mariadb'], true)) {
$condition = $driver === 'pgsql' ? 'is_main = true' : 'is_main = 1';
DB::statement('CREATE UNIQUE INDEX tenant_addresses_one_main_per_tenant '
."ON tenant_addresses (tenant_codigo) WHERE {$condition}");
}
}
public function down(): void
{
Schema::dropIfExists('tenant_addresses');
Schema::dropIfExists('addresses');
}
};

View File

@@ -1,108 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class extends Migration
{
public function up(): void
{
DB::transaction(function (): void {
DB::table('tenants_menues')
->where('menu_code', 'help.contact')
->whereNotNull('static_content')
->orderBy('id')
->chunkById(100, function ($menus): void {
foreach ($menus as $menu) {
$content = json_decode($menu->static_content, true, flags: JSON_THROW_ON_ERROR);
if ($content === null) {
continue;
}
if (! is_array($content) || ! is_array($content['locations'] ?? [])) {
throw new RuntimeException("Invalid contact locations for tenant {$menu->tenant_code}");
}
foreach ($content['locations'] ?? [] as $location) {
if (! is_array($location) || ! is_array($location['addresses'] ?? [])) {
throw new RuntimeException("Invalid contact addresses for tenant {$menu->tenant_code}");
}
foreach ($location['addresses'] ?? [] as $address) {
$this->copyAddress($menu->tenant_code, $location, $address);
}
}
}
});
});
}
private function copyAddress(string $tenantCode, array $location, mixed $address): void
{
if (! is_array($address) || ! is_string($address['address'] ?? null)
|| trim($address['address']) === '') {
throw new RuntimeException("Invalid contact address text for tenant {$tenantCode}");
}
$coordinates = $address['coordinates'] ?? null;
if ($coordinates !== null && (! is_array($coordinates) || count($coordinates) !== 2
|| ! is_numeric($coordinates[0] ?? null) || ! is_numeric($coordinates[1] ?? null)
|| ! is_finite((float) $coordinates[0]) || ! is_finite((float) $coordinates[1])
|| abs((float) $coordinates[0]) > 90 || abs((float) $coordinates[1]) > 180)) {
throw new RuntimeException("Invalid contact coordinates for tenant {$tenantCode}");
}
$label = $address['label'] ?? $location['label'] ?? 'Dirección';
if (! is_string($label) || trim($label) === '' || mb_strlen($label) > 255) {
throw new RuntimeException("Invalid contact address label for tenant {$tenantCode}");
}
$values = [
'label' => $label,
'address_text' => $address['address'],
'latitude' => $coordinates === null ? null : number_format((float) $coordinates[0], 7, '.', ''),
'longitude' => $coordinates === null ? null : number_format((float) $coordinates[1], 7, '.', ''),
];
// Reuse only within this tenant; equal legacy addresses in different tenants stay independent.
$existing = DB::table('addresses')
->join('tenant_addresses', 'tenant_addresses.address_id', '=', 'addresses.id')
->where('tenant_addresses.tenant_codigo', $tenantCode)
->where(array_combine(
array_map(fn (string $field): string => 'addresses.'.$field, array_keys($values)),
array_values($values),
))
->first(['addresses.id', 'tenant_addresses.id as link_id']);
if ($existing !== null) {
return;
}
$now = now();
$isMain = ! DB::table('tenant_addresses')
->where('tenant_codigo', $tenantCode)
->where('is_main', true)
->exists();
$addressId = DB::table('addresses')->insertGetId([
...$values,
'created_at' => $now,
'updated_at' => $now,
]);
DB::table('tenant_addresses')->insert([
'tenant_codigo' => $tenantCode,
'address_id' => $addressId,
'is_main' => $isMain,
'created_at' => $now,
'updated_at' => $now,
]);
}
public function down(): void
{
// Keep copies: they may already have been edited or reused. Legacy menus were never changed.
}
};

View File

@@ -1,22 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('events', function (Blueprint $table): void {
$table->foreignId('address_id')->nullable()->constrained('addresses')->nullOnDelete();
});
}
public function down(): void
{
Schema::table('events', function (Blueprint $table): void {
$table->dropConstrainedForeignId('address_id');
});
}
};

View File

@@ -1,57 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class extends Migration
{
public function up(): void
{
DB::transaction(function (): void {
DB::table('events')->whereNull('address_id')->orderBy('id')->lockForUpdate()
->chunkById(100, function ($events): void {
foreach ($events as $event) {
$coordinates = $event->exact_location === null
? null
: json_decode($event->exact_location, true, flags: JSON_THROW_ON_ERROR);
if ($coordinates !== null && (! is_array($coordinates)
|| ! is_numeric($coordinates['latitude'] ?? null)
|| ! is_numeric($coordinates['longitude'] ?? null)
|| ! is_finite((float) $coordinates['latitude'])
|| ! is_finite((float) $coordinates['longitude'])
|| abs((float) $coordinates['latitude']) > 90
|| abs((float) $coordinates['longitude']) > 180)) {
throw new RuntimeException("Invalid location coordinates for event {$event->id}");
}
if ($event->location === null || trim($event->location) === '') {
if ($coordinates !== null) {
throw new RuntimeException("Missing address text for event {$event->id}");
}
continue;
}
$now = now();
$addressId = DB::table('addresses')->insertGetId([
'label' => 'Ubicación del evento',
'address_text' => $event->location,
'latitude' => $coordinates === null ? null : $coordinates['latitude'],
'longitude' => $coordinates === null ? null : $coordinates['longitude'],
'created_at' => $now,
'updated_at' => $now,
]);
// Update only the new link, preserving the original fields and timestamps.
DB::table('events')->where('id', $event->id)->update(['address_id' => $addressId]);
}
});
});
}
public function down(): void
{
// Copies may already have been edited or shared; keep them and the legacy data.
}
};

View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('users', function (Blueprint $table): void {
$table->foreignId('event_id')
->nullable()
->after('tenant_codigo')
->constrained('events')
->cascadeOnUpdate()
->restrictOnDelete();
});
}
public function down(): void
{
Schema::table('users', function (Blueprint $table): void {
$table->dropForeign(['event_id']);
$table->dropColumn('event_id');
});
}
};

View File

@@ -14,7 +14,6 @@ use App\Shared\Enums\FieldType;
use Illuminate\Database\Seeder;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Storage;
use RuntimeException;
@@ -52,19 +51,14 @@ class FiestaTradicionArrufoSeeder extends Seeder
['tenant_code' => $tenant->codigo, 'title' => self::TITLE],
['published_at' => now()],
);
$eventData = [
$event->update([
'client_id' => $client->id,
'subtitle' => 'Una noche para celebrar nuestras raíces y mantener viva la tradición gaucha.',
'description' => 'La 26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas reunirá a agrupaciones, artesanos, pilcheros y público en general para compartir una jornada dedicada a nuestras costumbres y cultura.'
."\n\n".'Un encuentro para disfrutar de la tradición, la identidad gaucha y el espíritu de camaradería, en el Predio de Doma del Club Unión Deportiva Arrufó.'
."\n\n".'Organiza: Biblioteca Popular Miguel Ángel Sosa.',
'location' => 'Predio de Doma del Club Unión Deportiva Arrufó',
];
if (Schema::hasColumn('events', 'client_id')) {
$eventData['client_id'] = $client->id;
}
$event->update($eventData);
]);
$eventImage = $event->attachment;
if ($eventImage === null || ! Storage::disk('s3')->exists($eventImage->path)) {

View File

@@ -53,131 +53,89 @@ class MenuSeeder extends Seeder
'route' => '/scanner/detail/:id',
],
[
'code' => 'onticket.adminapp.event',
'code' => 'adminapp.event',
'label' => 'Eventos',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/event',
],
[
'code' => 'onticket.adminapp.inicio',
'code' => 'adminapp.inicio',
'label' => 'Inicio',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/inicio',
],
[
'code' => 'onticket.adminapp.catalog',
'code' => 'adminapp.catalog',
'label' => 'Catálogo',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/catalog',
],
[
'code' => 'onticket.adminapp.combos',
'code' => 'adminapp.combos',
'label' => 'Combos',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/combos',
],
[
'code' => 'onticket.adminapp.categories',
'code' => 'adminapp.categories',
'label' => 'Categorías',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/categories',
],
[
'code' => 'onticket.adminapp.ventas',
'code' => 'adminapp.ventas',
'label' => 'Ventas',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/ventas',
],
[
'code' => 'onticket.adminapp.staff',
'code' => 'adminapp.staff',
'label' => 'Usuarios',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/staff',
],
[
'code' => 'onticket.adminapp.tickets',
'code' => 'adminapp.tickets',
'label' => 'Tickets',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/tickets',
],
[
'code' => 'onticket.adminapp.fiesta-futbol-infantil.entradas',
'code' => 'adminapp.fiesta-futbol-infantil.entradas',
'label' => 'Entradas',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/entradas',
],
[
'code' => 'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
'code' => 'adminapp.fiesta-futbol-infantil.alojamientos',
'label' => 'Alojamientos',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/alojamientos',
],
[
'code' => 'onticket.adminapp.fiesta-futbol-infantil.merchandising',
'code' => 'adminapp.fiesta-futbol-infantil.merchandising',
'label' => 'Merchandising',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/merchandising',
],
[
'code' => 'onticket.adminapp.fiesta-futbol-infantil.comida',
'code' => 'adminapp.fiesta-futbol-infantil.comida',
'label' => 'Comida',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/comidas',
],
[
'code' => 'onticket.adminapp.desfile.entradas',
'code' => 'adminapp.desfile.entradas',
'label' => 'Entradas',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/desfile/entradas',
],
[
'code' => 'onticket.adminapp.desfile.reservas',
'code' => 'adminapp.desfile.reservas',
'label' => 'Reserva de Tickets',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/desfile/reservas',
],
[
'code' => 'shopit.adminapp.marca',
'label' => 'Marca',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/marca',
],
[
'code' => 'shopit.adminapp.contacto',
'label' => 'Contacto',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/contacto',
],
[
'code' => 'shopit.adminapp.productos',
'label' => 'Productos',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/productos',
],
[
'code' => 'shopit.adminapp.categorias',
'label' => 'Categorías',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/categorias',
],
[
'code' => 'shopit.adminapp.transacciones',
'label' => 'Transacciones',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/transacciones',
],
[
'code' => 'shopit.adminapp.reportes',
'label' => 'Reportes',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/reportes',
],
[
'code' => 'shopit.adminapp.usuarios_roles',
'label' => 'Usuarios y roles',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/usuarios-roles',
],
[
'code' => 'account',
'label' => 'Mi cuenta',
@@ -261,10 +219,7 @@ class MenuSeeder extends Seeder
'code' => 'help.terms-and-conditions',
'label' => 'Términos y condiciones',
'parent_menu_code' => 'help',
'content_type' => Menu::CONTENT_TYPE_STATIC,
'static_content_schema' => [
'html' => 'present|nullable|string',
],
'content_type' => Menu::CONTENT_TYPE_DYNAMIC,
'route' => '/ayuda/terminos-y-condiciones',
],
];
@@ -300,10 +255,6 @@ class MenuSeeder extends Seeder
])
->delete();
Menu::query()
->where('code', 'like', 'adminapp.%')
->delete();
$allRoleMenuCodes = Menu::query()->pluck('code');
$adminAppMenuCodes = Menu::query()
->where('code', 'main.adminapp')
@@ -348,32 +299,24 @@ class MenuSeeder extends Seeder
'mutual_smep',
];
$ticketAdminMenuCodes = [
'onticket.adminapp.tickets',
'adminapp.tickets',
];
$fiestaCategoryMenuCodes = [
'onticket.adminapp.fiesta-futbol-infantil.entradas',
'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
'onticket.adminapp.fiesta-futbol-infantil.merchandising',
'onticket.adminapp.fiesta-futbol-infantil.comida',
'adminapp.fiesta-futbol-infantil.entradas',
'adminapp.fiesta-futbol-infantil.alojamientos',
'adminapp.fiesta-futbol-infantil.merchandising',
'adminapp.fiesta-futbol-infantil.comida',
];
$fiestaExcludedAdminMenuCodes = [
'onticket.adminapp.inicio',
'onticket.adminapp.catalog',
'onticket.adminapp.categories',
'onticket.adminapp.combos',
'adminapp.inicio',
'adminapp.catalog',
'adminapp.categories',
'adminapp.combos',
];
$desfileMenuCodes = [
'onticket.adminapp.desfile.entradas',
'onticket.adminapp.desfile.reservas',
'adminapp.desfile.entradas',
'adminapp.desfile.reservas',
];
$shopItAdminMenuCodes = Menu::query()
->where('code', 'like', 'shopit.adminapp.%')
->pluck('code')
->all();
$onTicketAdminMenuCodes = Menu::query()
->where('code', 'like', 'onticket.adminapp.%')
->pluck('code')
->all();
$onTicketMenuCodes = [
'event.index',
'event.category',
@@ -463,13 +406,6 @@ class MenuSeeder extends Seeder
foreach ($tenants as $tenant) {
$menuCodes = $allMenus;
$menuCodes = array_diff(
$menuCodes,
$tenant->admin_website_type_code === 'shopit'
? $onTicketAdminMenuCodes
: $shopItAdminMenuCodes,
);
if ($tenant->codigo === 'sonder') {
// Sonder NO tiene tickets
$menuCodes = array_diff($menuCodes, ['account.tickets']);

View File

@@ -40,7 +40,7 @@ class WebsiteTypeSeeder extends Seeder
public function run(): void
{
$this->websiteTypeService->updateOrCreate(
$shopIt = $this->websiteTypeService->updateOrCreate(
['codigo' => 'shopit'],
[
'nombre' => 'ShopIt',
@@ -48,10 +48,9 @@ class WebsiteTypeSeeder extends Seeder
'scanner_domain' => 'scanner.localhost',
'site_title' => 'ShopIt',
...self::PRESENTATION,
'primary_color' => '#2FD3AC',
'site_logo' => $this->shopItLogo(),
'footer_logo' => $this->shopItFooterLogo(),
'favicon' => $this->shopItFavicon(),
'site_logo' => $this->onTicketLogo(),
'footer_logo' => $this->onTicketFooterLogo(),
'favicon' => $this->onTicketFavicon(),
],
);
@@ -84,7 +83,7 @@ class WebsiteTypeSeeder extends Seeder
...self::PRESENTATION,
'site_logo' => $this->onTicketLogo(),
'footer_logo' => $this->onTicketFooterLogo(),
'favicon' => $this->onTicketFavicon(),
'favicon' => $shopIt->favicon()->firstOrFail()->key,
],
);
@@ -205,7 +204,7 @@ class WebsiteTypeSeeder extends Seeder
private function onTicketLogo(): UploadedFile
{
$path = public_path('images/website_types/onticket/onticket_logo.png');
$path = public_path('images/website_types/onticket_logo.png');
if (! file_exists($path)) {
throw new RuntimeException("OnTicket logo not found at path: {$path}");
@@ -222,7 +221,7 @@ class WebsiteTypeSeeder extends Seeder
private function onTicketFooterLogo(): UploadedFile
{
$path = public_path('images/website_types/onticket/onticket_footer_logo.png');
$path = public_path('images/website_types/onticket_footer_logo.png');
if (! file_exists($path)) {
throw new RuntimeException("OnTicket footer logo not found at path: {$path}");
@@ -239,7 +238,7 @@ class WebsiteTypeSeeder extends Seeder
private function onTicketFavicon(): UploadedFile
{
$path = public_path('images/website_types/onticket/onticket_favicon.svg');
$path = public_path('images/website_types/onticket_favicon.svg');
if (! file_exists($path)) {
throw new RuntimeException("OnTicket favicon not found at path: {$path}");
@@ -253,30 +252,4 @@ class WebsiteTypeSeeder extends Seeder
true,
);
}
private function shopItLogo(): UploadedFile
{
return $this->uploadedImage('shopit', 'shopit_logo.png', 'image/png');
}
private function shopItFooterLogo(): UploadedFile
{
return $this->uploadedImage('shopit', 'shopit_footer_logo.png', 'image/png');
}
private function shopItFavicon(): UploadedFile
{
return $this->uploadedImage('shopit', 'shopit-favicon.svg', 'image/svg+xml');
}
private function uploadedImage(string $websiteType, string $filename, string $mimeType): UploadedFile
{
$path = public_path("images/website_types/{$websiteType}/{$filename}");
if (! file_exists($path)) {
throw new RuntimeException("Website type image not found at path: {$path}");
}
return new UploadedFile($path, $filename, $mimeType, null, true);
}
}

View File

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1,10 +0,0 @@
<svg width="41" height="41" viewBox="0 0 41 41" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:se="http://svg-edit.googlecode.com" se:swatches="W3siaWQiOiJCMDBEREFFMy0zMjUwLTRERDgtOEU0RS0zMDYxREJGNUE3QTMiLCJuYW1lIjoiIzVCNUI1QiIsImhleCI6IiM1QjVCNUIifSx7ImlkIjoiRjI4QjU4NTYtNUM2OC00QkY4LTk3MDMtOTk5NDJCOTgzNTVBIiwibmFtZSI6IiMyRkQzQUMiLCJoZXgiOiIjMkZEM0FDIn1d">
<g><se:title>Layer 1</se:title><path d="m16.32,27.13c2.29,0 3.13,-0.37 3.73,-0.76c0.65,-0.42 1.17,-1.06 1.24,-1.97c0.06,-0.76 -0.29,-1.4 -0.81,-1.78c-0.7,-0.5 -2.05,-0.81 -3.21,-1.05c-1.13,-0.24 -2.14,-0.6 -3.03,-1.22c-1.06,-0.73 -1.61,-1.47 -1.96,-2.52c-0.45,-1.32 -0.36,-3.12 -0.11,-4.02c0.43,-1.54 1.35,-2.86 2.59,-3.84001c1.6,-1.26 3.58,-2.01999 6.46,-2.17999c0.3,-0.02 0.71,-0.04 1.21,-0.04c0,0 0.16,0 0.21,0h13.3c-3.68,-4.71 -9.41,-7.75 -15.85,-7.75c-11.1,0 -20.09,9 -20.09,20.09c0,2.47 0.45,4.84 1.27,7.03h15.06l-0.01,0.01z" fill="#2FD3AC" id="svg_7"/><path d="m23.11,12.59c-0.65,0 -1.64,0.03 -1.95,0.07c-1.3,0.17 -2.25,0.55 -2.82,1.31c-0.3199,0.43 -0.48,0.99 -0.29,1.66c0.31,1.07 2.1501,1.44 3.4001,1.7c1.49,0.31 2.5599,0.57 3.5899,1.08c1.06,0.53 2.03,1.41 2.51,2.43c0.46,0.98 0.6001,1.96 0.5201,3.08c-0.11,1.56 -0.4701,2.72 -0.9901,3.69c-0.49,0.91 -1.32,1.87 -2.03,2.44c-0.74,0.59 -1.81,1.38 -3.15,1.83c-1.35,0.45 -3.1399,0.63 -5.2999,0.63h-12.30005c3.68,4.68 9.39005,7.68 15.80005,7.68c11.1,0 20.0899,-9 20.0899,-20.09c0,-2.65 -0.5199,-5.18 -1.4499,-7.5h-15.6201l-0.01,-0.01z" fill="#5B5B5B" id="svg_8"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -1,163 +0,0 @@
<?php
namespace Tests\Feature\Address;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Domains\Core\Tenant\Resources\TenantResource;
use App\Domains\Ticketing\Event\Models\Event;
use App\Domains\Ticketing\Event\Resources\EventResource;
use App\Domains\Ticketing\Event\Resources\PublicEventResource;
use App\Domains\Ticketing\Event\Services\EventAddressService;
use App\Domains\Ticketing\Event\Services\PublicEventService;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Tests\TestCase;
class AddressPresentationTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo')->unique();
});
Schema::create('events', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code')->nullable();
$table->string('title')->nullable();
$table->string('subtitle')->nullable();
$table->timestamp('published_at')->nullable();
$table->foreignId('attachment_id')->nullable();
$table->string('location')->nullable();
$table->json('exact_location')->nullable();
$table->timestamps();
});
(require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php'))->up();
(require database_path('migrations/2026_09_30_000200_add_address_id_to_events.php'))->up();
}
public function test_tenant_response_exposes_all_addresses_main_address_and_a_separate_event_address(): void
{
DB::table('tenants')->insert(['codigo' => 'acme']);
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
$tenant->forceFill((new Tenant)->getAttributes());
$principal = Address::create(['label' => 'Principal', 'address_text' => 'Sede 123', 'latitude' => 0, 'longitude' => 0]);
$secondary = Address::create(['label' => 'Sucursal', 'address_text' => 'Otra calle 456']);
$venue = Address::create(['label' => 'Predio', 'address_text' => 'Evento 789', 'latitude' => -32.9431184, 'longitude' => -60.6437991]);
$tenant->addresses()->attach($principal->id, ['is_main' => true]);
$tenant->addresses()->attach($secondary->id);
$tenant->load(['addresses', 'mainAddress']);
foreach (['headerLogo', 'footerLogo', 'favicon', 'headerBackgroundImage', 'footerBackgroundImage', 'storefrontWebsiteType'] as $relation) {
$tenant->setRelation($relation, null);
}
$event = $this->presentedEvent($venue, $tenant);
$tenant->setRelation('activeEvent', $event);
$data = (new TenantResource($tenant))->response()->getData(true)['data'];
$this->assertCount(2, $data['addresses']);
$this->assertTrue($data['addresses'][0]['is_main']);
$this->assertFalse($data['addresses'][1]['is_main']);
$this->assertSame(0, $data['main_address']['latitude']);
$this->assertNull($data['addresses'][1]['latitude']);
$this->assertSame($venue->id, $data['event']['address']['id']);
$this->assertSame(-32.9431184, $data['event']['address']['latitude']);
$this->assertSame('Evento 789', $data['event']['address']['address_text']);
$this->assertSame('Anterior', $data['event']['location']);
$this->assertArrayNotHasKey('is_main', $data['event']['address']);
}
public function test_public_and_admin_event_responses_use_the_same_canonical_address(): void
{
$address = Address::create(['label' => 'Predio', 'address_text' => 'Nueva 123', 'latitude' => 0, 'longitude' => -60.6437991]);
$event = $this->presentedEvent($address, new Tenant);
foreach ([EventResource::class, PublicEventResource::class] as $resource) {
$data = (new $resource($event))->response()->getData(true)['data'];
$this->assertSame('Nueva 123', $data['address']['address_text']);
$this->assertSame(0, $data['address']['latitude']);
$this->assertSame(-60.6437991, $data['address']['longitude']);
$this->assertSame('Anterior', $data['location']);
$this->assertSame(20, $data['exact_location']['longitude']);
}
$event->setRelation('address', null);
$data = (new PublicEventResource($event))->response()->getData(true)['data'];
$this->assertNull($data['address']);
$this->assertSame('Anterior', $data['location']);
$address->update(['latitude' => null, 'longitude' => null]);
$event->setRelation('address', $address);
$data = (new PublicEventResource($event))->response()->getData(true)['data'];
$this->assertNull($data['address']['latitude']);
$this->assertSame(20, $data['exact_location']['longitude']);
}
public function test_editing_event_location_preserves_canonical_coordinates_unless_explicitly_changed(): void
{
$address = Address::create(['label' => 'Predio', 'address_text' => 'Anterior', 'latitude' => 0, 'longitude' => -60]);
$event = Event::create(['address_id' => $address->id, 'location' => 'Nueva', 'exact_location' => ['latitude' => 10, 'longitude' => 20]]);
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
$this->assertSame('Nueva', $address->fresh()->address_text);
$this->assertSame('0.0000000', $address->fresh()->latitude);
$this->assertDatabaseCount('addresses', 1);
$event->exact_location = null;
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event, true));
$this->assertNull($address->fresh()->latitude);
$this->assertNull($address->fresh()->longitude);
}
public function test_editing_a_shared_event_address_does_not_change_tenant_or_other_event_addresses(): void
{
DB::table('tenants')->insert(['codigo' => 'acme']);
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
$address = Address::create(['label' => 'Compartida', 'address_text' => 'Original', 'latitude' => -32, 'longitude' => -60]);
$tenant->addresses()->attach($address->id, ['is_main' => true]);
$event = Event::create(['address_id' => $address->id, 'location' => 'Nueva ubicación']);
$other = Event::create(['address_id' => $address->id, 'location' => 'Original']);
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
$this->assertSame('Original', $address->fresh()->address_text);
$this->assertSame($address->id, $other->fresh()->address_id);
$this->assertSame($address->id, $tenant->mainAddress->id);
$this->assertNotSame($address->id, $event->fresh()->address_id);
$this->assertSame('Nueva ubicación', $event->fresh()->address->address_text);
$this->assertSame('-32.0000000', $event->fresh()->address->latitude);
}
public function test_public_event_search_uses_its_address_and_loads_it_for_the_response(): void
{
DB::table('tenants')->insert(['codigo' => 'acme']);
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
$address = Address::create(['label' => 'Predio', 'address_text' => 'Dirección nueva']);
$event = Event::create([
'tenant_code' => 'acme', 'title' => 'Festival', 'location' => 'Dirección anterior',
'address_id' => $address->id, 'published_at' => now()->subMinute(),
]);
$service = app(PublicEventService::class);
$page = $service->list($tenant, 'nueva', 1);
$this->assertSame($event->id, $page->items()[0]->id);
$this->assertTrue($page->items()[0]->relationLoaded('address'));
$this->assertSame(0, $service->list($tenant, 'anterior', 1)->total());
}
public function test_editing_an_unlinked_event_creates_its_address(): void
{
$event = Event::create(['location' => 'Predio 123', 'exact_location' => ['latitude' => -32, 'longitude' => -60]]);
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
$this->assertSame('Predio 123', $event->fresh()->address->address_text);
$this->assertSame('-60.0000000', $event->fresh()->address->longitude);
$this->assertDatabaseCount('tenant_addresses', 0);
}
private function presentedEvent(?Address $address, Tenant $tenant): Event
{
$event = new Event(['location' => 'Anterior', 'exact_location' => ['latitude' => 10, 'longitude' => 20]]);
$event->setRelation('address', $address)->setRelation('tenant', $tenant)
->setRelation('socialMedia', collect())->setRelation('dates', collect())->setRelation('attachment', null);
return $event;
}
}

View File

@@ -43,7 +43,7 @@ class ScannerMeControllerTest extends TestCase
'route' => '/scanner/scan',
]);
$foreign = Menu::query()->create([
'code' => 'onticket.adminapp.inicio',
'code' => 'adminapp.inicio',
'label' => 'Administración',
'route' => '/admin/inicio',
]);

View File

@@ -17,6 +17,7 @@ class UserAuthorizationRelationsTest extends TestCase
$this->assertTrue(Schema::hasColumns('users', [
'rol_codigo',
'tenant_codigo',
'event_id',
]));
}
@@ -28,5 +29,7 @@ class UserAuthorizationRelationsTest extends TestCase
$this->assertNull($user->tenant_codigo);
$this->assertSame(RoleCode::User->value, $user->role->codigo);
$this->assertNull($user->tenant);
$this->assertNull($user->event_id);
$this->assertNull($user->event);
}
}

View File

@@ -186,7 +186,7 @@ class EntryControllerTest extends TestCase
'admin_website_type_code' => 'onticket',
]);
$menu = Menu::query()->firstOrCreate(
['code' => 'onticket.adminapp.desfile.entradas'],
['code' => 'adminapp.desfile.entradas'],
['label' => 'Entradas', 'route' => '/admin/desfile/entradas'],
);
$tenant->menues()->attach($menu->code);

View File

@@ -236,7 +236,7 @@ class AccommodationControllerTest extends TestCase
if ($withMenu) {
$menu = Menu::query()->firstOrCreate(
['code' => 'onticket.adminapp.fiesta-futbol-infantil.alojamientos'],
['code' => 'adminapp.fiesta-futbol-infantil.alojamientos'],
['label' => 'Alojamientos', 'route' => '/admin/alojamientos'],
);
$tenant->menues()->syncWithoutDetaching([$menu->code]);

View File

@@ -43,10 +43,10 @@ class EntryControllerTest extends TestCase
{
$tenant = $this->createFiestaTenant();
$categories = [
'entries' => ['Entradas', 'onticket.adminapp.fiesta-futbol-infantil.entradas'],
'foods' => ['Comidas', 'onticket.adminapp.fiesta-futbol-infantil.comida'],
'accommodations' => ['Alojamientos', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos'],
'merchandise' => ['Merchandising', 'onticket.adminapp.fiesta-futbol-infantil.merchandising'],
'entries' => ['Entradas', 'adminapp.fiesta-futbol-infantil.entradas'],
'foods' => ['Comidas', 'adminapp.fiesta-futbol-infantil.comida'],
'accommodations' => ['Alojamientos', 'adminapp.fiesta-futbol-infantil.alojamientos'],
'merchandise' => ['Merchandising', 'adminapp.fiesta-futbol-infantil.merchandising'],
];
foreach ($categories as [$label, $menuCode]) {
@@ -405,7 +405,7 @@ class EntryControllerTest extends TestCase
{
$tenant = $this->createTenant('fiesta_futbol_infantil');
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.fiesta-futbol-infantil.entradas',
'code' => 'adminapp.fiesta-futbol-infantil.entradas',
'label' => 'Entradas',
'route' => '/admin/entradas',
]);

View File

@@ -367,7 +367,7 @@ class FoodControllerTest extends TestCase
'time_end' => '23:59',
]);
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.fiesta-futbol-infantil.comida',
'code' => 'adminapp.fiesta-futbol-infantil.comida',
'label' => 'Comida',
'route' => '/admin/comidas',
]);

View File

@@ -293,7 +293,7 @@ class MerchandiseControllerTest extends TestCase
['value' => 'XL', 'label' => 'XL', 'sort_order' => 4],
]);
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.fiesta-futbol-infantil.merchandising',
'code' => 'adminapp.fiesta-futbol-infantil.merchandising',
'label' => 'Merchandising',
'route' => '/admin/merchandising',
]);

View File

@@ -135,7 +135,7 @@ class AdminAppDesfileEntryReservationFormControllerTest extends TestCase
private function grantReservationsMenu(Tenant $tenant): void
{
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.desfile.reservas',
'code' => 'adminapp.desfile.reservas',
'label' => 'Reserva de Tickets',
'route' => '/admin/desfile/reservas',
]);

View File

@@ -349,7 +349,7 @@ class AdminAppTicketFilterFormControllerTest extends TestCase
private function grantTicketsMenu(Tenant $tenant): void
{
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.tickets',
'code' => 'adminapp.tickets',
'label' => 'Tickets',
'route' => '/admin/tickets',
]);

View File

@@ -0,0 +1,76 @@
<?php
namespace Tests\Feature\Menu;
use App\Domains\Core\Auth\Models\User;
use App\Http\Middleware\EnsureTenantHasMenu;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Schema;
use PHPUnit\Framework\Attributes\DataProvider;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Tests\TestCase;
class TicketMenuAccessTest extends TestCase
{
public static function menuAssignments(): array
{
return [
'new code' => ['onticket.adminapp.tickets', 'current', false],
'old code' => ['adminapp.tickets', 'current', true],
'another tenant' => ['adminapp.tickets', 'other', false],
'unrelated menu' => ['adminapp.ventas', 'current', false],
];
}
#[DataProvider('menuAssignments')]
public function test_ticket_menu_requires_an_association_with_the_authenticated_tenant(string $menuCode, string $assignedTenant, bool $allowed): void
{
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo');
});
Schema::create('menues', function (Blueprint $table): void {
$table->id();
$table->string('code');
});
Schema::create('tenants_menues', function (Blueprint $table): void {
$table->string('tenant_code');
$table->string('menu_code');
});
DB::table('tenants')->insert(['codigo' => 'current']);
DB::table('menues')->insert(['code' => $menuCode]);
DB::table('tenants_menues')->insert(['tenant_code' => $assignedTenant, 'menu_code' => $menuCode]);
$user = new User(['tenant_codigo' => 'current']);
$request = Request::create('/api/v1/adminapp/tenant/tickets');
$request->setUserResolver(fn () => $user);
if (! $allowed) {
$this->expectException(HttpException::class);
$this->expectExceptionCode(0);
}
try {
$response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'adminapp.tickets');
$this->assertSame('allowed', $response->getContent());
} catch (HttpException $exception) {
$this->assertSame(404, $exception->getStatusCode());
throw $exception;
}
}
public function test_all_ticket_routes_and_filter_form_use_the_updated_menu_codes(): void
{
foreach ([
'adminapp.tickets.index', 'adminapp.tickets.cancel',
'adminapp.tickets.calculate-refund', 'adminapp.tickets.refund',
'adminapp.tickets.pdf', 'adminapp.tickets.excel', 'adminapp.forms.tickets-filter',
] as $name) {
$route = Route::getRoutes()->getByName($name);
$this->assertNotNull($route);
$this->assertContains('tenant.menu:adminapp.tickets', $route->gatherMiddleware());
}
}
}

View File

@@ -0,0 +1,57 @@
<?php
namespace Tests\Feature\Migrations;
use App\Domains\Core\Administrator\Resources\AdministratorResource;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Auth\Resources\UserResource;
use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Tests\TestCase;
class AddEventIdToUsersTest extends TestCase
{
public function test_event_assignment_preserves_existing_users_and_restricts_event_deletion(): void
{
Schema::create('events', function (Blueprint $table): void {
$table->id();
});
Schema::create('users', function (Blueprint $table): void {
$table->id();
$table->string('tenant_codigo')->nullable();
$table->softDeletes();
$table->timestamps();
});
DB::table('users')->insert(['id' => 1, 'tenant_codigo' => 'legacy']);
DB::table('events')->insert(['id' => 42]);
$migration = require database_path('migrations/2026_10_01_000000_add_event_id_to_users_table.php');
$migration->up();
$legacy = User::query()->findOrFail(1);
$this->assertNull($legacy->event_id);
$this->assertNull($legacy->event);
$this->assertSame('legacy', $legacy->tenant_codigo);
$legacy->update(['event_id' => '42']);
$user = $legacy->fresh();
$this->assertSame(42, $user->event_id);
$this->assertSame(42, $user->event->id);
$this->assertSame(42, UserResource::make($user)->resolve(new Request)['event_id']);
$this->assertSame(42, AdministratorResource::make($user)->resolve(new Request)['event_id']);
try {
DB::table('events')->where('id', 42)->delete();
$this->fail('An assigned event must not be deleted.');
} catch (QueryException $exception) {
$this->assertStringContainsString('FOREIGN KEY', $exception->getMessage());
}
$migration->down();
$this->assertFalse(Schema::hasColumn('users', 'event_id'));
$this->assertSame('legacy', DB::table('users')->where('id', 1)->value('tenant_codigo'));
}
}

View File

@@ -1,229 +0,0 @@
<?php
namespace Tests\Feature\Migrations;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Core\Address\Models\TenantAddress;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Domains\Core\Tenant\Services\TenantAddressService;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Tests\TestCase;
class ContactAddressesTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo')->unique();
$table->string('address')->nullable();
$table->timestamps();
});
Schema::create('tenants_menues', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('menu_code');
$table->json('static_content')->nullable();
$table->boolean('is_enabled')->default(true);
});
DB::table('tenants')->insert([
['codigo' => 'alpha', 'address' => 'Dirección anterior'],
['codigo' => 'beta', 'address' => null],
['codigo' => 'empty', 'address' => null],
]);
$this->schemaMigration()->up();
}
public function test_it_copies_all_contact_locations_without_changing_legacy_data_and_can_run_again(): void
{
$sharedAddress = [
'label' => 'Sede principal',
'address' => 'San Lorenzo 1543, Rosario',
'coordinates' => [-32.9431184, -60.6437991],
];
$this->contact('alpha', [
'rosario' => ['label' => 'Rosario', 'addresses' => [$sharedAddress]],
'santa_fe' => ['label' => 'Santa Fe', 'addresses' => [
['label' => 'Sucursal', 'address' => 'San Martín 100', 'coordinates' => [0, 0]],
['label' => 'Sin mapa', 'address' => 'San Martín 200'],
]],
], enabled: false);
$this->contact('beta', ['rosario' => ['addresses' => [$sharedAddress]]]);
$this->contact('empty', []);
DB::table('tenants_menues')->insert([
'tenant_code' => 'empty',
'menu_code' => 'help.faq',
'static_content' => json_encode(['locations' => [['addresses' => [$sharedAddress]]]]),
]);
$oldMenus = DB::table('tenants_menues')->orderBy('id')->get()->toArray();
$migration = $this->dataMigration();
$migration->up();
$migration->up();
$this->assertDatabaseCount('addresses', 4);
$this->assertDatabaseCount('tenant_addresses', 4);
$this->assertDatabaseHas('addresses', [
'label' => 'Sede principal',
'address_text' => 'San Lorenzo 1543, Rosario',
'latitude' => -32.9431184,
'longitude' => -60.6437991,
]);
$this->assertDatabaseHas('addresses', ['label' => 'Sucursal', 'latitude' => 0, 'longitude' => 0]);
$this->assertDatabaseHas('addresses', ['label' => 'Sin mapa', 'latitude' => null, 'longitude' => null]);
$this->assertEquals($oldMenus, DB::table('tenants_menues')->orderBy('id')->get()->toArray());
$this->assertDatabaseHas('tenants', ['codigo' => 'alpha', 'address' => 'Dirección anterior']);
$alpha = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
$beta = Tenant::query()->where('codigo', 'beta')->firstOrFail();
$this->assertCount(3, $alpha->addresses);
$this->assertTrue($alpha->addresses->first()->pivot->is_main);
$this->assertInstanceOf(TenantAddress::class, $alpha->addresses->first()->pivot);
$this->assertSame('Sede principal', $alpha->mainAddress->label);
$this->assertSame('-32.9431184', $alpha->mainAddress->latitude);
$this->assertNotSame($alpha->mainAddress->id, $beta->mainAddress->id);
$this->assertSame('alpha', $alpha->mainAddress->tenants->sole()->codigo);
$this->assertNull(Tenant::query()->where('codigo', 'empty')->firstOrFail()->mainAddress);
$this->assertSame(2, DB::table('tenant_addresses')->where('is_main', true)->count());
$migration->down();
$this->assertDatabaseCount('addresses', 4);
$this->assertEquals($oldMenus, DB::table('tenants_menues')->orderBy('id')->get()->toArray());
}
public function test_a_tenant_can_have_many_secondary_addresses_but_only_one_main(): void
{
$tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
$addresses = $this->addresses(3);
$tenant->addresses()->attach($addresses[0], ['is_main' => true]);
$tenant->addresses()->attach([$addresses[1], $addresses[2]], ['is_main' => false]);
$this->assertCount(3, $tenant->addresses);
$this->expectException(QueryException::class);
$tenant->addresses()->updateExistingPivot($addresses[1], ['is_main' => true]);
}
public function test_it_prevents_duplicate_links(): void
{
$tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
$address = $this->addresses(1)[0];
$tenant->addresses()->attach($address);
$this->expectException(QueryException::class);
$tenant->addresses()->attach($address);
}
public function test_main_address_is_specific_to_each_tenant_and_can_be_switched(): void
{
$alpha = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
$beta = Tenant::query()->where('codigo', 'beta')->firstOrFail();
$addresses = $this->addresses(2);
$alpha->addresses()->attach($addresses[0], ['is_main' => true]);
$alpha->addresses()->attach($addresses[1]);
$beta->addresses()->attach($addresses[0], ['is_main' => true]);
$this->assertSame($addresses[0], $alpha->mainAddress->id);
app(TenantAddressService::class)->setMainAddress($alpha, Address::findOrFail($addresses[1]));
$this->assertSame($addresses[1], $alpha->mainAddress->id);
$this->assertSame($addresses[0], $beta->mainAddress->id);
$this->assertSame(2, DB::table('tenant_addresses')->where('is_main', true)->count());
$loaded = Tenant::query()->with('mainAddress')->whereIn('codigo', ['alpha', 'beta'])->get()->keyBy('codigo');
$this->assertSame($addresses[1], $loaded['alpha']->mainAddress->id);
$this->assertSame($addresses[0], $loaded['beta']->mainAddress->id);
}
public function test_switching_to_an_unlinked_address_preserves_the_previous_main(): void
{
$tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
$addresses = $this->addresses(2);
$tenant->addresses()->attach($addresses[0], ['is_main' => true]);
try {
app(TenantAddressService::class)->setMainAddress($tenant, Address::findOrFail($addresses[1]));
$this->fail('An unlinked address must be rejected.');
} catch (ModelNotFoundException) {
$this->assertSame($addresses[0], $tenant->fresh()->mainAddress->id);
}
}
public function test_invalid_coordinates_roll_back_all_copies_and_preserve_source_data(): void
{
$this->contact('alpha', [['addresses' => [
['label' => 'Válida', 'address' => 'Primera 100', 'coordinates' => [-32, -60]],
['label' => 'Inválida', 'address' => 'Segunda 200', 'coordinates' => [-91, -60]],
]]]);
$oldContent = DB::table('tenants_menues')->value('static_content');
try {
$this->dataMigration()->up();
$this->fail('Invalid latitude must not be silently imported.');
} catch (\RuntimeException $exception) {
$this->assertStringContainsString('alpha', $exception->getMessage());
$this->assertDatabaseCount('addresses', 0);
$this->assertDatabaseCount('tenant_addresses', 0);
$this->assertSame($oldContent, DB::table('tenants_menues')->value('static_content'));
}
}
public function test_deleting_a_tenant_removes_links_but_keeps_shared_addresses(): void
{
$address = $this->addresses(1)[0];
foreach (['alpha', 'beta'] as $code) {
Tenant::query()->where('codigo', $code)->firstOrFail()->addresses()->attach($address, ['is_main' => true]);
}
Tenant::query()->where('codigo', 'alpha')->delete();
$this->assertDatabaseCount('tenant_addresses', 1);
$this->assertDatabaseCount('addresses', 1);
Address::findOrFail($address)->delete();
$this->assertDatabaseCount('tenant_addresses', 0);
}
public function test_schema_can_be_rolled_back_without_removing_legacy_tables(): void
{
$this->schemaMigration()->down();
$this->assertFalse(Schema::hasTable('addresses'));
$this->assertFalse(Schema::hasTable('tenant_addresses'));
$this->assertTrue(Schema::hasTable('tenants_menues'));
$this->assertTrue(Schema::hasColumn('tenants', 'address'));
}
private function contact(string $code, array $locations, bool $enabled = true): void
{
DB::table('tenants_menues')->insert([
'tenant_code' => $code,
'menu_code' => 'help.contact',
'static_content' => json_encode(['phone' => '+54 123', 'locations' => $locations], JSON_THROW_ON_ERROR),
'is_enabled' => $enabled,
]);
}
private function addresses(int $count): array
{
$ids = [];
for ($i = 0; $i < $count; $i++) {
$ids[] = Address::create(['label' => "Sucursal {$i}", 'address_text' => "Calle {$i}"])->id;
}
return $ids;
}
private function schemaMigration(): Migration
{
return require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php');
}
private function dataMigration(): Migration
{
return require database_path('migrations/2026_09_30_000100_copy_contact_menu_addresses.php');
}
}

View File

@@ -1,203 +0,0 @@
<?php
namespace Tests\Feature\Migrations;
use App\Domains\Core\Address\Models\Address;
use App\Domains\Ticketing\Event\Models\Event;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\QueryException;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use PHPUnit\Framework\Attributes\DataProvider;
use RuntimeException;
use Tests\TestCase;
class EventAddressesTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo')->unique();
});
Schema::create('events', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('title');
$table->string('location')->nullable();
$table->json('exact_location')->nullable();
$table->timestamps();
});
$addresses = require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php');
$addresses->up();
$this->schemaMigration()->up();
}
public function test_it_copies_event_locations_and_coordinates_and_preserves_legacy_data(): void
{
$precise = $this->event('Predio de Doma', ['latitude' => -32.9431184, 'longitude' => -60.6437991]);
$noMap = $this->event('Salón Luz y Fuerza');
$zero = $this->event('Punto cero', ['latitude' => 0, 'longitude' => 0]);
$missing = $this->event(null);
$blank = $this->event(' ');
$before = DB::table('events')->orderBy('id')->get()->map(fn (object $event): array => [
'id' => $event->id,
'tenant_code' => $event->tenant_code,
'title' => $event->title,
'location' => $event->location,
'exact_location' => $event->exact_location,
'created_at' => $event->created_at,
'updated_at' => $event->updated_at,
])->all();
$migration = $this->dataMigration();
$migration->up();
$migration->up();
$this->assertDatabaseCount('addresses', 3);
$this->assertDatabaseCount('tenant_addresses', 0);
$event = Event::findOrFail($precise);
$this->assertSame('Ubicación del evento', $event->address->label);
$this->assertSame('Predio de Doma', $event->address->address_text);
$this->assertSame('-32.9431184', $event->address->latitude);
$this->assertSame('-60.6437991', $event->address->longitude);
$this->assertNull(Event::findOrFail($noMap)->address->latitude);
$this->assertNull(Event::findOrFail($noMap)->address->longitude);
$this->assertSame('0.0000000', Event::findOrFail($zero)->address->latitude);
$this->assertSame('0.0000000', Event::findOrFail($zero)->address->longitude);
$this->assertNull(Event::findOrFail($missing)->address);
$this->assertNull(Event::findOrFail($blank)->address_id);
foreach ($before as $original) {
$this->assertDatabaseHas('events', $original);
}
$migration->down();
$this->assertDatabaseCount('addresses', 3);
$this->assertSame($event->address_id, Event::findOrFail($precise)->address_id);
}
public function test_it_keeps_existing_links_and_creates_independent_copies_for_unlinked_events(): void
{
$original = Address::create(['label' => 'Existente', 'address_text' => 'Lugar elegido']);
$linked = $this->event('Texto anterior');
DB::table('events')->where('id', $linked)->update(['address_id' => $original->id]);
$first = $this->event('Mismo predio');
$second = $this->event('Mismo predio');
$this->dataMigration()->up();
$this->assertDatabaseCount('addresses', 3);
$this->assertSame($original->id, Event::findOrFail($linked)->address_id);
$this->assertNotSame(Event::findOrFail($first)->address_id, Event::findOrFail($second)->address_id);
$this->assertSame('Lugar elegido', $original->fresh()->address_text);
}
public function test_multiple_events_can_share_one_address_through_the_model_relations(): void
{
$address = Address::create(['label' => 'Teatro', 'address_text' => 'San Martín 123']);
$first = Event::findOrFail($this->event('Texto original'));
$first->address()->associate($address);
$first->save();
$second = Event::findOrFail($this->event('Otro evento'));
$second->fill(['address_id' => (string) $address->id])->save();
$this->assertSame($address->id, $first->fresh()->address->id);
$this->assertSame($address->id, $second->fresh()->address_id);
$this->assertSame([$first->id, $second->id], $address->events()->orderBy('id')->pluck('id')->all());
$loaded = Event::with('address')->orderBy('id')->get();
$this->assertSame($address->id, $loaded->last()->address->id);
$first->delete();
$this->assertDatabaseCount('addresses', 1);
$address->delete();
$this->assertDatabaseHas('events', ['id' => $second->id, 'address_id' => null, 'location' => 'Otro evento']);
}
public function test_the_foreign_key_rejects_an_unknown_address(): void
{
$event = Event::findOrFail($this->event('Predio'));
$this->expectException(QueryException::class);
$event->update(['address_id' => 9999]);
}
#[DataProvider('invalidCoordinates')]
public function test_invalid_coordinates_roll_back_all_copies(string $coordinates): void
{
$valid = $this->event('Primero', ['latitude' => -32, 'longitude' => -60]);
$invalid = $this->event('Segundo');
DB::table('events')->where('id', $invalid)->update(['exact_location' => $coordinates]);
try {
$this->dataMigration()->up();
$this->fail('Invalid coordinates must stop the migration.');
} catch (\JsonException|RuntimeException) {
$this->assertDatabaseCount('addresses', 0);
$this->assertNull(Event::findOrFail($valid)->address_id);
$this->assertNull(Event::findOrFail($invalid)->address_id);
$this->assertSame($coordinates, DB::table('events')->where('id', $invalid)->value('exact_location'));
}
}
public static function invalidCoordinates(): array
{
return [
'latitude out of range' => ['{"latitude":-91,"longitude":-60}'],
'longitude out of range' => ['{"latitude":-32,"longitude":181}'],
'missing longitude' => ['{"latitude":-32}'],
'nonnumeric latitude' => ['{"latitude":"unknown","longitude":-60}'],
'invalid JSON' => ['not-json'],
];
}
public function test_coordinates_without_address_text_stop_the_copy_instead_of_losing_data(): void
{
$id = $this->event(null, ['latitude' => -32, 'longitude' => -60]);
try {
$this->dataMigration()->up();
$this->fail('Coordinates without address text require correction.');
} catch (RuntimeException $exception) {
$this->assertStringContainsString("Missing address text for event {$id}", $exception->getMessage());
$this->assertDatabaseCount('addresses', 0);
$this->assertNull(Event::findOrFail($id)->address_id);
}
}
public function test_schema_rollback_preserves_events_legacy_fields_and_copied_addresses(): void
{
$id = $this->event('Predio', ['latitude' => -32, 'longitude' => -60]);
$this->dataMigration()->up();
$this->schemaMigration()->down();
$this->assertFalse(Schema::hasColumn('events', 'address_id'));
$this->assertDatabaseHas('events', ['id' => $id, 'location' => 'Predio']);
$this->assertDatabaseCount('addresses', 1);
$this->assertTrue(Schema::hasColumn('events', 'exact_location'));
}
private function event(?string $location, ?array $coordinates = null): int
{
return DB::table('events')->insertGetId([
'tenant_code' => 'alpha',
'title' => 'Evento',
'location' => $location,
'exact_location' => $coordinates === null ? null : json_encode($coordinates, JSON_THROW_ON_ERROR),
'created_at' => '2026-09-01 12:00:00',
'updated_at' => '2026-09-02 12:00:00',
]);
}
private function schemaMigration(): Migration
{
return require database_path('migrations/2026_09_30_000200_add_address_id_to_events.php');
}
private function dataMigration(): Migration
{
return require database_path('migrations/2026_09_30_000300_copy_event_locations_to_addresses.php');
}
}

View File

@@ -1,201 +0,0 @@
<?php
namespace Tests\Feature\Migrations;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Tests\TestCase;
class SeparateAdminAppMenusByWebsiteTypeTest extends TestCase
{
private const SHOPIT_MENU_CODES = [
'shopit.adminapp.marca',
'shopit.adminapp.contacto',
'shopit.adminapp.productos',
'shopit.adminapp.categorias',
'shopit.adminapp.transacciones',
'shopit.adminapp.reportes',
'shopit.adminapp.usuarios_roles',
];
protected function setUp(): void
{
parent::setUp();
Schema::create('menues', function (Blueprint $table): void {
$table->id();
$table->string('code')->unique();
$table->string('label');
$table->string('parent_menu_code')->nullable();
$table->string('content_type')->default('dynamic');
$table->json('static_content_schema')->nullable();
$table->string('route');
$table->timestamps();
});
Schema::create('tenants', function (Blueprint $table): void {
$table->string('codigo')->primary();
$table->string('admin_website_type_code')->nullable();
});
Schema::create('roles', function (Blueprint $table): void {
$table->string('codigo')->primary();
});
Schema::create('tenants_menues', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('menu_code');
$table->json('static_content')->nullable();
$table->timestamps();
$table->unique(['tenant_code', 'menu_code']);
});
Schema::create('roles_menues', function (Blueprint $table): void {
$table->id();
$table->string('rol_codigo');
$table->string('menu_codigo');
$table->unique(['rol_codigo', 'menu_codigo']);
});
$now = now();
DB::table('menues')->insert([
[
'code' => 'main.adminapp',
'label' => 'Administración',
'parent_menu_code' => null,
'route' => '/',
'created_at' => $now,
'updated_at' => $now,
],
[
'code' => 'adminapp.inicio',
'label' => 'Inicio',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/inicio',
'created_at' => $now,
'updated_at' => $now,
],
[
'code' => 'adminapp.tickets',
'label' => 'Tickets',
'parent_menu_code' => 'main.adminapp',
'route' => '/admin/tickets',
'created_at' => $now,
'updated_at' => $now,
],
[
'code' => 'account',
'label' => 'Mi cuenta',
'parent_menu_code' => null,
'route' => '/mi-cuenta',
'created_at' => $now,
'updated_at' => $now,
],
]);
DB::table('tenants')->insert([
['codigo' => 'sonder', 'admin_website_type_code' => 'shopit'],
['codigo' => 'mutual_smep', 'admin_website_type_code' => 'shopit'],
['codigo' => 'fiesta_futbol_infantil', 'admin_website_type_code' => 'onticket'],
]);
DB::table('roles')->insert([
['codigo' => 'admin'],
['codigo' => 'adminapp'],
['codigo' => 'user'],
]);
foreach (['sonder', 'mutual_smep', 'fiesta_futbol_infantil'] as $tenantCode) {
foreach (['main.adminapp', 'adminapp.inicio', 'account'] as $menuCode) {
DB::table('tenants_menues')->insert([
'tenant_code' => $tenantCode,
'menu_code' => $menuCode,
'created_at' => $now,
'updated_at' => $now,
]);
}
}
DB::table('tenants_menues')->insert([
'tenant_code' => 'fiesta_futbol_infantil',
'menu_code' => 'adminapp.tickets',
'created_at' => $now,
'updated_at' => $now,
]);
DB::table('roles_menues')->insert([
['rol_codigo' => 'admin', 'menu_codigo' => 'adminapp.inicio'],
['rol_codigo' => 'adminapp', 'menu_codigo' => 'adminapp.inicio'],
['rol_codigo' => 'adminapp', 'menu_codigo' => 'adminapp.tickets'],
]);
}
protected function tearDown(): void
{
Schema::dropIfExists('roles_menues');
Schema::dropIfExists('tenants_menues');
Schema::dropIfExists('roles');
Schema::dropIfExists('tenants');
Schema::dropIfExists('menues');
parent::tearDown();
}
public function test_it_separates_admin_menus_by_admin_website_type_and_rolls_back(): void
{
$migration = require database_path(
'migrations/2026_09_29_000000_separate_adminapp_menus_by_website_type.php'
);
$migration->up();
$migration->up();
$this->assertDatabaseMissing('menues', ['code' => 'adminapp.inicio']);
$this->assertDatabaseHas('menues', ['code' => 'onticket.adminapp.inicio']);
$this->assertDatabaseHas('tenants_menues', [
'tenant_code' => 'fiesta_futbol_infantil',
'menu_code' => 'onticket.adminapp.tickets',
]);
$this->assertDatabaseHas('tenants_menues', [
'tenant_code' => 'fiesta_futbol_infantil',
'menu_code' => 'onticket.adminapp.inicio',
]);
foreach (['sonder', 'mutual_smep'] as $tenantCode) {
$adminMenuCodes = DB::table('tenants_menues')
->join('menues', 'menues.code', '=', 'tenants_menues.menu_code')
->where('tenants_menues.tenant_code', $tenantCode)
->where(fn ($query) => $query
->where('menues.code', 'main.adminapp')
->orWhere('menues.parent_menu_code', 'main.adminapp'))
->orderBy('menues.code')
->pluck('menues.code')
->all();
$this->assertSame(
collect(['main.adminapp', ...self::SHOPIT_MENU_CODES])->sort()->values()->all(),
$adminMenuCodes,
);
$this->assertDatabaseHas('tenants_menues', [
'tenant_code' => $tenantCode,
'menu_code' => 'account',
]);
}
foreach (self::SHOPIT_MENU_CODES as $menuCode) {
$this->assertDatabaseHas('roles_menues', [
'rol_codigo' => 'adminapp',
'menu_codigo' => $menuCode,
]);
}
$migration->down();
$this->assertDatabaseHas('menues', ['code' => 'adminapp.inicio']);
$this->assertDatabaseMissing('menues', ['code' => 'onticket.adminapp.inicio']);
$this->assertDatabaseMissing('menues', ['code' => 'shopit.adminapp.marca']);
$this->assertDatabaseHas('tenants_menues', [
'tenant_code' => 'sonder',
'menu_code' => 'adminapp.inicio',
]);
$this->assertDatabaseHas('tenants_menues', [
'tenant_code' => 'fiesta_futbol_infantil',
'menu_code' => 'adminapp.tickets',
]);
}
}

View File

@@ -34,7 +34,7 @@ class SetWebsiteTypeFaviconTest extends TestCase
$this->assertSame(1, DB::table('attachments')->where('filename', 'onticket_favicon.svg')->count());
Storage::disk('s3')->assertExists($attachment->path);
$this->assertSame(
file_get_contents(public_path('images/website_types/onticket/onticket_favicon.svg')),
file_get_contents(public_path('images/website_types/onticket_favicon.svg')),
Storage::disk('s3')->get($attachment->path),
);
}

View File

@@ -0,0 +1,183 @@
<?php
namespace Tests\Feature\Sale;
use App\Domains\Commerce\Purchase\Models\Purchase;
use App\Domains\Commerce\Purchase\Services\CheckoutService;
use App\Domains\Commerce\Sale\Services\AdminAppSaleExcelService;
use App\Domains\Commerce\Sale\Services\AdminAppSalePdfService;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Authorization\Enums\RoleCode;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Laravel\Sanctum\Sanctum;
use Mockery\MockInterface;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Tests\TestCase;
class AdminAppSaleEventScopeTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
// Isolated schema: the full legacy migration chain cannot run on SQLite.
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo');
});
Schema::create('users', function (Blueprint $table): void {
$table->id();
$table->softDeletes();
});
Schema::create('compras', function (Blueprint $table): void {
$table->id();
$table->string('tenant_codigo');
$table->unsignedBigInteger('event_id')->nullable();
$table->string('nombre_apellido');
$table->string('status');
$table->decimal('total', 12, 2);
$table->timestamps();
});
Schema::create('compra_items', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('compra_id');
$table->integer('cantidad');
});
Schema::create('tickets', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('source_purchase_item_id');
});
Schema::create('ticket_refunds', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('purchase_item_id');
$table->decimal('amount', 12, 2);
});
Schema::create('value_changes', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('trackable_type');
$table->unsignedBigInteger('trackable_id');
$table->string('attribute');
$table->string('old_value');
$table->string('new_value');
$table->timestamp('changed_at');
$table->string('actor_type');
$table->unsignedBigInteger('user_id')->nullable();
});
DB::table('tenants')->insert(['codigo' => 'onticket']);
foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) {
DB::table('compras')->insert([
'id' => $id,
'tenant_codigo' => $tenant,
'event_id' => $event,
'nombre_apellido' => 'Cliente',
'status' => Purchase::STATUS_PAID,
'total' => $id * 100,
'created_at' => now(),
'updated_at' => now(),
]);
DB::table('compra_items')->insert(['id' => $id, 'compra_id' => $id, 'cantidad' => 1]);
DB::table('ticket_refunds')->insert(['purchase_item_id' => $id, 'amount' => $id * 10]);
DB::table('value_changes')->insert([
'id' => $id,
'tenant_code' => $tenant,
'trackable_type' => (new Purchase)->getMorphClass(),
'trackable_id' => $id,
'attribute' => 'status',
'old_value' => Purchase::STATUS_PENDING_PAYMENT,
'new_value' => Purchase::STATUS_PAID,
'changed_at' => now(),
'actor_type' => 'system',
]);
}
$this->actingAsAdministrator(10);
}
public function test_list_totals_and_filters_cannot_escape_the_authenticated_event(): void
{
$this->getJson('/api/v1/adminapp/tenant/sales?event_id=20&q=Cliente')
->assertOk()
->assertJsonCount(1, 'data')
->assertJsonPath('data.0.id', 1)
->assertJsonPath('confirmed_sales_total', '100.00')
->assertJsonPath('refunded_total', '10.00');
$this->getJson('/api/v1/adminapp/tenant/sales?id=2')->assertOk()->assertJsonCount(0, 'data');
$this->getJson('/api/v1/adminapp/tenant/sales/modifications?q=Cliente')
->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.sale_id', 1);
}
public function test_unscoped_administrators_keep_access_to_all_sales_in_their_tenant(): void
{
$this->actingAsAdministrator(null);
$this->getJson('/api/v1/adminapp/tenant/sales')->assertOk()->assertJsonCount(3, 'data')
->assertJsonPath('confirmed_sales_total', '600.00')->assertJsonPath('refunded_total', '60.00');
$this->getJson('/api/v1/adminapp/tenant/sales/modifications')->assertOk()->assertJsonCount(3, 'data');
$this->getJson('/api/v1/adminapp/tenant/sales/2')->assertOk();
$this->getJson('/api/v1/adminapp/tenant/sales/3')->assertOk();
}
public function test_foreign_and_unassigned_sales_are_inaccessible_before_any_checkout_action(): void
{
$this->mock(CheckoutService::class, function (MockInterface $mock): void {
$mock->shouldNotReceive('confirmPaidPurchase');
$mock->shouldNotReceive('cancelPurchaseFromAdmin');
});
foreach ([2, 3, 4] as $id) {
$this->getJson("/api/v1/adminapp/tenant/sales/{$id}")->assertNotFound();
$this->getJson("/api/v1/adminapp/tenant/sales/{$id}/tickets")->assertNotFound();
$this->postJson("/api/v1/adminapp/tenant/sales/{$id}/confirm", ['event_id' => 20])->assertNotFound();
$this->postJson("/api/v1/adminapp/tenant/sales/{$id}/cancel", ['event_id' => 20])->assertNotFound();
}
$this->assertSame(Purchase::STATUS_PAID, DB::table('compras')->where('id', 2)->value('status'));
}
public function test_own_event_allows_detail_tickets_and_checkout_actions(): void
{
// Empty snapshots keep this fixture focused on authorization.
DB::table('compra_items')->where('compra_id', 1)->delete();
$this->mock(CheckoutService::class, function (MockInterface $mock): void {
foreach (['confirmPaidPurchase', 'cancelPurchaseFromAdmin'] as $method) {
$mock->shouldReceive($method)->once()->withArgs(fn (Purchase $sale): bool => $sale->id === 1)
->andReturnUsing(fn (Purchase $sale): Purchase => $sale);
}
});
$this->getJson('/api/v1/adminapp/tenant/sales/1')->assertOk()->assertJsonPath('data.id', 1);
$this->getJson('/api/v1/adminapp/tenant/sales/1/tickets')->assertOk();
$this->postJson('/api/v1/adminapp/tenant/sales/1/confirm')->assertOk()->assertJsonPath('data.id', 1);
$this->postJson('/api/v1/adminapp/tenant/sales/1/cancel')->assertOk()->assertJsonPath('data.id', 1);
}
public function test_pdf_and_excel_exports_only_receive_sales_and_history_for_the_own_event(): void
{
foreach ([AdminAppSalePdfService::class, AdminAppSaleExcelService::class] as $class) {
$this->mock($class, function (MockInterface $mock) use ($class): void {
foreach (['downloadSales', 'downloadModifications'] as $method) {
$mock->shouldReceive($method)->once()->withArgs(
fn ($tenant, Collection $rows, $timezone): bool => $tenant->codigo === 'onticket'
&& $rows->pluck('id')->all() === [1] && $timezone === 'UTC'
)->andReturn($class === AdminAppSalePdfService::class
? response('pdf') : new StreamedResponse(fn () => print ('excel')));
}
});
}
foreach (['pdf', 'excel', 'modifications/pdf', 'modifications/excel'] as $path) {
$this->getJson("/api/v1/adminapp/tenant/sales/{$path}?timezone=UTC&event_id=20")->assertOk();
}
}
private function actingAsAdministrator(?int $eventId): void
{
$user = new User;
$user->setRawAttributes([
'id' => 1,
'rol_codigo' => RoleCode::AdminApp->value,
'tenant_codigo' => 'onticket',
'event_id' => $eventId,
]);
Sanctum::actingAs($user);
}
}

View File

@@ -135,7 +135,7 @@ class DesfilePuraTendenciaSeederTest extends TestCase
$expectedMenus = DB::table('tenants_menues')
->where('tenant_code', 'fiesta_futbol_infantil')
->where('menu_code', 'not like', 'onticket.adminapp.fiesta-futbol-infantil.%')
->where('menu_code', 'not like', 'adminapp.fiesta-futbol-infantil.%')
->orderBy('menu_code')
->pluck('menu_code')
->all();
@@ -147,9 +147,9 @@ class DesfilePuraTendenciaSeederTest extends TestCase
$this->assertSame($expectedMenus, $actualMenus);
$this->assertContains('main.adminapp', $actualMenus);
$this->assertContains('onticket.adminapp.event', $actualMenus);
$this->assertContains('adminapp.event', $actualMenus);
$this->assertContains('scanner.scan', $actualMenus);
$this->assertNotContains('onticket.adminapp.fiesta-futbol-infantil.entradas', $actualMenus);
$this->assertNotContains('adminapp.fiesta-futbol-infantil.entradas', $actualMenus);
$catalogItem = DB::table('catalog_items')
->where('tenant_code', 'desfile_pura_tendencia')

View File

@@ -5,7 +5,6 @@ namespace Tests\Feature\Seeders;
use App\Domains\Core\Authorization\Enums\RoleCode;
use App\Domains\Core\Authorization\Models\Role;
use App\Domains\Core\Menu\Models\Menu;
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Shared\Attachable\Enums\AttachmentType;
use App\Shared\Attachable\Models\Attachment;
@@ -26,26 +25,21 @@ class MenuSeederTest extends TestCase
$this->seed(MenuSeeder::class);
$expectedMenus = [
'onticket.adminapp.inicio' => ['Inicio', '/admin/inicio'],
'onticket.adminapp.catalog' => ['Catálogo', '/admin/catalog'],
'onticket.adminapp.categories' => ['Categorías', '/admin/categories'],
'onticket.adminapp.combos' => ['Combos', '/admin/combos'],
'onticket.adminapp.event' => ['Eventos', '/admin/event'],
'onticket.adminapp.staff' => ['Usuarios', '/admin/staff'],
'onticket.adminapp.ventas' => ['Ventas', '/admin/ventas'],
'adminapp.inicio' => ['Inicio', '/admin/inicio'],
'adminapp.catalog' => ['Catálogo', '/admin/catalog'],
'adminapp.categories' => ['Categorías', '/admin/categories'],
'adminapp.combos' => ['Combos', '/admin/combos'],
'adminapp.event' => ['Eventos', '/admin/event'],
'adminapp.staff' => ['Staff', '/admin/staff'],
'adminapp.ventas' => ['Ventas', '/admin/ventas'],
];
$fiestaCategoryMenus = [
'onticket.adminapp.tickets' => ['Tickets', '/admin/tickets'],
'onticket.adminapp.fiesta-futbol-infantil.entradas' => ['Entradas', '/admin/entradas'],
'onticket.adminapp.fiesta-futbol-infantil.alojamientos' => ['Alojamientos', '/admin/alojamientos'],
'onticket.adminapp.fiesta-futbol-infantil.merchandising' => ['Merchandising', '/admin/merchandising'],
'onticket.adminapp.fiesta-futbol-infantil.comida' => ['Comida', '/admin/comidas'],
'adminapp.tickets' => ['Tickets', '/admin/tickets'],
'adminapp.fiesta-futbol-infantil.entradas' => ['Entradas', '/admin/entradas'],
'adminapp.fiesta-futbol-infantil.alojamientos' => ['Alojamientos', '/admin/alojamientos'],
'adminapp.fiesta-futbol-infantil.merchandising' => ['Merchandising', '/admin/merchandising'],
'adminapp.fiesta-futbol-infantil.comida' => ['Comida', '/admin/comidas'],
];
$desfileMenus = [
'onticket.adminapp.desfile.entradas' => ['Entradas', '/admin/desfile/entradas'],
'onticket.adminapp.desfile.reservas' => ['Reserva de Tickets', '/admin/desfile/reservas'],
];
$shopItMenus = $this->shopItAdminMenus();
$adminApp = Menu::query()
->with('children')
@@ -59,8 +53,7 @@ class MenuSeederTest extends TestCase
collect(array_keys([
...$expectedMenus,
...$fiestaCategoryMenus,
...$desfileMenus,
...$shopItMenus,
'adminapp.desfile.entradas' => ['Entradas', '/admin/desfile/entradas'],
]))->sort()->values()->all(),
$adminApp->children->pluck('code')->sort()->values()->all()
);
@@ -95,10 +88,10 @@ class MenuSeederTest extends TestCase
}
foreach ([
'onticket.adminapp.inicio',
'onticket.adminapp.catalog',
'onticket.adminapp.categories',
'onticket.adminapp.combos',
'adminapp.inicio',
'adminapp.catalog',
'adminapp.categories',
'adminapp.combos',
] as $code) {
$this->assertFalse(
$fiestaTenant->menues()->where('menues.code', $code)->exists()
@@ -123,50 +116,6 @@ class MenuSeederTest extends TestCase
);
}
public function test_it_assigns_only_shopit_admin_menus_to_shopit_admin_tenants(): void
{
AdminWebsiteType::query()->create([
'codigo' => 'shopit',
'nombre' => 'ShopIt',
]);
$sonder = $this->createTenant('sonder', 'shopit');
$mutualSmep = $this->createTenant('mutual_smep', 'shopit');
$onTicket = $this->createTenant('onticket');
$this->seed(MenuSeeder::class);
$shopItMenuCodes = array_keys($this->shopItAdminMenus());
foreach ([$sonder, $mutualSmep] as $tenant) {
$adminMenuCodes = $tenant->menues()
->where(fn ($query) => $query
->where('menues.code', 'main.adminapp')
->orWhere('menues.parent_menu_code', 'main.adminapp'))
->orderBy('menues.code')
->pluck('menues.code')
->all();
$this->assertSame(
collect(['main.adminapp', ...$shopItMenuCodes])->sort()->values()->all(),
$adminMenuCodes,
);
}
foreach ($this->shopItAdminMenus() as $code => [$label, $route]) {
$menu = Menu::query()->where('code', $code)->firstOrFail();
$this->assertSame($label, $menu->label);
$this->assertSame($route, $menu->route);
$this->assertSame('main.adminapp', $menu->parent_menu_code);
$this->assertFalse($onTicket->menues()->where('menues.code', $code)->exists());
}
$this->assertFalse(
Menu::query()->where('code', 'like', 'adminapp.%')->exists()
);
}
public function test_it_assigns_menus_to_the_expected_roles(): void
{
$this->seed(AuthorizationSeeder::class);
@@ -213,7 +162,7 @@ class MenuSeederTest extends TestCase
$this->assertSame($userMenuCodes, $userRoleMenuCodes);
$this->assertNotContains('main.adminapp', $userRoleMenuCodes);
$this->assertNotContains('onticket.adminapp.catalog', $userRoleMenuCodes);
$this->assertNotContains('adminapp.catalog', $userRoleMenuCodes);
$scannerRoleMenuCodes = Role::query()
->where('codigo', RoleCode::Scanner->value)
@@ -433,7 +382,7 @@ class MenuSeederTest extends TestCase
);
}
private function createTenant(string $code, ?string $adminWebsiteTypeCode = null): Tenant
private function createTenant(string $code): Tenant
{
$headerLogo = $this->createAttachment("{$code}-header.png");
$footerLogo = $this->createAttachment("{$code}-footer.png");
@@ -442,7 +391,6 @@ class MenuSeederTest extends TestCase
'codigo' => $code,
'nombre' => $code,
'dominio' => "{$code}.example.com",
'admin_website_type_code' => $adminWebsiteTypeCode,
'primary_color' => '#111111',
'secondary_color' => '#222222',
'danger_color' => '#333333',
@@ -454,20 +402,6 @@ class MenuSeederTest extends TestCase
]);
}
/** @return array<string, array{string, string}> */
private function shopItAdminMenus(): array
{
return [
'shopit.adminapp.marca' => ['Marca', '/admin/marca'],
'shopit.adminapp.contacto' => ['Contacto', '/admin/contacto'],
'shopit.adminapp.productos' => ['Productos', '/admin/productos'],
'shopit.adminapp.categorias' => ['Categorías', '/admin/categorias'],
'shopit.adminapp.transacciones' => ['Transacciones', '/admin/transacciones'],
'shopit.adminapp.reportes' => ['Reportes', '/admin/reportes'],
'shopit.adminapp.usuarios_roles' => ['Usuarios y roles', '/admin/usuarios-roles'],
];
}
private function createAttachment(string $filename): Attachment
{
return Attachment::query()->create([

View File

@@ -23,7 +23,7 @@ class WebsiteTypeSeederTest extends TestCase
$this->assertSame(2, AdminWebsiteType::query()->count());
$this->assertSame(3, StorefrontWebsiteType::query()->count());
$this->assertSame(6, Attachment::query()->count());
$this->assertSame(5, Attachment::query()->count());
$expectedPresentation = [
'primary_color' => '#FF7006',
@@ -45,15 +45,12 @@ class WebsiteTypeSeederTest extends TestCase
$this->assertSame('ShopIt', $shopIt->nombre);
$this->assertSame('localhost', $shopIt->dominio);
$this->assertSame('scanner.localhost', $shopIt->scanner_domain);
$this->assertSame(
[...$expectedPresentation, 'primary_color' => '#2FD3AC'],
$shopIt->only(array_keys($expectedPresentation)),
);
$this->assertSame('shopit_logo.png', $shopIt->siteLogo->filename);
$this->assertSame($expectedPresentation, $shopIt->only(array_keys($expectedPresentation)));
$this->assertSame('onticket_logo.png', $shopIt->siteLogo->filename);
Storage::disk('s3')->assertExists($shopIt->siteLogo->path);
$this->assertSame('shopit_footer_logo.png', $shopIt->footerLogo->filename);
$this->assertSame('onticket_footer_logo.png', $shopIt->footerLogo->filename);
Storage::disk('s3')->assertExists($shopIt->footerLogo->path);
$this->assertSame('shopit-favicon.svg', $shopIt->favicon->filename);
$this->assertSame('onticket_favicon.svg', $shopIt->favicon->filename);
Storage::disk('s3')->assertExists($shopIt->favicon->path);
$shopItStorefront = StorefrontWebsiteType::query()->where('codigo', 'shopit')->with('extras')->sole();
$this->assertSame('standard', $shopItStorefront->header_type);
@@ -87,7 +84,7 @@ class WebsiteTypeSeederTest extends TestCase
Storage::disk('s3')->assertExists($onTicket->footerLogo->path);
$this->assertNotSame($shopIt->site_logo, $onTicket->site_logo);
$this->assertNotSame($shopIt->footer_logo, $onTicket->footer_logo);
$this->assertNotSame($shopIt->favicon_id, $onTicket->favicon_id);
$this->assertSame($shopIt->favicon_id, $onTicket->favicon_id);
$this->assertSame('onticket_favicon.svg', $onTicket->favicon->filename);
$onTicketStorefront = StorefrontWebsiteType::query()->where('codigo', 'onticket')->with('extras')->sole();
$this->assertSame('standard', $onTicketStorefront->header_type);

View File

@@ -0,0 +1,158 @@
<?php
namespace Tests\Feature\Staff;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Laravel\Sanctum\Sanctum;
use Mockery\MockInterface;
use Tests\TestCase;
class StaffEventScopeTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
// Exercise HTTP authorization on SQLite without the incompatible legacy migrations.
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo');
$table->boolean('scanner_category_validation_enabled')->default(false);
});
Schema::create('roles', function (Blueprint $table): void {
$table->id();
$table->string('codigo');
$table->string('nombre');
});
Schema::create('users', function (Blueprint $table): void {
$table->id();
$table->string('rol_codigo');
$table->string('tenant_codigo');
$table->unsignedBigInteger('event_id')->nullable();
$table->string('nombre_apellido');
$table->string('dni');
$table->string('email');
$table->string('active_email')->nullable();
$table->string('password')->nullable();
$table->timestamps();
$table->softDeletes();
});
Schema::create('categorias', function (Blueprint $table): void {
$table->id();
$table->string('nombre');
$table->string('tenant_code')->nullable();
$table->unsignedBigInteger('categoria_id')->nullable();
});
Schema::create('catalog_items', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('category_id');
$table->string('tenant_code');
$table->softDeletes();
});
Schema::create('category_scanners', function (Blueprint $table): void {
$table->unsignedBigInteger('user_id');
$table->unsignedBigInteger('categoria_id');
$table->timestamps();
});
Schema::create('personal_access_tokens', function (Blueprint $table): void {
$table->id();
$table->string('tokenable_type');
$table->unsignedBigInteger('tokenable_id');
});
DB::table('tenants')->insert(['codigo' => 'onticket']);
foreach (['adminapp', 'scanner'] as $role) {
DB::table('roles')->insert(['codigo' => $role, 'nombre' => $role]);
foreach ([10, 20, null] as $eventId) {
$this->insertUser($role, 'onticket', $eventId);
}
$this->insertUser($role, 'other', 10);
}
Sanctum::actingAs(User::query()->findOrFail(1));
}
public function test_lists_and_searches_are_restricted_to_the_authenticated_event(): void
{
foreach (['administrators' => 1, 'staff' => 5] as $path => $id) {
foreach (['', '?search=Persona&event_id=20'] as $query) {
$this->getJson("/api/v1/adminapp/tenant/{$path}{$query}")
->assertOk()->assertJsonCount(1, 'data')
->assertJsonPath('data.0.id', $id)->assertJsonPath('data.0.event_id', 10);
}
}
}
public function test_creation_inherits_the_actor_event_even_if_the_client_supplies_another(): void
{
$this->mock(ResetPasswordAttemptService::class, function (MockInterface $mock): void {
$mock->shouldReceive('createForAdminAppEmail')->once();
$mock->shouldReceive('createForScannerEmail')->once();
});
foreach (['administrators' => 'adminapp', 'staff' => 'scanner'] as $path => $role) {
$this->postJson("/api/v1/adminapp/tenant/{$path}", [
...$this->payload("new-{$role}@example.com"), 'event_id' => 20,
])->assertSuccessful()->assertJsonPath('data.event_id', 10);
$this->assertDatabaseHas('users', ['email' => "new-{$role}@example.com", 'event_id' => 10, 'rol_codigo' => $role]);
}
}
public function test_foreign_and_unassigned_staff_cannot_be_edited_deleted_or_inspected(): void
{
foreach (['administrators' => [2, 3, 4], 'staff' => [6, 7, 8]] as $path => $ids) {
foreach ($ids as $id) {
$this->putJson("/api/v1/adminapp/tenant/{$path}/{$id}", $this->payload("update-{$id}@example.com"))->assertNotFound();
$this->deleteJson("/api/v1/adminapp/tenant/{$path}/{$id}")->assertNotFound();
$this->assertDatabaseHas('users', ['id' => $id, 'deleted_at' => null, 'email' => "person-{$id}@example.com"]);
if ($path === 'staff') {
$this->getJson("/api/v1/adminapp/tenant/staff/{$id}/scan-attempts")->assertNotFound();
}
}
}
}
public function test_own_staff_can_be_edited_and_deleted_without_changing_its_event(): void
{
$adminId = $this->insertUser('adminapp', 'onticket', 10);
foreach (['administrators' => $adminId, 'staff' => 5] as $path => $id) {
$this->putJson("/api/v1/adminapp/tenant/{$path}/{$id}", [
...$this->payload("updated-{$id}@example.com"), 'event_id' => 20,
])->assertOk()->assertJsonPath('data.event_id', 10);
$this->deleteJson("/api/v1/adminapp/tenant/{$path}/{$id}")->assertNoContent();
$this->assertSoftDeleted('users', ['id' => $id]);
}
}
public function test_unscoped_actor_keeps_tenant_lists_and_creates_without_an_event(): void
{
Sanctum::actingAs(User::query()->findOrFail(3));
$this->mock(ResetPasswordAttemptService::class, function (MockInterface $mock): void {
$mock->shouldReceive('createForAdminAppEmail')->once();
$mock->shouldReceive('createForScannerEmail')->once();
});
foreach (['administrators', 'staff'] as $path) {
$this->getJson("/api/v1/adminapp/tenant/{$path}")->assertOk()->assertJsonCount(3, 'data');
$this->postJson("/api/v1/adminapp/tenant/{$path}", $this->payload("legacy-{$path}@example.com"))
->assertSuccessful()->assertJsonPath('data.event_id', null);
}
}
private function insertUser(string $role, string $tenant, ?int $eventId): int
{
$id = DB::table('users')->count() + 1;
return DB::table('users')->insertGetId([
'id' => $id, 'rol_codigo' => $role, 'tenant_codigo' => $tenant,
'event_id' => $eventId, 'nombre_apellido' => 'Persona', 'dni' => '12345678',
'email' => "person-{$id}@example.com", 'active_email' => "person-{$id}@example.com",
]);
}
private function payload(string $email): array
{
return ['nombre_apellido' => 'Persona editada', 'dni' => '87654321', 'email' => $email];
}
}

View File

@@ -1,263 +0,0 @@
<?php
namespace Tests\Feature\Tenant;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Authorization\Enums\RoleCode;
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
use App\Domains\Core\Tenant\Models\Tenant;
use App\Shared\Attachable\Enums\AttachmentType;
use App\Shared\Attachable\Models\Attachment;
use App\Shared\Attachable\Models\AttachmentCrop;
use Database\Seeders\AuthorizationSeeder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
use Laravel\Sanctum\Sanctum;
use Tests\TestCase;
class AdminAppBrandControllerTest extends TestCase
{
use RefreshDatabase;
protected function setUp(): void
{
parent::setUp();
$this->seed(AuthorizationSeeder::class);
Storage::fake('s3');
}
public function test_only_the_authenticated_adminapp_tenant_brand_is_returned(): void
{
$websiteType = $this->websiteType('shopit');
$carousel = $websiteType->extras()->create([
'codigo' => 'carousel',
'nombre' => 'Carrusel principal',
'is_required' => false,
'config_schema' => [
'request_rules' => ['$' => 'required|array'],
'transforms' => ['$.*' => ['handler' => 'attachment', 'attachment_type' => 'image']],
],
]);
$header = $this->image('header.png');
$footer = $this->image('footer.png');
$first = $this->image('first.png');
$second = $this->image('second.png');
$cropped = $this->image('first-cropped.png');
$first->cropVariants()->create([
'variant' => AttachmentCrop::DESKTOP,
'crop_horizontal' => ['start_percentage' => 10, 'end_percentage' => 90],
'crop_vertical' => ['start_percentage' => 20, 'end_percentage' => 80],
'cropped_attachment_id' => $cropped->id,
]);
$tenant = $this->tenant('acme', $websiteType, [
'nombre' => 'Acme',
'primary_color' => '#112233',
'header_bg_color' => '#223344',
'footer_bg_color' => '#112233',
'header_logo_id' => $header->id,
'footer_logo_id' => $footer->id,
]);
$tenant->websiteExtras()->create([
'website_type_extra_id' => $carousel->id,
'config' => [$first->id, $second->id],
]);
$other = $this->tenant('other', $websiteType, ['nombre' => 'Other']);
$other->websiteExtras()->create([
'website_type_extra_id' => $carousel->id,
'config' => [$this->image('other.png')->id],
]);
Sanctum::actingAs($this->admin($tenant));
$response = $this->getJson('/api/v1/adminapp/tenant/brand')
->assertOk()
->assertJsonPath('data.nombre', 'Acme')
->assertJsonPath('data.primary_color', '#112233')
->assertJsonPath('data.header_bg_color', '#223344')
->assertJsonPath('data.footer_color', 'primary')
->assertJsonCount(2, 'data.banner_images');
foreach (['header_logo' => $header, 'footer_logo' => $footer] as $field => $image) {
$this->assertStringContainsString($image->path, $response->json("data.{$field}"));
$response->assertJsonPath("data.{$field}_key", $image->key);
}
foreach ([$first, $second] as $index => $image) {
$response->assertJsonPath("data.banner_images.{$index}.key", $image->key);
$this->assertStringContainsString(
$image->path,
$response->json("data.banner_images.{$index}.original_url")
);
}
$this->assertStringContainsString($cropped->path, $response->json('data.banner_images.0.url'));
$response->assertJsonPath('data.banner_images.0.crop.crop_horizontal.start_percentage', 10)
->assertJsonPath('data.banner_images.0.crop.crop_vertical.end_percentage', 80)
->assertJsonPath('data.banner_images.1.crop', null);
$this->assertStringNotContainsString('other.png', $response->getContent());
}
public function test_update_keeps_original_carousel_attachment_and_returns_its_crop(): void
{
$websiteType = $this->websiteType('shopit');
$carousel = $websiteType->extras()->create([
'codigo' => 'carousel', 'nombre' => 'Carrusel', 'is_required' => false,
'config_schema' => ['request_rules' => [], 'transforms' => [
'$.*' => ['handler' => 'attachment', 'attachment_type' => 'image'],
]],
]);
$tenant = $this->tenant('acme', $websiteType, [
'primary_color' => '#112233', 'footer_bg_color' => '#112233',
]);
Sanctum::actingAs($this->admin($tenant));
$file = UploadedFile::fake()->image('banner.png', 400, 100);
$dataUrl = 'data:image/png;base64,'.base64_encode(file_get_contents($file->getRealPath()));
$response = $this->putJson('/api/v1/adminapp/tenant/brand', [
'nombre' => 'Acme Nueva', 'primary_color' => '#abcdef',
'footer_bg_color' => '#abcdef', 'header_logo' => null, 'footer_logo' => null,
'banner_images' => [[
'image' => $dataUrl,
'crop_horizontal' => ['start_percentage' => 10, 'end_percentage' => 90],
'crop_vertical' => ['start_percentage' => 0, 'end_percentage' => 100],
]],
])->assertOk()
->assertJsonPath('data.nombre', 'Acme Nueva')
->assertJsonPath('data.footer_color', 'primary')
->assertJsonPath('data.banner_images.0.crop.crop_horizontal.start_percentage', 10);
$original = Attachment::query()->where('key', $response->json('data.banner_images.0.key'))->firstOrFail();
$this->assertSame([$original->id], $tenant->websiteExtras()
->where('website_type_extra_id', $carousel->id)->firstOrFail()->config);
$this->assertStringContainsString($original->path, $response->json('data.banner_images.0.original_url'));
$this->assertNotSame($response->json('data.banner_images.0.original_url'),
$response->json('data.banner_images.0.url'));
$updated = $this->putJson('/api/v1/adminapp/tenant/brand', [
'nombre' => 'Acme Nueva', 'primary_color' => '#abcdef',
'footer_bg_color' => '#abcdef', 'header_logo' => null, 'footer_logo' => null,
'banner_images' => [[
'image' => $original->key,
'crop_horizontal' => ['start_percentage' => 20, 'end_percentage' => 80],
'crop_vertical' => ['start_percentage' => 0, 'end_percentage' => 100],
]],
])->assertOk()
->assertJsonPath('data.banner_images.0.key', $original->key)
->assertJsonPath('data.banner_images.0.crop.crop_horizontal.start_percentage', 20);
$this->assertSame([$original->id], $tenant->websiteExtras()
->where('website_type_extra_id', $carousel->id)->firstOrFail()->config);
$this->assertNotSame($response->json('data.banner_images.0.url'),
$updated->json('data.banner_images.0.url'));
$this->assertSame('#abcdef', $tenant->refresh()->footer_bg_color);
$tenant->update(['primary_color' => '#123456']);
$this->assertSame('#abcdef', $tenant->refresh()->footer_bg_color);
}
public function test_footer_color_is_mapped_to_a_supported_option(): void
{
$websiteType = $this->websiteType('shopit');
$cases = [
['primary', '#112233', '#112233'],
['white', '#112233', '#FFFFFF'],
['black', '#112233', '#000000'],
['primary', '#112233', '#445566'],
];
foreach ($cases as $index => [$expected, $primaryColor, $footerColor]) {
$tenant = $this->tenant("tenant-{$index}", $websiteType, [
'primary_color' => $primaryColor,
'footer_bg_color' => $footerColor,
]);
Sanctum::actingAs($this->admin($tenant));
$this->getJson('/api/v1/adminapp/tenant/brand')
->assertOk()
->assertJsonPath('data.footer_color', $expected);
}
}
public function test_missing_and_non_shopit_carousels_return_an_empty_list(): void
{
$shopit = $this->websiteType('shopit');
$tenant = $this->tenant('acme', $shopit);
Sanctum::actingAs($this->admin($tenant));
$this->getJson('/api/v1/adminapp/tenant/brand')
->assertOk()
->assertJsonPath('data.header_logo', null)
->assertJsonPath('data.footer_logo', null)
->assertJsonPath('data.banner_images', []);
$otherType = $this->websiteType('other');
$carousel = $otherType->extras()->create([
'codigo' => 'carousel',
'nombre' => 'Other carousel',
'is_required' => false,
'config_schema' => [
'request_rules' => ['$' => 'required|array'],
'transforms' => ['$.*' => ['handler' => 'attachment', 'attachment_type' => 'image']],
],
]);
$other = $this->tenant('other', $otherType);
$other->websiteExtras()->create([
'website_type_extra_id' => $carousel->id,
'config' => [$this->image('other.png')->id],
]);
Sanctum::actingAs($this->admin($other));
$this->getJson('/api/v1/adminapp/tenant/brand')
->assertOk()
->assertJsonPath('data.banner_images', []);
}
public function test_the_brand_endpoint_requires_an_adminapp_session(): void
{
$this->getJson('/api/v1/adminapp/tenant/brand')->assertUnauthorized();
Sanctum::actingAs(User::factory()->create([
'rol_codigo' => RoleCode::User->value,
'tenant_codigo' => null,
]));
$this->getJson('/api/v1/adminapp/tenant/brand')->assertForbidden();
}
private function websiteType(string $code): StorefrontWebsiteType
{
return StorefrontWebsiteType::query()->create([
'codigo' => $code,
'nombre' => ucfirst($code),
]);
}
private function tenant(string $code, StorefrontWebsiteType $websiteType, array $attributes = []): Tenant
{
return Tenant::query()->create([
'codigo' => $code,
'nombre' => ucfirst($code),
'dominio' => "{$code}.test",
'storefront_website_type_code' => $websiteType->codigo,
...$attributes,
]);
}
private function admin(Tenant $tenant): User
{
return User::factory()->create([
'rol_codigo' => RoleCode::AdminApp->value,
'tenant_codigo' => $tenant->codigo,
]);
}
private function image(string $filename): Attachment
{
return Attachment::query()->create([
'path' => "tenants/test/{$filename}",
'filename' => $filename,
'type' => AttachmentType::Image,
'mime_type' => 'image/png',
'extension' => 'png',
]);
}
}

View File

@@ -1,176 +0,0 @@
<?php
namespace Tests\Feature\Tenant;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Core\Authorization\Enums\RoleCode;
use App\Domains\Core\Menu\Models\Menu;
use App\Domains\Core\Tenant\Models\Tenant;
use Database\Seeders\AuthorizationSeeder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Sanctum\Sanctum;
use Tests\TestCase;
class AdminAppHelpMenuControllerTest extends TestCase
{
use RefreshDatabase;
protected function setUp(): void
{
parent::setUp();
$this->seed(AuthorizationSeeder::class);
}
public function test_authentication_is_required(): void
{
$this->getJson('/api/v1/adminapp/tenant/help-menus')
->assertUnauthorized();
}
public function test_adminapp_user_can_read_help_menu_states(): void
{
[$tenant] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$response = $this->getJson('/api/v1/adminapp/tenant/help-menus')
->assertOk();
$states = $response->json('data');
$this->assertFalse($states['help.faq']['is_enabled']);
$this->assertTrue($states['help.terms-and-conditions']['is_enabled']);
$this->assertSame('¿Cómo compro?', $states['help.faq']['static_content'][0]['pregunta']);
$this->assertSame(['html' => ''], $states['help.terms-and-conditions']['static_content']);
$this->assertArrayNotHasKey('help.contact', $states);
}
public function test_toggling_a_help_menu_preserves_its_static_content(): void
{
[$tenant, $faq, $content] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$this->patchJson('/api/v1/adminapp/tenant/help-menus/help.faq/toggle')
->assertOk()
->assertJsonPath('data.code', 'help.faq')
->assertJsonPath('data.is_enabled', true);
$pivot = $tenant->menues()->where('menues.code', $faq->code)->firstOrFail()->pivot;
$this->assertTrue($pivot->is_enabled);
$this->assertSame($content, $pivot->static_content);
}
public function test_an_unrelated_menu_cannot_be_toggled_from_the_help_endpoint(): void
{
[$tenant] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$this->patchJson('/api/v1/adminapp/tenant/help-menus/catalog/toggle')
->assertNotFound();
}
public function test_contact_menu_cannot_be_toggled(): void
{
[$tenant] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$this->patchJson('/api/v1/adminapp/tenant/help-menus/help.contact/toggle')
->assertNotFound();
$this->assertTrue(
$tenant->menues()->where('menues.code', 'help.contact')->firstOrFail()->pivot->is_enabled
);
}
public function test_adminapp_user_can_update_faq_content_without_changing_its_state(): void
{
[$tenant] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$content = [[
'pregunta' => '¿Cuál es el horario?',
'respuesta' => 'De lunes a viernes.',
'is_active' => true,
]];
$this->putJson('/api/v1/adminapp/tenant/help-menus/help.faq/content', [
'static_content' => $content,
])
->assertOk()
->assertJsonPath('data.is_enabled', false)
->assertJsonPath('data.static_content.0.pregunta', '¿Cuál es el horario?');
$pivot = $tenant->menues()->where('menues.code', 'help.faq')->firstOrFail()->pivot;
$this->assertFalse($pivot->is_enabled);
$this->assertSame($content, $pivot->static_content);
}
public function test_adminapp_user_can_update_terms_content(): void
{
[$tenant] = $this->tenantWithHelpMenus();
Sanctum::actingAs($this->createAdminAppUser($tenant));
$this->putJson('/api/v1/adminapp/tenant/help-menus/help.terms-and-conditions/content', [
'static_content' => ['html' => '<p>Nuevos términos</p>'],
])
->assertOk()
->assertJsonPath('data.static_content.html', '<p>Nuevos términos</p>');
$this->assertSame(
['html' => '<p>Nuevos términos</p>'],
$tenant->menues()
->where('menues.code', 'help.terms-and-conditions')
->firstOrFail()
->pivot
->static_content
);
}
/** @return array{Tenant, Menu, array<int, array<string, mixed>>} */
private function tenantWithHelpMenus(): array
{
$tenant = Tenant::query()->create([
'codigo' => 'acme',
'nombre' => 'Acme',
'dominio' => 'acme.test',
]);
$content = [[
'pregunta' => '¿Cómo compro?',
'respuesta' => 'Desde el catálogo.',
'is_active' => true,
]];
$faq = Menu::query()->create([
'code' => 'help.faq',
'label' => 'Preguntas frecuentes',
'content_type' => Menu::CONTENT_TYPE_STATIC,
'static_content_schema' => ['*.pregunta' => 'required|string'],
'route' => '/ayuda/preguntas-frecuentes',
]);
$contact = Menu::query()->create([
'code' => 'help.contact',
'label' => 'Contacto',
'route' => '/ayuda/contacto',
]);
$terms = Menu::query()->create([
'code' => 'help.terms-and-conditions',
'label' => 'Términos y condiciones',
'route' => '/ayuda/terminos-y-condiciones',
]);
$tenant->menues()->attach($faq->code, [
'static_content' => $content,
'is_enabled' => false,
]);
$tenant->menues()->attach($contact->code, ['is_enabled' => true]);
$tenant->menues()->attach($terms->code, ['is_enabled' => true]);
return [$tenant, $faq, $content];
}
private function createAdminAppUser(Tenant $tenant): User
{
return User::factory()->create([
'rol_codigo' => RoleCode::AdminApp->value,
'tenant_codigo' => $tenant->codigo,
]);
}
}

View File

@@ -1359,7 +1359,7 @@ class AdminAppTicketControllerTest extends TestCase
private function grantTicketsMenu(Tenant $tenant): void
{
$menu = Menu::query()->create([
'code' => 'onticket.adminapp.tickets',
'code' => 'adminapp.tickets',
'label' => 'Tickets',
'route' => '/admin/tickets',
]);

View File

@@ -0,0 +1,178 @@
<?php
namespace Tests\Feature\Ticket;
use App\Domains\Core\Auth\Models\User;
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketExcelService;
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketPdfService;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Laravel\Sanctum\Sanctum;
use Mockery\MockInterface;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Tests\TestCase;
class AdminAppTicketEventScopeTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
// Keep HTTP tests isolated from legacy migrations incompatible with SQLite.
Schema::create('tenants', function (Blueprint $table): void {
$table->id();
$table->string('codigo');
$table->string('timezone')->default('UTC');
$table->boolean('allow_ticket_refund')->default(false);
$table->boolean('allow_ticket_total_refund')->default(false);
$table->boolean('allow_ticket_partial_refund')->default(false);
});
Schema::create('menues', function (Blueprint $table): void {
$table->id();
$table->string('code');
});
Schema::create('tenants_menues', function (Blueprint $table): void {
$table->string('tenant_code');
$table->string('menu_code');
});
Schema::create('users', function (Blueprint $table): void {
$table->id();
$table->string('nombre_apellido');
$table->softDeletes();
});
Schema::create('tickets', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->unsignedBigInteger('event_id')->nullable();
$table->string('ticket');
foreach (['source_variant_id', 'source_catalog_item_id', 'source_purchase_item_id', 'scanner_user_id', 'user_id'] as $column) {
$table->unsignedBigInteger($column)->nullable();
}
foreach (['used_at', 'disabled_at', 'cancelled_at', 'refunded_at'] as $column) {
$table->timestamp($column)->nullable();
}
$table->timestamps();
});
Schema::create('compras', function (Blueprint $table): void {
$table->id();
$table->string('tenant_codigo');
$table->unsignedBigInteger('event_id')->nullable();
$table->string('nombre_apellido');
});
Schema::create('compra_items', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('compra_id');
$table->decimal('precio_unitario', 12, 2);
});
Schema::create('ticket_refunds', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('ticket_id')->nullable();
$table->unsignedBigInteger('purchase_item_id');
$table->decimal('amount', 12, 2);
});
Schema::create('desfile_entry_reservations', function (Blueprint $table): void {
$table->id();
$table->unsignedBigInteger('ticket_id');
$table->softDeletes();
});
Schema::create('value_changes', function (Blueprint $table): void {
$table->id();
$table->string('tenant_code');
$table->string('trackable_type');
$table->unsignedBigInteger('trackable_id');
$table->string('attribute');
$table->string('old_value')->nullable();
$table->string('new_value')->nullable();
$table->timestamp('changed_at');
$table->string('actor_type');
$table->unsignedBigInteger('user_id')->nullable();
});
DB::table('tenants')->insert(['codigo' => 'onticket']);
DB::table('menues')->insert(['code' => 'adminapp.tickets']);
DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'adminapp.tickets']);
foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) {
DB::table('tickets')->insert([
'id' => $id, 'tenant_code' => $tenant, 'event_id' => $event,
'ticket' => "ticket-{$id}", 'used_at' => now(),
]);
DB::table('compras')->insert(['id' => $id, 'tenant_codigo' => $tenant, 'event_id' => $event, 'nombre_apellido' => 'Cliente']);
DB::table('compra_items')->insert(['id' => $id, 'compra_id' => $id, 'precio_unitario' => 100]);
DB::table('ticket_refunds')->insert(['purchase_item_id' => $id, 'amount' => $id * 10]);
}
$this->actingAsAdmin(10);
}
public function test_list_counts_refunded_total_and_search_cannot_escape_the_user_event(): void
{
$this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=id&event_id=20')
->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.id', 1)
->assertJsonPath('scanned_tickets', 1)->assertJsonPath('total_tickets', 1)
->assertJsonPath('refunded_total', '10.00');
$this->getJson('/api/v1/adminapp/tenant/tickets?q=2')->assertOk()->assertJsonCount(0, 'data');
// Status uses sorting in memory rather than the database.
$this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=status')
->assertOk()->assertJsonCount(1, 'data')->assertJsonPath('data.0.id', 1);
DB::table('tickets')->where('id', 1)->update(['used_at' => null]);
$this->getJson('/api/v1/adminapp/tenant/tickets?status=active')
->assertOk()->assertJsonCount(1, 'data')
->assertJsonPath('scanned_tickets', 0)->assertJsonPath('total_tickets', 1);
}
public function test_foreign_unassigned_and_other_tenant_tickets_cannot_be_modified_or_refunded(): void
{
foreach ([2, 3, 4] as $id) {
$this->postJson("/api/v1/adminapp/tenant/tickets/{$id}/cancel", ['event_id' => 20])->assertNotFound();
$this->getJson("/api/v1/adminapp/tenant/tickets/{$id}/refund")->assertNotFound();
$this->postJson("/api/v1/adminapp/tenant/tickets/{$id}/refund", ['refund_type' => 'total', 'event_id' => 20])->assertNotFound();
$this->assertDatabaseHas('tickets', ['id' => $id, 'cancelled_at' => null, 'refunded_at' => null]);
}
$this->assertDatabaseCount('value_changes', 0);
$this->assertDatabaseCount('ticket_refunds', 4);
}
public function test_own_ticket_can_be_cancelled_and_refund_requests_reach_business_validation(): void
{
DB::table('tickets')->where('id', 1)->update(['used_at' => null]);
$this->getJson('/api/v1/adminapp/tenant/tickets/1/refund')->assertUnprocessable();
$this->postJson('/api/v1/adminapp/tenant/tickets/1/refund', ['refund_type' => 'total'])->assertUnprocessable();
$this->postJson('/api/v1/adminapp/tenant/tickets/1/cancel')->assertOk();
$this->assertNotNull(DB::table('tickets')->where('id', 1)->value('cancelled_at'));
}
public function test_unscoped_admin_keeps_the_tenant_scope(): void
{
$this->actingAsAdmin(null);
$this->getJson('/api/v1/adminapp/tenant/tickets?sort_by=id')
->assertOk()->assertJsonCount(3, 'data')->assertJsonPath('total_tickets', 3)
->assertJsonPath('refunded_total', '60.00');
DB::table('tickets')->where('id', 3)->update(['used_at' => null]);
$this->postJson('/api/v1/adminapp/tenant/tickets/3/cancel')->assertOk();
$this->postJson('/api/v1/adminapp/tenant/tickets/4/cancel')->assertNotFound();
}
public function test_pdf_and_excel_receive_only_the_tickets_of_the_user_event(): void
{
foreach ([AdminAppTicketPdfService::class, AdminAppTicketExcelService::class] as $class) {
$this->mock($class, function (MockInterface $mock) use ($class): void {
$mock->shouldReceive('download')->once()->withArgs(
fn ($tenant, Collection $tickets, $timezone): bool => $tenant->codigo === 'onticket'
&& $tickets->pluck('id')->all() === [1] && $timezone === 'UTC'
)->andReturn($class === AdminAppTicketPdfService::class
? response('pdf') : new StreamedResponse(fn () => print ('excel')));
});
}
foreach (['pdf', 'excel'] as $format) {
$this->getJson("/api/v1/adminapp/tenant/tickets/{$format}?timezone=UTC&event_id=20")->assertOk();
}
}
private function actingAsAdmin(?int $eventId): void
{
$user = new User;
$user->setRawAttributes(['id' => 1, 'rol_codigo' => 'adminapp', 'tenant_codigo' => 'onticket', 'event_id' => $eventId]);
Sanctum::actingAs($user);
}
}