diff --git a/api/app/Exceptions/Artist/CrossTenantEngagementException.php b/api/app/Exceptions/Artist/CrossTenantEngagementException.php new file mode 100644 index 00000000..bf98e3ff --- /dev/null +++ b/api/app/Exceptions/Artist/CrossTenantEngagementException.php @@ -0,0 +1,29 @@ +artist_id ?? 'null', + $engagement->artist?->organisation_id ?? 'null', + $engagement->event_id ?? 'null', + $engagement->event?->organisation_id ?? 'null', + )); + } +} diff --git a/api/app/Observers/ArtistEngagementObserver.php b/api/app/Observers/ArtistEngagementObserver.php new file mode 100644 index 00000000..43a3995d --- /dev/null +++ b/api/app/Observers/ArtistEngagementObserver.php @@ -0,0 +1,61 @@ +artist()->withoutGlobalScope(OrganisationScope::class)->first(); + $event = $engagement->event()->withoutGlobalScope(OrganisationScope::class)->first(); + + if ($artist === null || $event === null) { + return; + } + + if ($engagement->organisation_id === null) { + $engagement->organisation_id = $artist->organisation_id; + } + + if ($artist->organisation_id !== $event->organisation_id) { + $engagement->setRelation('artist', $artist); + $engagement->setRelation('event', $event); + throw CrossTenantEngagementException::forEngagement($engagement); + } + } + + /** + * Reserved for Session 2 state-machine validation when + * `booking_status` transitions land. No-op for now. + */ + public function saving(ArtistEngagement $engagement): void + { + // intentionally empty — see class docblock + } + + public function deleted(ArtistEngagement $engagement): void + { + if (! $engagement->isForceDeleting() && $engagement->trashed()) { + $engagement->performances()->delete(); + $engagement->advanceSections()->delete(); + } + } +} diff --git a/api/app/Observers/PerformanceObserver.php b/api/app/Observers/PerformanceObserver.php new file mode 100644 index 00000000..cc3249d1 --- /dev/null +++ b/api/app/Observers/PerformanceObserver.php @@ -0,0 +1,25 @@ +exists && $performance->isDirty()) { + $performance->version = (int) $performance->version + 1; + } + } +} diff --git a/api/app/Providers/AppServiceProvider.php b/api/app/Providers/AppServiceProvider.php index a0718ada..0aaf16ad 100644 --- a/api/app/Providers/AppServiceProvider.php +++ b/api/app/Providers/AppServiceProvider.php @@ -163,6 +163,11 @@ class AppServiceProvider extends ServiceProvider FormField::observe(FormFieldChildTablesCascadeObserver::class); FormFieldLibrary::observe(FormFieldChildTablesCascadeObserver::class); + // RFC-TIMETABLE v0.2 — engagement denorm + cross-tenant guard, + // performance optimistic-lock bump. + \App\Models\ArtistEngagement::observe(\App\Observers\ArtistEngagementObserver::class); + \App\Models\Performance::observe(\App\Observers\PerformanceObserver::class); + // RFC-WS-6 v1.3 §Q1 — FormSubmissionSubmitted listener layout. // // SYNC chain (single listener):