diff --git a/api/app/Http/Controllers/Api/V1/Artist/ArtistController.php b/api/app/Http/Controllers/Api/V1/Artist/ArtistController.php new file mode 100644 index 00000000..702b33c3 --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/ArtistController.php @@ -0,0 +1,109 @@ +where('organisation_id', $organisation->id) + ->with(['defaultGenre', 'agentCompany']); + + if ($request->boolean('with_trashed')) { + $query->withTrashed(); + } + if ($request->boolean('trashed_only')) { + $query->onlyTrashed(); + } + + if ($request->filled('search')) { + $term = '%'.$request->string('search').'%'; + $query->where(function ($q) use ($term): void { + $q->where('name', 'like', $term)->orWhere('slug', 'like', $term); + }); + } + if ($request->filled('genre_id')) { + $query->where('default_genre_id', $request->string('genre_id')); + } + if ($request->filled('agent_company_id')) { + $query->where('agent_company_id', $request->string('agent_company_id')); + } + + return ArtistResource::collection($query->orderBy('name')->paginate(50)); + } + + public function show(Organisation $organisation, Artist $artist): JsonResponse + { + Gate::authorize('view', $artist); + $artist->loadMissing(['defaultGenre', 'agentCompany', 'contacts']); + + return $this->success(ArtistResource::make($artist)); + } + + public function store(CreateArtistRequest $request, Organisation $organisation): JsonResponse + { + Gate::authorize('create', [Artist::class, $organisation]); + + try { + $artist = $this->service->create($organisation, $request->validated()); + } catch (DuplicateArtistException $e) { + return $this->error('Duplicate artist name.', 409, [ + 'duplicate_artist_id' => $e->existing->id, + ]); + } + + return $this->created(ArtistResource::make($artist->load(['defaultGenre', 'agentCompany']))); + } + + public function update(UpdateArtistRequest $request, Organisation $organisation, Artist $artist): JsonResponse + { + Gate::authorize('update', $artist); + + $artist = $this->service->update($artist, $request->validated()); + + return $this->success(ArtistResource::make($artist->load(['defaultGenre', 'agentCompany']))); + } + + public function destroy(Organisation $organisation, Artist $artist): JsonResponse + { + if (! Gate::check('delete', $artist)) { + return $this->forbidden('Cannot delete artist with active engagements.'); + } + + $this->service->softDelete($artist); + + return response()->json(null, 204); + } + + public function restore(Organisation $organisation, string $artist): JsonResponse + { + $model = Artist::withTrashed()->findOrFail($artist); + Gate::authorize('restore', $model); + + $this->service->restore($model); + + return $this->success(ArtistResource::make($model->fresh())); + } +} diff --git a/api/app/Http/Controllers/Api/V1/Artist/ArtistEngagementController.php b/api/app/Http/Controllers/Api/V1/Artist/ArtistEngagementController.php new file mode 100644 index 00000000..7da09ffc --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/ArtistEngagementController.php @@ -0,0 +1,117 @@ +verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('viewAny', [ArtistEngagement::class, $event]); + + $query = ArtistEngagement::query() + ->where('event_id', $event->id) + ->with(['artist.defaultGenre', 'projectLeader']); + + if ($request->filled('status')) { + $query->where('booking_status', $request->string('status')); + } + if ($request->filled('search')) { + $term = '%'.$request->string('search').'%'; + $query->whereHas('artist', fn ($q) => $q->where('name', 'like', $term)); + } + + return ArtistEngagementResource::collection( + $query->orderBy('created_at', 'desc')->paginate(50), + ); + } + + public function show(Organisation $organisation, Event $event, ArtistEngagement $engagement): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('view', [$engagement, $event]); + + $engagement->loadMissing([ + 'artist.defaultGenre', 'artist.agentCompany', 'artist.contacts', + 'projectLeader', 'performances.stage', + ]); + + return $this->success(ArtistEngagementResource::make($engagement)); + } + + public function store(CreateArtistEngagementRequest $request, Organisation $organisation, Event $event): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('create', [ArtistEngagement::class, $event]); + + $data = $request->validated(); + $artist = Artist::query()->findOrFail($data['artist_id']); + + try { + $engagement = $this->service->create($event, $artist, $data); + } catch (InvalidStatusTransitionException $e) { + return $this->error($e->getMessage(), 422); + } + + return $this->created( + ArtistEngagementResource::make($engagement->load(['artist.defaultGenre', 'projectLeader'])), + ); + } + + public function update( + UpdateArtistEngagementRequest $request, + Organisation $organisation, + Event $event, + ArtistEngagement $engagement, + ): JsonResponse { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('update', [$engagement, $event]); + + try { + $engagement = $this->service->update($engagement, $request->validated()); + } catch (InvalidStatusTransitionException $e) { + return $this->error($e->getMessage(), 422); + } + + return $this->success( + ArtistEngagementResource::make($engagement->load(['artist.defaultGenre', 'projectLeader'])), + ); + } + + public function destroy( + Organisation $organisation, + Event $event, + ArtistEngagement $engagement, + ): JsonResponse { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('delete', [$engagement, $event]); + + $this->service->softDelete($engagement); + + return response()->json(null, 204); + } +} diff --git a/api/app/Http/Controllers/Api/V1/Artist/GenreController.php b/api/app/Http/Controllers/Api/V1/Artist/GenreController.php new file mode 100644 index 00000000..72d7e23d --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/GenreController.php @@ -0,0 +1,70 @@ +where('organisation_id', $organisation->id) + ->orderBy('sort_order') + ->orderBy('name') + ->get(); + + return GenreResource::collection($genres); + } + + public function store(CreateGenreRequest $request, Organisation $organisation): JsonResponse + { + Gate::authorize('create', [Genre::class, $organisation]); + + $genre = $this->service->create($organisation, $request->validated()); + + return $this->created(GenreResource::make($genre)); + } + + public function update(UpdateGenreRequest $request, Organisation $organisation, Genre $genre): JsonResponse + { + Gate::authorize('update', $genre); + + $genre = $this->service->update($genre, $request->validated()); + + return $this->success(GenreResource::make($genre)); + } + + public function destroy(Organisation $organisation, Genre $genre): JsonResponse + { + Gate::authorize('delete', $genre); + + try { + $this->service->delete($genre); + } catch (GenreInUseException $e) { + return $this->error($e->getMessage(), 409, [ + 'referencing_artists_count' => $e->referencingArtistsCount, + ]); + } + + return response()->json(null, 204); + } +} diff --git a/api/app/Http/Controllers/Api/V1/Artist/PerformanceController.php b/api/app/Http/Controllers/Api/V1/Artist/PerformanceController.php new file mode 100644 index 00000000..15501e63 --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/PerformanceController.php @@ -0,0 +1,102 @@ +verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('viewAny', [Performance::class, $event]); + + $query = Performance::query() + ->whereHas('engagement', fn ($q) => $q->where('event_id', $event->id)) + ->with(['engagement.artist.defaultGenre', 'stage']); + + if ($request->filled('day')) { + $query->where('event_id', $request->string('day')); + } + if ($request->query('stage_id') === 'null') { + $query->whereNull('stage_id'); + } elseif ($request->filled('stage_id')) { + $query->where('stage_id', $request->string('stage_id')); + } + + return PerformanceResource::collection($query->orderBy('start_at')->get()); + } + + public function show(Organisation $organisation, Event $event, Performance $performance): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('view', [$performance, $event]); + + $performance->loadMissing(['engagement.artist.defaultGenre', 'stage']); + + return $this->success(PerformanceResource::make($performance)); + } + + public function store(CreatePerformanceRequest $request, Organisation $organisation, Event $event): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('create', [Performance::class, $event]); + + $data = $request->validated(); + $engagement = ArtistEngagement::query()->findOrFail($data['engagement_id']); + + $performance = $this->service->create($engagement, $data); + + return $this->created( + PerformanceResource::make($performance->load(['engagement.artist.defaultGenre', 'stage'])), + ); + } + + public function update( + UpdatePerformanceRequest $request, + Organisation $organisation, + Event $event, + Performance $performance, + ): JsonResponse { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('update', [$performance, $event]); + + $performance = $this->service->update($performance, $request->validated()); + + return $this->success(PerformanceResource::make($performance)); + } + + public function destroy( + Organisation $organisation, + Event $event, + Performance $performance, + ): JsonResponse { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('delete', [$performance, $event]); + + $this->service->delete($performance); + + return response()->json(null, 204); + } +} diff --git a/api/app/Http/Controllers/Api/V1/Artist/StageController.php b/api/app/Http/Controllers/Api/V1/Artist/StageController.php new file mode 100644 index 00000000..3bd4530d --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/StageController.php @@ -0,0 +1,131 @@ +verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('viewAny', [Stage::class, $event]); + + $stages = Stage::query() + ->where('event_id', $event->id) + ->with('stageDays') + ->ordered() + ->get(); + + return StageResource::collection($stages); + } + + public function show(Organisation $organisation, Event $event, Stage $stage): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('view', [$stage, $event]); + + $stage->loadMissing('stageDays'); + + return $this->success(StageResource::make($stage)); + } + + public function store(CreateStageRequest $request, Organisation $organisation, Event $event): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('create', [Stage::class, $event]); + + $stage = $this->stageService->create($event, $request->validated()); + + return $this->created(StageResource::make($stage)); + } + + public function update(UpdateStageRequest $request, Organisation $organisation, Event $event, Stage $stage): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('update', [$stage, $event]); + + $stage = $this->stageService->update($stage, $request->validated()); + + return $this->success(StageResource::make($stage)); + } + + public function destroy(Organisation $organisation, Event $event, Stage $stage): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('delete', [$stage, $event]); + + $parkedCount = $this->stageService->delete($stage); + + return response()->json(['parked_performances' => $parkedCount], 200); + } + + public function reorder(ReorderStagesRequest $request, Organisation $organisation, Event $event): JsonResponse + { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('reorder', [Stage::class, $event]); + + $this->stageService->reorder($event, $request->validated('stage_ids')); + + $stages = Stage::query()->where('event_id', $event->id)->ordered()->get(); + + return $this->success(StageResource::collection($stages)); + } + + public function replaceDays( + ReplaceStageDaysRequest $request, + Organisation $organisation, + Event $event, + Stage $stage, + ): JsonResponse { + $this->verifyEventBelongsToOrganisation($organisation, $event); + Gate::authorize('update', [$stage, $event]); + + $forceOrphan = $request->boolean('force_orphan') + || $request->query('force_orphan') === 'true'; + + try { + $diff = $this->stageDayService->replaceDays( + $stage, + $request->validated('event_ids'), + $forceOrphan, + ); + } catch (StageDaysOrphanedPerformancesException $e) { + return $this->error('Removing day(s) would orphan scheduled performances.', 409, [ + 'conflict' => 'orphaned_performances', + 'performances_on_removed_events' => $e->performanceIds, + 'removed_event_ids' => $e->removedEventIds, + ]); + } + + return $this->success([ + 'stage' => StageResource::make($stage->fresh()->load('stageDays')), + 'added_event_ids' => $diff['added'], + 'removed_event_ids' => $diff['removed'], + ]); + } +} diff --git a/api/app/Http/Controllers/Api/V1/Artist/TimetableMoveController.php b/api/app/Http/Controllers/Api/V1/Artist/TimetableMoveController.php new file mode 100644 index 00000000..ad4616b4 --- /dev/null +++ b/api/app/Http/Controllers/Api/V1/Artist/TimetableMoveController.php @@ -0,0 +1,83 @@ +verifyEventBelongsToOrganisation($organisation, $event); + + $data = $request->validated(); + $performance = Performance::query()->findOrFail($data['performance_id']); + + Gate::authorize('move', [$performance, $event]); + + $targetStage = isset($data['target_stage_id']) + ? Stage::query()->find($data['target_stage_id']) + : null; + + $start = isset($data['target_start_at']) + ? CarbonImmutable::parse((string) $data['target_start_at']) + : null; + $end = isset($data['target_end_at']) + ? CarbonImmutable::parse((string) $data['target_end_at']) + : null; + + try { + $result = $this->service->move( + performance: $performance, + targetStage: $targetStage, + start: $start, + end: $end, + targetLane: isset($data['target_lane']) ? (int) $data['target_lane'] : null, + clientVersion: (int) $data['version'], + ); + } catch (VersionMismatchException $e) { + $performance->refresh(); + + return $this->error('Version mismatch — performance was modified by another request.', 409, [ + 'conflict' => 'version_mismatch', + 'current_version' => $e->currentVersion, + 'client_version' => $e->clientVersion, + 'server_data' => PerformanceResource::make( + $performance->load(['engagement.artist.defaultGenre', 'stage']), + )->toArray(request()), + ]); + } + + return $this->success([ + 'moved' => PerformanceResource::make( + $result->moved->load(['engagement.artist.defaultGenre', 'stage']), + ), + 'cascaded' => PerformanceResource::collection( + collect($result->cascaded)->each->load(['engagement.artist.defaultGenre', 'stage']), + ), + ]); + } +} diff --git a/api/routes/api.php b/api/routes/api.php index 412c70d1..f532ec5f 100644 --- a/api/routes/api.php +++ b/api/routes/api.php @@ -337,8 +337,31 @@ Route::middleware(['auth:sanctum', 'impersonation'])->group(function () { Route::get('crowd-lists/{crowdList}/persons', [CrowdListController::class, 'persons']); Route::post('crowd-lists/{crowdList}/persons', [CrowdListController::class, 'addPerson']); Route::delete('crowd-lists/{crowdList}/persons/{person}', [CrowdListController::class, 'removePerson']); + + // RFC-TIMETABLE v0.2 — artist domain (Session 2) + // Engagements + Route::apiResource('engagements', \App\Http\Controllers\Api\V1\Artist\ArtistEngagementController::class); + + // Stages — specific routes before {stage} wildcard + Route::post('stages/order', [\App\Http\Controllers\Api\V1\Artist\StageController::class, 'reorder']); + Route::put('stages/{stage}/days', [\App\Http\Controllers\Api\V1\Artist\StageController::class, 'replaceDays']); + Route::apiResource('stages', \App\Http\Controllers\Api\V1\Artist\StageController::class); + + // Performances + Route::apiResource('performances', \App\Http\Controllers\Api\V1\Artist\PerformanceController::class); + + // Timetable move (D18 — guarded by 60s Redis idempotency window per R1) + Route::post('timetable/move', \App\Http\Controllers\Api\V1\Artist\TimetableMoveController::class) + ->middleware('idempotency.60s'); }); + // RFC-TIMETABLE v0.2 — org-level artist resources (Session 2) + Route::apiResource('artists', \App\Http\Controllers\Api\V1\Artist\ArtistController::class); + Route::post('artists/{artist}/restore', [\App\Http\Controllers\Api\V1\Artist\ArtistController::class, 'restore']) + ->withTrashed(); + Route::apiResource('genres', \App\Http\Controllers\Api\V1\Artist\GenreController::class) + ->except(['show']); + // Form Builder (ARCH-FORM-BUILDER.md) Route::prefix('forms')->group(function (): void { // Filter registry