bert.hausmans/crewli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: festival/event model frontend + topbar activeren

Browse Source 
- Events lijst: card grid met festival/serie chips
- Festival detail: programmaonderdelen grid
- CreateSubEventDialog voor sub-events binnen festival
- EventTabsNav: breadcrumb terug naar festival
- Sessie A: festival-bewuste EventResource + children endpoint
- Topbar: zoekbalk, theme switcher, shortcuts, notificaties
- Schema v1.7 + BACKLOG.md toegevoegd
- 121 tests groen
This commit is contained in:
bert.hausmans
2026-04-08 10:06:47 +02:00
parent 6848bc2c49
commit c776331cf8
21 changed files with 1087 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
api/app/Http/Controllers/Api/V1/EventController.php
View File

@@ -11,34 +11,62 @@ use App\Http\Resources\Api\V1\EventResource;
use App\Models\Event;
use App\Models\Organisation;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class EventController extends Controller
{
public function index(Organisation $organisation): AnonymousResourceCollection
public function index(Request $request, Organisation $organisation): AnonymousResourceCollection
{
Gate::authorize('viewAny', [Event::class, $organisation]);
$events = $organisation->events()
->latest('start_date')
->paginate();
$query = $organisation->events()
->topLevel()
->latest('start_date');
return EventResource::collection($events);
if ($request->query('type')) {
$query->where('event_type', $request->query('type'));
}
if ($request->boolean('include_children')) {
$query->with('children');
}
return EventResource::collection($query->paginate());
}
public function show(Organisation $organisation, Event $event): JsonResponse
{
Gate::authorize('view', [$event, $organisation]);
return $this->success(new EventResource($event->load('organisation')));
$event->load(['organisation', 'children', 'parent'])
->loadCount('children');
return $this->success(new EventResource($event));
}
public function store(StoreEventRequest $request, Organisation $organisation): JsonResponse
{
Gate::authorize('create', [Event::class, $organisation]);
$event = $organisation->events()->create($request->validated());
$data = $request->validated();
if (!empty($data['parent_event_id'])) {
$parentEvent = Event::where('id', $data['parent_event_id'])
->where('organisation_id', $organisation->id)
->first();
if (!$parentEvent) {
return $this->error('Parent event does not belong to this organisation.', 422);
}
}
if (!isset($data['event_type'])) {
$data['event_type'] = empty($data['parent_event_id']) ? 'event' : 'event';
}
$event = $organisation->events()->create($data);
return $this->created(new EventResource($event));
}
@@ -51,4 +79,16 @@ final class EventController extends Controller
return $this->success(new EventResource($event->fresh()));
}
public function children(Organisation $organisation, Event $event): AnonymousResourceCollection
{
Gate::authorize('view', [$event, $organisation]);
$children = $event->children()
->orderBy('start_date')
->orderBy('name')
->paginate();
return EventResource::collection($children);
}
}

4
api/app/Http/Requests/Api/V1/StoreEventRequest.php
View File

@@ -23,6 +23,10 @@ final class StoreEventRequest extends FormRequest
'end_date' => ['required', 'date', 'after_or_equal:start_date'],
'timezone' => ['sometimes', 'string', 'max:50'],
'status' => ['sometimes', 'string', 'in:draft,published,registration_open,buildup,showday,teardown,closed'],
'parent_event_id' => ['nullable', 'ulid', 'exists:events,id'],
'event_type' => ['nullable', 'in:event,festival,series'],
'event_type_label' => ['nullable', 'string', 'max:50'],
'sub_event_label' => ['nullable', 'string', 'max:50'],
];
}
}

4
api/app/Http/Requests/Api/V1/UpdateEventRequest.php
View File

@@ -23,6 +23,10 @@ final class UpdateEventRequest extends FormRequest
'end_date' => ['sometimes', 'date', 'after_or_equal:start_date'],
'timezone' => ['sometimes', 'string', 'max:50'],
'status' => ['sometimes', 'string', 'in:draft,published,registration_open,buildup,showday,teardown,closed'],
'parent_event_id' => ['nullable', 'ulid', 'exists:events,id'],
'event_type' => ['sometimes', 'in:event,festival,series'],
'event_type_label' => ['nullable', 'string', 'max:50'],
'sub_event_label' => ['nullable', 'string', 'max:50'],
];
}
}

