feat(timetable): six artist-domain controllers + RFC §6 routes

Six thin controllers under app/Http/Controllers/Api/V1/Artist/. Zero
business logic: every mutation routes through a service from
app/Services/Artist/. Authorization via Gate::authorize matching
PersonController convention (request authorize() returns true; gates
fire in the controller).

  ArtistController          — org-scoped CRUD + restore. Catches
                              DuplicateArtistException → 409 with
                              duplicate_artist_id so the dialog can
                              offer "use existing".
  GenreController           — org-scoped CRUD; catches GenreInUseException
                              → 409 with referencing_artists_count.
  ArtistEngagementController — event-scoped CRUD; catches
                              InvalidStatusTransitionException → 422
                              with a Dutch-readable message.
  StageController           — event-scoped CRUD + reorder + replaceDays;
                              catches StageDaysOrphanedPerformancesException
                              → 409 with the orphaned performance ids
                              and the removed event ids per RFC §10.5.
                              destroy returns the parked performance
                              count (cascade-park).
  PerformanceController     — event-scoped CRUD with index filters
                              `?day={subevent}` and `?stage_id=null`
                              (wachtrij). update is non-placement only.
  TimetableMoveController   — single __invoke for POST /timetable/move.
                              Catches VersionMismatchException → 409
                              with current_version + server_data per
                              RFC D14.

Routes wired into api/routes/api.php nested under the existing
organisations/{organisation}/events/{event} prefix group, matching
PersonController and ShiftController structure. The move endpoint
gets the new `idempotency.60s` middleware alias for R1. `stages/order`
and `stages/{stage}/days` registered before the apiResource so the
literal path wins over the wildcard.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-08 20:56:43 +02:00
parent 546f121ee8
commit 32da6b656d
7 changed files with 635 additions and 0 deletions

View File

@@ -0,0 +1,109 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Exceptions\Artist\DuplicateArtistException;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\CreateArtistRequest;
use App\Http\Requests\Api\V1\Artist\UpdateArtistRequest;
use App\Http\Resources\Api\V1\Artist\ArtistResource;
use App\Models\Artist;
use App\Models\Organisation;
use App\Services\Artist\ArtistService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class ArtistController extends Controller
{
public function __construct(
private readonly ArtistService $service,
) {}
public function index(Request $request, Organisation $organisation): AnonymousResourceCollection
{
Gate::authorize('viewAny', [Artist::class, $organisation]);
$query = Artist::query()
->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()));
}
}

View File

@@ -0,0 +1,117 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Exceptions\Artist\InvalidStatusTransitionException;
use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\CreateArtistEngagementRequest;
use App\Http\Requests\Api\V1\Artist\UpdateArtistEngagementRequest;
use App\Http\Resources\Api\V1\Artist\ArtistEngagementResource;
use App\Models\Artist;
use App\Models\ArtistEngagement;
use App\Models\Event;
use App\Models\Organisation;
use App\Services\Artist\ArtistEngagementService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class ArtistEngagementController extends Controller
{
use VerifiesOrganisationEvent;
public function __construct(
private readonly ArtistEngagementService $service,
) {}
public function index(Request $request, Organisation $organisation, Event $event): AnonymousResourceCollection
{
$this->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);
}
}

View File

@@ -0,0 +1,70 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Exceptions\Artist\GenreInUseException;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\CreateGenreRequest;
use App\Http\Requests\Api\V1\Artist\UpdateGenreRequest;
use App\Http\Resources\Api\V1\Artist\GenreResource;
use App\Models\Genre;
use App\Models\Organisation;
use App\Services\Artist\GenreService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class GenreController extends Controller
{
public function __construct(
private readonly GenreService $service,
) {}
public function index(Organisation $organisation): AnonymousResourceCollection
{
Gate::authorize('viewAny', [Genre::class, $organisation]);
$genres = Genre::query()
->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);
}
}

View File

@@ -0,0 +1,102 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\CreatePerformanceRequest;
use App\Http\Requests\Api\V1\Artist\UpdatePerformanceRequest;
use App\Http\Resources\Api\V1\Artist\PerformanceResource;
use App\Models\ArtistEngagement;
use App\Models\Event;
use App\Models\Organisation;
use App\Models\Performance;
use App\Services\Artist\PerformanceService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class PerformanceController extends Controller
{
use VerifiesOrganisationEvent;
public function __construct(
private readonly PerformanceService $service,
) {}
public function index(Request $request, Organisation $organisation, Event $event): AnonymousResourceCollection
{
$this->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);
}
}

View File

@@ -0,0 +1,131 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Exceptions\Artist\StageDaysOrphanedPerformancesException;
use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\CreateStageRequest;
use App\Http\Requests\Api\V1\Artist\ReorderStagesRequest;
use App\Http\Requests\Api\V1\Artist\ReplaceStageDaysRequest;
use App\Http\Requests\Api\V1\Artist\UpdateStageRequest;
use App\Http\Resources\Api\V1\Artist\StageResource;
use App\Models\Event;
use App\Models\Organisation;
use App\Models\Stage;
use App\Services\Artist\StageDayService;
use App\Services\Artist\StageService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
use Illuminate\Support\Facades\Gate;
final class StageController extends Controller
{
use VerifiesOrganisationEvent;
public function __construct(
private readonly StageService $stageService,
private readonly StageDayService $stageDayService,
) {}
public function index(Organisation $organisation, Event $event): AnonymousResourceCollection
{
$this->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'],
]);
}
}

View File

@@ -0,0 +1,83 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Api\V1\Artist;
use App\Exceptions\Artist\VersionMismatchException;
use App\Http\Controllers\Api\V1\Traits\VerifiesOrganisationEvent;
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\V1\Artist\MoveTimetablePerformanceRequest;
use App\Http\Resources\Api\V1\Artist\PerformanceResource;
use App\Models\Event;
use App\Models\Organisation;
use App\Models\Performance;
use App\Models\Stage;
use App\Services\Artist\LaneCascadeService;
use Carbon\CarbonImmutable;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Gate;
final class TimetableMoveController extends Controller
{
use VerifiesOrganisationEvent;
public function __construct(
private readonly LaneCascadeService $service,
) {}
public function __invoke(
MoveTimetablePerformanceRequest $request,
Organisation $organisation,
Event $event,
): JsonResponse {
$this->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']),
),
]);
}
}

View File

@@ -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