bert.hausmans
079d10975b
WS-5c commit 3 of 4. FormRequests (Store/Update) now reject bad
conditional_logic trees at the HTTP boundary — the `after()` hook
unwraps the `show_when` envelope, normalises legacy `{all|any: [...]}`
group shape to the service's internal form, and delegates to
`FormFieldConditionalLogicService::assertSpecsValid()`. Unknown
operators, root conditions, empty groups, and unknown field_slug
references produce a 422 with a readable error before any write.
`form_fields.conditional_logic` JSON column dropped. FormField model
`$fillable` and `$casts` no longer mention the column; factory default
no longer writes `null` to it. Snapshot fixtures in the dev seeder and
the legacy-forms migration command keep `conditional_logic` in their
snapshot JSON shape — that's the schema_snapshot contract, not the DB
column.
FormFieldController now maps InvalidConditionalLogicSpecException to
422 alongside FrozenSchemaException / CyclicDependencyException.
Rollback path: roll back WS-5c commits 1–3 together. Partial rollback
(drop-column reversed but backfill still applied) is not a supported
state — matching the WS-5a/b precedent on the family's full-rollback
contract.
Tests: 6 new (strict FormRequest rejection cases + JSON-column drop
assertion). Rollback step counts in WS-5a/b migration tests bumped +1
for the drop_conditional_logic_json_column migration. Baseline
1142 → 1148 green (3085 → 3099 assertions).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
114 lines
4.1 KiB
PHP
114 lines
4.1 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Tests\Feature\FormBuilder\Configs;
|
|
|
|
use App\Models\FormBuilder\FormSchema;
|
|
use App\Models\Organisation;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Schema;
|
|
use Illuminate\Support\Str;
|
|
use Tests\TestCase;
|
|
|
|
/**
|
|
* WS-5b commit 5 — verifies the configs backfill + column drop pair.
|
|
*
|
|
* - `tag_categories` + `storage_disk` keys in the pre-WS-5b JSON bag
|
|
* become rows in `form_field_configs` (not in
|
|
* `form_field_validation_rules`).
|
|
* - After the full forward-migration, `form_fields.validation_rules`
|
|
* and `form_field_library.validation_rules` columns are gone.
|
|
*/
|
|
final class FormFieldConfigBackfillAndDropTest extends TestCase
|
|
{
|
|
use RefreshDatabase;
|
|
|
|
public function test_backfill_translates_tag_categories_and_storage_disk(): void
|
|
{
|
|
// Roll back 2 WS-5c migrations + 5 WS-5b migrations = 7, to get the
|
|
// pre-WS-5b state where the JSON column still exists on form_fields
|
|
// / form_field_library.
|
|
$this->artisan('migrate:rollback', ['--step' => 9])->assertSuccessful();
|
|
$this->assertTrue(Schema::hasColumn('form_fields', 'validation_rules'));
|
|
|
|
$fieldId = $this->seedField([
|
|
'field_type' => 'TAG_PICKER',
|
|
'validation_rules' => [
|
|
'tag_categories' => ['Veiligheid', 'Horeca'],
|
|
'storage_disk' => 's3',
|
|
],
|
|
]);
|
|
|
|
$this->artisan('migrate')->assertSuccessful();
|
|
|
|
$rows = DB::table('form_field_configs')
|
|
->where('owner_id', $fieldId)
|
|
->get()->keyBy('config_type');
|
|
|
|
$this->assertTrue($rows->has('tag_categories'));
|
|
$this->assertSame(
|
|
['Veiligheid', 'Horeca'],
|
|
json_decode((string) $rows['tag_categories']->parameters, true)['categories'],
|
|
);
|
|
$this->assertTrue($rows->has('storage_disk'));
|
|
$this->assertSame(
|
|
's3',
|
|
json_decode((string) $rows['storage_disk']->parameters, true)['disk'],
|
|
);
|
|
}
|
|
|
|
public function test_validation_rules_json_columns_are_dropped_after_migrations(): void
|
|
{
|
|
// Default state after RefreshDatabase: full migration applied.
|
|
$this->assertFalse(Schema::hasColumn('form_fields', 'validation_rules'));
|
|
$this->assertFalse(Schema::hasColumn('form_field_library', 'validation_rules'));
|
|
}
|
|
|
|
public function test_cascade_observer_cleans_up_configs_on_owner_delete(): void
|
|
{
|
|
// Integration-level: confirms the renamed cascade observer covers
|
|
// the configs table too.
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
$field = \App\Models\FormBuilder\FormField::factory()->create(['form_schema_id' => $schema->id]);
|
|
\App\Models\FormBuilder\FormFieldConfig::factory()->forField($field)->create();
|
|
|
|
$this->assertSame(1, \App\Models\FormBuilder\FormFieldConfig::query()
|
|
->withoutGlobalScopes()
|
|
->where('owner_id', $field->id)
|
|
->count());
|
|
|
|
$field->delete();
|
|
|
|
$this->assertSame(0, \App\Models\FormBuilder\FormFieldConfig::query()
|
|
->withoutGlobalScopes()
|
|
->where('owner_id', $field->id)
|
|
->count());
|
|
}
|
|
|
|
/** @param array<string, mixed> $attrs */
|
|
private function seedField(array $attrs): string
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
|
|
$id = (string) Str::ulid();
|
|
DB::table('form_fields')->insert([[
|
|
'id' => $id,
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => $attrs['field_type'],
|
|
'slug' => 'f-'.Str::lower(Str::random(4)),
|
|
'label' => 'field',
|
|
'validation_rules' => json_encode($attrs['validation_rules']),
|
|
'value_storage_hint' => 'json',
|
|
'sort_order' => 0,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
]]);
|
|
|
|
return $id;
|
|
}
|
|
}
|