12
api/app/Http/Resources/Api/V1/EventResource.php
View File

@@ -14,15 +14,27 @@ final class EventResource extends JsonResource
return [
'id' => $this->id,
'organisation_id' => $this->organisation_id,
'parent_event_id' => $this->parent_event_id,
'name' => $this->name,
'slug' => $this->slug,
'start_date' => $this->start_date->toDateString(),
'end_date' => $this->end_date->toDateString(),
'timezone' => $this->timezone,
'status' => $this->status,
'event_type' => $this->event_type,
'event_type_label' => $this->event_type_label,
'sub_event_label' => $this->sub_event_label,
'is_recurring' => $this->is_recurring,
'is_festival' => $this->resource->isFestival(),
'is_sub_event' => $this->resource->isSubEvent(),
'is_flat_event' => $this->resource->isFlatEvent(),
'has_children' => $this->resource->hasChildren(),
'created_at' => $this->created_at->toIso8601String(),
'updated_at' => $this->updated_at->toIso8601String(),
'children_count' => $this->whenCounted('children'),
'organisation' => new OrganisationResource($this->whenLoaded('organisation')),
'parent' => new EventResource($this->whenLoaded('parent')),
'children' => EventResource::collection($this->whenLoaded('children')),
];
}
}

28
api/database/factories/EventFactory.php
View File

@@ -27,6 +27,7 @@ final class EventFactory extends Factory
'end_date' => fake()->dateTimeBetween($startDate, (clone $startDate)->modify('+3 days')),
'timezone' => 'Europe/Amsterdam',
'status' => 'draft',
'event_type' => 'event',
];
}
@@ -34,4 +35,31 @@ final class EventFactory extends Factory
{
return $this->state(fn () => ['status' => 'published']);
}
public function festival(): static
{
return $this->state(fn () => [
'event_type' => 'festival',
'event_type_label' => 'Festival',
'sub_event_label' => 'Dag',
]);
}
public function series(): static
{
return $this->state(fn () => [
'event_type' => 'series',
'event_type_label' => 'Serie',
'sub_event_label' => 'Editie',
]);
}
public function subEvent(Event $parent): static
{
return $this->state(fn () => [
'parent_event_id' => $parent->id,
'organisation_id' => $parent->organisation_id,
'event_type' => 'event',
]);
}
}

1
api/routes/api.php
View File

