Closes the WS-5 family follow-up tracked as
FORM-BUILDER-MORPH-SCOPE-BASE-CLASS in BACKLOG.md. Per addendum
§Q3 Uitvoering across WS-5a/b/c/d, base-class extraction was
deliberately deferred until all four concrete morph-scope siblings
existed and the "what actually varies" question could be answered
empirically.
The answer is: nothing. All four siblings —
FormFieldBindingScope (WS-5a), FormFieldValidationRuleScope (WS-5b),
FormFieldConfigScope (WS-5b commit 5), and FormFieldOptionScope
(WS-5d) — are byte-equal in their apply() and resolveOrganisationId()
methods (Phase A diff verification clean: zero lines diverging
across all three pairwise comparisons).
Approach:
- New abstract class FormFieldChildTableMorphScope holds the full
UNION-over-two-owner-chains scope logic with the morph alias
literals extracted as private constants
(OWNER_TYPE_FIELD, OWNER_TYPE_LIBRARY) for one-location-of-truth.
- The four concrete scopes become marker subclasses
(`final class X extends FormFieldChildTableMorphScope {}`) — class
identity preserved so every existing
`withoutGlobalScope(FormFieldXScope::class)` call site in cascade
observers, backfill migrations, and platform super_admin paths
continues to work unchanged. The 4 test call sites (in the four
*ScopeTest classes) work without modification.
- Helper visibility stays `private` per YAGNI. If a future sibling
needs to vary the morph aliases or owner-chain, the helpers
promote to `protected` at that point.
- Stylistic refinement vs. the four originals: `Organisation` and
`Event` in resolveOrganisationId() now use `use` statements at
the top of the file instead of inline `\App\Models\…` FQNs.
Net diff:
Pre: 4 concrete scope files at ~106 lines each (~424 lines total)
Post: 4 marker subclasses at 20 lines (80 total) +
1 abstract base at 125 lines = 205 lines total
Saving: ~219 lines of duplication removed.
Tests: 1208 passed (3260 assertions) → 1208 passed (3260 assertions).
Identical — public behaviour unchanged.
Larastan: clean (no new errors beyond baseline).
Rector: 357 → 355 dry-run suggestions (small reduction from the
deduplication; no apply in this commit).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
126 lines
4.0 KiB
PHP
126 lines
4.0 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Models\Scopes;
|
|
|
|
use App\Models\Event;
|
|
use App\Models\FormBuilder\FormField;
|
|
use App\Models\FormBuilder\FormFieldLibrary;
|
|
use App\Models\FormBuilder\FormSchema;
|
|
use App\Models\Organisation;
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Database\Eloquent\Scope;
|
|
|
|
/**
|
|
* Shared base for the four polymorphic morph-scope siblings on the
|
|
* form-field child tables (form_field_bindings,
|
|
* form_field_validation_rules, form_field_configs, form_field_options).
|
|
*
|
|
* Each child table holds rows owned via (owner_type, owner_id) where
|
|
* owner_type ∈ {form_field, form_field_library}. This scope enforces
|
|
* organisation-tenancy on those rows by resolving the request's
|
|
* organisation context and constraining the visible rows to:
|
|
*
|
|
* owner_id ∈ (
|
|
* SELECT id FROM form_fields
|
|
* WHERE form_schema_id ∈ (
|
|
* SELECT id FROM form_schemas WHERE organisation_id = ?
|
|
* )
|
|
* UNION
|
|
* SELECT id FROM form_field_library
|
|
* WHERE organisation_id = ?
|
|
* )
|
|
*
|
|
* Concrete subclasses are marker classes — they exist solely to preserve
|
|
* class identity for `Model::withoutGlobalScope(SubclassName::class)`
|
|
* call sites in cascade observers, backfill migrations, and platform
|
|
* super_admin escape paths.
|
|
*
|
|
* If a future sibling needs to vary the morph aliases or the
|
|
* owner-chain, the relevant private helpers can be promoted to
|
|
* protected and overridden — but YAGNI applies until that need
|
|
* concretely materialises.
|
|
*
|
|
* Background: addendum §Q3 WS-5a/b/c/d Uitvoering tracked the
|
|
* extraction-deferral discipline ("premature abstraction from N is
|
|
* still premature when sibling N+1 is about to land"). All four
|
|
* concrete implementations exist; this class is the answer to
|
|
* "what actually varies" — nothing.
|
|
*/
|
|
abstract class FormFieldChildTableMorphScope implements Scope
|
|
{
|
|
private const OWNER_TYPE_FIELD = 'form_field';
|
|
private const OWNER_TYPE_LIBRARY = 'form_field_library';
|
|
|
|
public function __construct(
|
|
private readonly ?string $organisationId = null,
|
|
) {}
|
|
|
|
public function apply(Builder $builder, Model $model): void
|
|
{
|
|
$orgId = $this->resolveOrganisationId();
|
|
if ($orgId === null) {
|
|
return;
|
|
}
|
|
|
|
$fieldIds = FormField::query()
|
|
->withoutGlobalScope(OrganisationScope::class)
|
|
->whereIn(
|
|
'form_schema_id',
|
|
FormSchema::query()
|
|
->withoutGlobalScope(OrganisationScope::class)
|
|
->where('organisation_id', $orgId)
|
|
->select('id'),
|
|
)
|
|
->select('id');
|
|
|
|
$libraryIds = FormFieldLibrary::query()
|
|
->withoutGlobalScope(OrganisationScope::class)
|
|
->where('organisation_id', $orgId)
|
|
->select('id');
|
|
|
|
$table = $model->getTable();
|
|
|
|
$builder->where(function (Builder $outer) use ($table, $fieldIds, $libraryIds): void {
|
|
$outer->where(function (Builder $q) use ($table, $fieldIds): void {
|
|
$q->where("$table.owner_type", self::OWNER_TYPE_FIELD)
|
|
->whereIn("$table.owner_id", $fieldIds);
|
|
})->orWhere(function (Builder $q) use ($table, $libraryIds): void {
|
|
$q->where("$table.owner_type", self::OWNER_TYPE_LIBRARY)
|
|
->whereIn("$table.owner_id", $libraryIds);
|
|
});
|
|
});
|
|
}
|
|
|
|
private function resolveOrganisationId(): ?string
|
|
{
|
|
if ($this->organisationId !== null) {
|
|
return $this->organisationId;
|
|
}
|
|
|
|
$route = request()->route();
|
|
if ($route === null) {
|
|
return null;
|
|
}
|
|
|
|
$org = $route->parameter('organisation');
|
|
|
|
if ($org instanceof Organisation) {
|
|
return $org->id;
|
|
}
|
|
|
|
if (is_string($org) && $org !== '') {
|
|
return $org;
|
|
}
|
|
|
|
$event = $route->parameter('event');
|
|
if ($event instanceof Event) {
|
|
return $event->organisation_id;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|