soeren/fotospiel-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixed event join token handling in the event admin. created new seeders with new tenants and package purchases. added new playwright test scenarios.

Browse Source
This commit is contained in:
Codex Agent
2025-10-26 14:44:47 +01:00
parent 6290a3a448
commit ecf5a23b28
59 changed files with 3900 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Http/Controllers/Api/Tenant/EventController.php
View File

@@ -4,11 +4,12 @@ namespace App\Http\Controllers\Api\Tenant;
use App\Http\Controllers\Controller;
use App\Http\Requests\Tenant\EventStoreRequest;
use App\Http\Resources\Tenant\EventJoinTokenResource;
use App\Http\Resources\Tenant\EventResource;
use App\Models\Event;
use App\Models\Tenant;
use App\Models\EventPackage;
use App\Models\Package;
use App\Models\Photo;
use App\Models\Tenant;
use App\Services\EventJoinTokenService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -21,9 +22,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
class EventController extends Controller
{
public function __construct(private readonly EventJoinTokenService $joinTokenService)
{
}
public function __construct(private readonly EventJoinTokenService $joinTokenService) {}
public function index(Request $request): AnonymousResourceCollection
{
@@ -36,7 +35,12 @@ class EventController extends Controller
}
$query = Event::where('tenant_id', $tenantId)
->with(['eventType', 'photos'])
->with([
'eventType',
'photos',
'eventPackages.package',
'eventPackage.package',
])
->orderBy('created_at', 'desc');
if ($request->has('status')) {
@@ -65,9 +69,31 @@ class EventController extends Controller
$validated = $request->validated();
$tenantId = $tenant->id;
$packageId = $validated['package_id'] ?? 1; // Default to Free package ID 1
$requestedPackageId = $validated['package_id'] ?? null;
unset($validated['package_id']);
$tenantPackage = $tenant->tenantPackages()
->with('package')
->where('active', true)
->orderByDesc('purchased_at')
->first();
$package = null;
if ($requestedPackageId) {
$package = Package::query()->find($requestedPackageId);
}
if (! $package && $tenantPackage) {
$package = $tenantPackage->package ?? Package::query()->find($tenantPackage->package_id);
}
if (! $package) {
throw ValidationException::withMessages([
'package_id' => __('Aktuell ist kein aktives Paket verfügbar. Bitte buche zunächst ein Paket.'),
]);
}
$eventData = array_merge($validated, [
'tenant_id' => $tenantId,
'status' => $validated['status'] ?? 'draft',
@@ -122,37 +148,30 @@ class EventController extends Controller
$eventData = Arr::only($eventData, $allowed);
$event = DB::transaction(function () use ($tenant, $eventData, $packageId) {
$event = DB::transaction(function () use ($tenant, $eventData, $package) {
$event = Event::create($eventData);
$package = \App\Models\Package::findOrFail($packageId);
\App\Models\EventPackage::create([
EventPackage::create([
'event_id' => $event->id,
'package_id' => $packageId,
'price' => $package->price,
'package_id' => $package->id,
'purchased_price' => $package->price,
'purchased_at' => now(),
'gallery_expires_at' => $package->gallery_days ? now()->addDays($package->gallery_days) : null,
]);
\App\Models\PackagePurchase::create([
'tenant_id' => $tenant->id,
'event_id' => $event->id,
'package_id' => $packageId,
'provider_id' => 'free',
'price' => $package->price,
'type' => 'endcustomer_event',
'metadata' => json_encode(['note' => 'Free package assigned on event creation']),
]);
if ($package->isReseller()) {
$note = sprintf('Event #%d created (%s)', $event->id, $event->name);
$note = sprintf('Event #%d created (%s)', $event->id, $event->name);
if (! $tenant->consumeEventAllowance(1, 'event.create', $note)) {
throw new HttpException(402, 'Insufficient credits or package allowance.');
if (! $tenant->consumeEventAllowance(1, 'event.create', $note)) {
throw new HttpException(402, 'Insufficient credits or package allowance.');
}
}
return $event;
});
$tenant->refresh();
$event->load(['eventType', 'tenant', 'eventPackage.package']);
$event->load(['eventType', 'tenant', 'eventPackages.package']);
return response()->json([
'message' => 'Event created successfully',
@@ -175,6 +194,10 @@ class EventController extends Controller
'photos' => fn ($query) => $query->with('likes')->latest(),
'tasks',
'tenant' => fn ($query) => $query->select('id', 'name', 'event_credits_balance'),
'eventPackages' => fn ($query) => $query
->with('package')
->orderByDesc('purchased_at')
->orderByDesc('created_at'),
]);
return response()->json([
@@ -229,7 +252,6 @@ class EventController extends Controller
]);
}
public function stats(Request $request, Event $event): JsonResponse
{
$tenantId = $request->attributes->get('tenant_id');
@@ -312,6 +334,7 @@ class EventController extends Controller
'join_token' => new EventJoinTokenResource($joinToken),
]);
}
public function bulkUpdateStatus(Request $request): JsonResponse
{
$tenantId = $request->attributes->get('tenant_id');
@@ -341,7 +364,7 @@ class EventController extends Controller
->where('tenant_id', $tenantId)
->when($excludeId, fn ($query) => $query->where('id', '!=', $excludeId))
->exists()) {
$slug = $originalSlug . '-' . $counter;
$slug = $originalSlug.'-'.$counter;
$counter++;
}