@@ -55,6 +55,7 @@ Route::middleware('auth:sanctum')->group(function () {
// Events (nested under organisations)
Route::apiResource('organisations.events', EventController::class)
->only(['index', 'show', 'store', 'update']);
Route::get('organisations/{organisation}/events/{event}/children', [EventController::class, 'children']);
// Organisation-scoped resources
Route::prefix('organisations/{organisation}')->group(function () {

234
api/tests/Feature/Event/FestivalEventTest.php Normal file
View File

@@ -0,0 +1,234 @@
<?php
declare(strict_types=1);
namespace Tests\Feature\Event;
use App\Models\Event;
use App\Models\Organisation;
use App\Models\User;
use Database\Seeders\RoleSeeder;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Sanctum\Sanctum;
use Tests\TestCase;
class FestivalEventTest extends TestCase
{
use RefreshDatabase;
private User $orgAdmin;
private Organisation $organisation;
protected function setUp(): void
{
parent::setUp();
$this->seed(RoleSeeder::class);
$this->organisation = Organisation::factory()->create();
$this->orgAdmin = User::factory()->create();
$this->organisation->users()->attach($this->orgAdmin, ['role' => 'org_admin']);
}
// --- INDEX: top-level only ---
public function test_index_shows_only_top_level_events(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Event::factory()->subEvent($festival)->create();
Event::factory()->create(['organisation_id' => $this->organisation->id]);
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events");
$response->assertOk();
$this->assertCount(2, $response->json('data'));
$ids = collect($response->json('data'))->pluck('parent_event_id');
$this->assertTrue($ids->every(fn ($v) => $v === null));
}
// --- INDEX: include_children ---
public function test_index_with_include_children_shows_nested_children(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Event::factory()->subEvent($festival)->count(2)->create();
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events?include_children=true");
$response->assertOk();
$this->assertCount(1, $response->json('data'));
$this->assertCount(2, $response->json('data.0.children'));
}
// --- INDEX: type filter ---
public function test_index_type_filter_works(): void
{
Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Event::factory()->create(['organisation_id' => $this->organisation->id]);
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events?type=festival");
$response->assertOk();
$this->assertCount(1, $response->json('data'));
$this->assertEquals('festival', $response->json('data.0.event_type'));
}
// --- STORE: sub-event ---
public function test_store_with_parent_event_id_creates_sub_event(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Sanctum::actingAs($this->orgAdmin);
$response = $this->postJson("/api/v1/organisations/{$this->organisation->id}/events", [
'name' => 'Dag 1',
'slug' => 'dag-1',
'start_date' => '2026-07-01',
'end_date' => '2026-07-01',
'parent_event_id' => $festival->id,
]);
$response->assertCreated();
$this->assertEquals($festival->id, $response->json('data.parent_event_id'));
$this->assertTrue($response->json('data.is_sub_event'));
}
// --- STORE: sub-event cross-org → 422 ---
public function test_store_sub_event_of_other_org_returns_422(): void
{
$otherOrg = Organisation::factory()->create();
$otherEvent = Event::factory()->festival()->create([
'organisation_id' => $otherOrg->id,
]);
Sanctum::actingAs($this->orgAdmin);
$response = $this->postJson("/api/v1/organisations/{$this->organisation->id}/events", [
'name' => 'Cross-org sub',
'slug' => 'cross-org-sub',
'start_date' => '2026-07-01',
'end_date' => '2026-07-01',
'parent_event_id' => $otherEvent->id,
]);
$response->assertStatus(422);
}
// --- CHILDREN endpoint ---
public function test_children_endpoint_returns_sub_events(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Event::factory()->subEvent($festival)->count(3)->create();
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events/{$festival->id}/children");
$response->assertOk();
$this->assertCount(3, $response->json('data'));
}
public function test_children_of_flat_event_returns_empty_list(): void
{
$event = Event::factory()->create([
'organisation_id' => $this->organisation->id,
]);
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events/{$event->id}/children");
$response->assertOk();
$this->assertCount(0, $response->json('data'));
}
// --- SHOW: festival with children ---
public function test_show_festival_contains_children(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
Event::factory()->subEvent($festival)->count(2)->create();
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events/{$festival->id}");
$response->assertOk();
$this->assertCount(2, $response->json('data.children'));
$this->assertEquals(2, $response->json('data.children_count'));
}
// --- SHOW: sub-event with parent ---
public function test_show_sub_event_contains_parent(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
$subEvent = Event::factory()->subEvent($festival)->create();
Sanctum::actingAs($this->orgAdmin);
$response = $this->getJson("/api/v1/organisations/{$this->organisation->id}/events/{$subEvent->id}");
$response->assertOk();
$this->assertEquals($festival->id, $response->json('data.parent.id'));
}
// --- Helper methods ---
public function test_is_festival_helper(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
$this->assertTrue($festival->isFestival());
$this->assertFalse($festival->isSubEvent());
}
public function test_is_sub_event_helper(): void
{
$festival = Event::factory()->festival()->create([
'organisation_id' => $this->organisation->id,
]);
$subEvent = Event::factory()->subEvent($festival)->create();
$this->assertTrue($subEvent->isSubEvent());
$this->assertFalse($subEvent->isFestival());
}
public function test_is_flat_event_helper(): void
{
$event = Event::factory()->create([
'organisation_id' => $this->organisation->id,
]);
$this->assertTrue($event->isFlatEvent());
$this->assertFalse($event->isFestival());
$this->assertFalse($event->isSubEvent());
}
}