feat(form-builder): form_field_conditional_logic_{groups,conditions} tables + OrganisationScope cap raise to 5

WS-5c commit 1 of 4 — relational infrastructure for the conditional- logic tree that replaces form_fields.conditional_logic JSON (ARCH- FORM-BUILDER §8; addendum Q3 WS-5c). Tables: groups (nesting via parent_group_id) + conditions (leaves, value JSON nullable for empty/not_empty). Simple FK to form_fields — addendum Q3 explicitly excludes form_field_library from conditional_ logic scope, so no polymorphic morph here. OrganisationScope cap raised 3 → 5 hops. The conditions chain is 4 hops (condition → group → field → schema → organisation_id column) and the new cap gives headroom for future deeper trees without denormalising form_field_id onto conditions. Cascade observer (FormFieldChildTablesCascadeObserver) extended to physically delete the new groups table on FormField delete (hard or soft). Conditions cascade automatically via the group_id FK on the groups table. Factories: FormFieldConditionalLogicGroupFactory, FormFieldConditional LogicConditionFactory, and FormFieldFactory::withConditionalLogic($tree) for concise test fixtures. Tests: 16 new under tests/Feature/FormBuilder/ConditionalLogic/ (relation, scope, cascade, enum catalogue). 3 new scope-cap tests in ScopeLeakageTest verify 4/5-hop chains pass and 6-hop throws. Hardcoded rollback step counts in WS-5a/b migration tests bumped for the 2 new WS-5c migrations. Baseline 1104 → 1122 green (2988 → 3032 assertions). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-24 23:43:34 +02:00
parent 500e5704e2
commit 2064b9901e
21 changed files with 1140 additions and 62 deletions
--- a/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicCascadeTest.php
+++ b/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicCascadeTest.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\FormBuilder\ConditionalLogic;
+
+use App\Models\FormBuilder\FormField;
+use App\Models\FormBuilder\FormFieldConditionalLogicCondition;
+use App\Models\FormBuilder\FormFieldConditionalLogicGroup;
+use App\Models\FormBuilder\FormSchema;
+use App\Models\Organisation;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+final class FormFieldConditionalLogicCascadeTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_field_hard_delete_cascades_groups_and_conditions(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        $child = FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 0)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($root, 0)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($child, 0)->create();
+
+        $this->assertSame(2, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(2, FormFieldConditionalLogicCondition::query()->count());
+
+        // Hard delete via raw query bypasses SoftDeletes — exercises the
+        // DB-level `ON DELETE CASCADE` on `form_field_id`.
+        DB::table('form_fields')->where('id', $field->id)->delete();
+
+        $this->assertSame(0, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(0, FormFieldConditionalLogicCondition::query()->count());
+    }
+
+    public function test_field_soft_delete_cascades_via_observer(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($root, 0)->create();
+
+        $field->delete();
+
+        // Soft delete keeps the `form_fields` row (deleted_at set) but the
+        // cascade observer physically clears child rows — conditional-logic
+        // state is current state, not audit.
+        $this->assertNotNull($field->fresh()->deleted_at);
+        $this->assertSame(0, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(0, FormFieldConditionalLogicCondition::query()->count());
+    }
+
+    public function test_parent_group_delete_cascades_to_children_and_conditions(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        $child = FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 0)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($root, 0)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($child, 0)->create();
+
+        $this->assertSame(2, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(2, FormFieldConditionalLogicCondition::query()->count());
+
+        $root->delete();
+
+        $this->assertSame(0, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(0, FormFieldConditionalLogicCondition::query()->count());
+    }
+}
--- a/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicConditionRelationTest.php
+++ b/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicConditionRelationTest.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\FormBuilder\ConditionalLogic;
+
+use App\Enums\FormBuilder\FormFieldConditionalLogicConditionOperator;
+use App\Models\FormBuilder\FormField;
+use App\Models\FormBuilder\FormFieldConditionalLogicCondition;
+use App\Models\FormBuilder\FormFieldConditionalLogicGroup;
+use App\Models\FormBuilder\FormSchema;
+use App\Models\Organisation;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+final class FormFieldConditionalLogicConditionRelationTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_condition_belongs_to_group(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $group = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        $condition = FormFieldConditionalLogicCondition::factory()->inGroup($group)->create();
+
+        $this->assertSame($group->id, $condition->fresh()->group->id);
+    }
+
+    public function test_value_roundtrips_through_json_cast(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+        $group = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+
+        $stringValue = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::Equals, 'NL')
+            ->create();
+        $this->assertSame('NL', $stringValue->fresh()->value);
+
+        $arrayValue = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::In, ['a', 'b', 'c'])
+            ->create();
+        $this->assertSame(['a', 'b', 'c'], $arrayValue->fresh()->value);
+
+        $boolValue = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::Equals, true)
+            ->create();
+        $this->assertTrue($boolValue->fresh()->value);
+    }
+
+    public function test_valueless_operators_store_null(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+        $group = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+
+        $empty = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::Empty)
+            ->create();
+        $this->assertNull($empty->fresh()->value);
+
+        $notEmpty = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::NotEmpty)
+            ->create();
+        $this->assertNull($notEmpty->fresh()->value);
+    }
+
+    public function test_enum_catalogue_has_ten_operators(): void
+    {
+        // Parity check against ARCH §8 / Phase A seed-scan confirmed set.
+        $values = array_map(
+            fn (FormFieldConditionalLogicConditionOperator $case): string => $case->value,
+            FormFieldConditionalLogicConditionOperator::cases(),
+        );
+
+        sort($values);
+        $this->assertSame([
+            'contains',
+            'empty',
+            'equals',
+            'greater_than',
+            'in',
+            'less_than',
+            'not_contains',
+            'not_empty',
+            'not_equals',
+            'not_in',
+        ], $values);
+    }
+
+    public function test_field_slug_index_supports_reverse_lookup(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+        $group = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+
+        FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->forFieldSlug('gate')
+            ->create();
+        FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->forFieldSlug('region')
+            ->create();
+
+        $gateHits = FormFieldConditionalLogicCondition::query()
+            ->where('field_slug', 'gate')
+            ->count();
+        $this->assertSame(1, $gateHits);
+    }
+}
--- a/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicGroupRelationTest.php
+++ b/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicGroupRelationTest.php
@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\FormBuilder\ConditionalLogic;
+
+use App\Enums\FormBuilder\FormFieldConditionalLogicConditionOperator;
+use App\Enums\FormBuilder\FormFieldConditionalLogicGroupOperator;
+use App\Models\FormBuilder\FormField;
+use App\Models\FormBuilder\FormFieldConditionalLogicCondition;
+use App\Models\FormBuilder\FormFieldConditionalLogicGroup;
+use App\Models\FormBuilder\FormSchema;
+use App\Models\Organisation;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+final class FormFieldConditionalLogicGroupRelationTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_field_has_many_conditional_logic_groups(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()
+            ->forField($field)
+            ->withOperator(FormFieldConditionalLogicGroupOperator::All)
+            ->create();
+        FormFieldConditionalLogicGroup::factory()
+            ->nestedUnder($root, 0)
+            ->withOperator(FormFieldConditionalLogicGroupOperator::Any)
+            ->create();
+
+        $groups = $field->fresh()->conditionalLogicGroups;
+        $this->assertCount(2, $groups);
+    }
+
+    public function test_root_helper_returns_parentless_group(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 0)->create();
+        FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 1)->create();
+
+        $found = $field->fresh()->rootConditionalLogicGroup();
+        $this->assertNotNull($found);
+        $this->assertSame($root->id, $found->id);
+        $this->assertNull($found->parent_group_id);
+    }
+
+    public function test_group_relations_parent_and_children(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        $child1 = FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 0)->create();
+        $child2 = FormFieldConditionalLogicGroup::factory()->nestedUnder($root, 1)->create();
+
+        $this->assertSame($root->id, $child1->fresh()->parentGroup->id);
+        $childIds = $root->fresh()->childGroups->pluck('id')->sort()->values()->all();
+        $this->assertSame(collect([$child1->id, $child2->id])->sort()->values()->all(), $childIds);
+    }
+
+    public function test_group_has_many_conditions(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $group = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($group, 0)->create();
+        FormFieldConditionalLogicCondition::factory()->inGroup($group, 1)->create();
+
+        $this->assertCount(2, $group->fresh()->conditions);
+    }
+
+    public function test_operator_enum_casts_roundtrip(): void
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $group = FormFieldConditionalLogicGroup::factory()
+            ->forField($field)
+            ->withOperator(FormFieldConditionalLogicGroupOperator::Any)
+            ->create();
+
+        $fresh = $group->fresh();
+        $this->assertSame(FormFieldConditionalLogicGroupOperator::Any, $fresh->operator);
+
+        $condition = FormFieldConditionalLogicCondition::factory()
+            ->inGroup($group)
+            ->withOperator(FormFieldConditionalLogicConditionOperator::GreaterThan, 18)
+            ->create();
+
+        $this->assertSame(
+            FormFieldConditionalLogicConditionOperator::GreaterThan,
+            $condition->fresh()->comparison_operator,
+        );
+        $this->assertSame(18, $condition->fresh()->value);
+    }
+}
--- a/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicScopeTest.php
+++ b/api/tests/Feature/FormBuilder/ConditionalLogic/FormFieldConditionalLogicScopeTest.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\FormBuilder\ConditionalLogic;
+
+use App\Models\FormBuilder\FormField;
+use App\Models\FormBuilder\FormFieldConditionalLogicCondition;
+use App\Models\FormBuilder\FormFieldConditionalLogicGroup;
+use App\Models\FormBuilder\FormSchema;
+use App\Models\Organisation;
+use App\Models\Scopes\OrganisationScope;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Routing\Route;
+use Tests\TestCase;
+
+/**
+ * Verifies that the OrganisationScope FK-chain resolver (Q2 declarative
+ * strategy) keeps groups AND conditions tenant-isolated. Groups resolve
+ * at 3 hops (group → field → schema → organisation_id); conditions at 4
+ * (condition → group → field → schema → organisation_id). The latter
+ * only fits after WS-5c raised the cap from 3 to 5.
+ */
+final class FormFieldConditionalLogicScopeTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_scope_isolates_groups_per_organisation(): void
+    {
+        [$orgA, $fieldA] = $this->seedOrgWithLogic();
+        [$orgB, $fieldB] = $this->seedOrgWithLogic();
+
+        $this->withOrgRoute($orgA);
+        $fieldIdsA = FormFieldConditionalLogicGroup::query()->pluck('form_field_id')->unique()->values()->all();
+        $this->assertSame([$fieldA->id], $fieldIdsA);
+
+        $this->withOrgRoute($orgB);
+        $fieldIdsB = FormFieldConditionalLogicGroup::query()->pluck('form_field_id')->unique()->values()->all();
+        $this->assertSame([$fieldB->id], $fieldIdsB);
+    }
+
+    public function test_scope_isolates_conditions_per_organisation(): void
+    {
+        [$orgA, $fieldA] = $this->seedOrgWithLogic();
+        $this->seedOrgWithLogic();
+
+        $this->withOrgRoute($orgA);
+        $this->assertSame(
+            1,
+            FormFieldConditionalLogicCondition::query()
+                ->where('field_slug', 'gate')
+                ->count(),
+        );
+    }
+
+    public function test_without_global_scope_exposes_cross_org(): void
+    {
+        [$orgA] = $this->seedOrgWithLogic();
+        $this->seedOrgWithLogic();
+
+        $this->withOrgRoute($orgA);
+
+        $this->assertSame(1, FormFieldConditionalLogicGroup::query()->count());
+        $this->assertSame(
+            2,
+            FormFieldConditionalLogicGroup::query()
+                ->withoutGlobalScope(OrganisationScope::class)
+                ->count(),
+        );
+
+        $this->assertSame(1, FormFieldConditionalLogicCondition::query()->count());
+        $this->assertSame(
+            2,
+            FormFieldConditionalLogicCondition::query()
+                ->withoutGlobalScope(OrganisationScope::class)
+                ->count(),
+        );
+    }
+
+    /** @return array{0:Organisation,1:FormField} */
+    private function seedOrgWithLogic(): array
+    {
+        $org = Organisation::factory()->create();
+        $schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
+        $field = FormField::factory()->create(['form_schema_id' => $schema->id]);
+
+        $root = FormFieldConditionalLogicGroup::factory()->forField($field)->create();
+        FormFieldConditionalLogicCondition::factory()
+            ->inGroup($root)
+            ->forFieldSlug('gate')
+            ->create();
+
+        return [$org, $field];
+    }
+
+    private function withOrgRoute(Organisation $org): void
+    {
+        $route = new Route(['GET'], '/_test', static fn () => null);
+        $route->bind(request());
+        $route->setParameter('organisation', $org);
+        request()->setRouteResolver(static fn () => $route);
+    }
+}