Closes the four production gaps that emerged from sessie 3b's admin UI.
What we ship here is final: no further rework planned before production.
Backend
- IndexFailuresRequest validates state/search/failed_at_from/failed_at_to/
listener_class. orgIndex + platformIndex apply them via a single
applyIndexFilters() helper. Search runs case-insensitive `LIKE` on
exception_message; SQL wildcards in user input are escaped.
- New /kpis aggregate endpoint per scope (orgKpis, platformKpis) returns
open / resolved_30d / dismissed_30d / total_submissions in O(1) COUNTs.
Replaces sessie 3b's client-side bucketing of an oversized list.
- Resource expansion: organisation_name, form_schema_label,
resolved_by_user_name, dismissed_by_user_name, exception_trace,
retry_history[]. Eager-loading via indexEagerLoads()/detailEagerLoads()
prevents N+1 (verified by query-count assertion in test).
- New 2026_04_28_181000 migration adds exception_trace (longtext nullable)
to form_submission_action_failures. ApplyBindingsOnFormSubmit listener
now captures $e->getTraceAsString() at failure time.
- New FormSubmissionActionFailureRetryAttemptResource exposes per-attempt
data (timestamp, actor name, outcome, exception details) inside
retry_history[]. Index payloads omit the field via whenLoaded() to keep
list responses lean.
Frontend (apps/app)
- Types updated to mirror the expanded resource shape and the new KPI
endpoint contract. FormFailuresKpis is now { open, resolved_30d,
dismissed_30d, total_submissions } (server-aggregate).
- useFormFailures composable forwards all 5 server filters via
buildIndexParams() (strips empty/whitespace). useFormFailuresKpis hits
the dedicated /kpis endpoint per scope.
- FormFailuresTable replaces client-side bucketing with server-side
filtering, adds listener_class + date-range filter inputs, and renames
the 4th KPI tile to "Submissions" (was "Totaal").
- FormFailureDetail renders organisation_name + form_schema_label in the
header, surfaces an expandable stack-trace card, names the resolved/
dismissed actor in the timeline, and replaces the "v1 placeholder"
retry-history card with a full per-attempt timeline.
ESLint config gap (apps/app)
- New .eslintrc.cjs adapted from the Vuexy reference, minus Vuexy-internal
rules. `pnpm lint` now runs successfully (was previously broken — the
package.json script referenced a missing config). The 80 baseline
violations across the codebase are pre-existing and out of scope for
this session.
Tests + gates
- 24 new backend tests across filter, kpis, and resource-shape suites.
Backend: 1462 → 1486 passing, 0 → 0 failing. Larastan clean. Rector
dry-run unchanged at 354 (pre-Task-1 baseline from f18b55b).
- 3 new vitest tests in apps/app (filter wiring, KPI endpoint, KPI tile
values from /kpis). Vitest: 38 → 41 passing. tsc clean. Portal
unchanged (113 vitest, tsc clean).
- 5 backfill rollback tests bumped --step counts +1 for the new migration.
- Ws6FoundationMigrationTest down/up chain now includes exception_trace
before the parent table is restored.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
288 lines
12 KiB
PHP
288 lines
12 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Tests\Feature\FormBuilder\Bindings;
|
|
|
|
use App\Models\FormBuilder\FormSchema;
|
|
use App\Models\Organisation;
|
|
use App\Support\Json\JsonCanonicalizer;
|
|
use Illuminate\Foundation\Testing\RefreshDatabaseState;
|
|
use Illuminate\Support\Facades\Artisan;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\Schema;
|
|
use Illuminate\Support\Str;
|
|
use Tests\TestCase;
|
|
|
|
/**
|
|
* Rolls back both WS-5a migrations (drop-columns + create-table), seeds
|
|
* pre-migration JSON into `form_fields.binding` and
|
|
* `form_field_library.default_binding`, then runs the migrations forward
|
|
* and back asserting:
|
|
*
|
|
* - forward: rows land in form_field_bindings with the correct
|
|
* owner_type/owner_id + translated columns; legacy JSON columns are
|
|
* dropped afterwards.
|
|
* - backward: the rollback pair genuinely reconstructs the JSON shape
|
|
* before dropping the table.
|
|
*
|
|
* The "roll back both steps" contract is explicitly documented in
|
|
* `2026_04_25_100001_drop_binding_json_columns.php`.
|
|
*/
|
|
final class FormFieldBindingMigrationTest extends TestCase
|
|
{
|
|
// Migration tests run DDL inside the test body (migrate:rollback/migrate);
|
|
// RefreshDatabase wraps tests in a transaction, and DDL on MySQL implicit-
|
|
// commits the surrounding transaction, leaving Laravel unable to ROLLBACK
|
|
// TO SAVEPOINT at end-of-test (1305 SAVEPOINT does not exist). Use
|
|
// migrate:fresh per test for a clean baseline without the txn wrapper.
|
|
//
|
|
// RefreshDatabaseState::$migrated = false forces the NEXT RefreshDatabase
|
|
// test to re-migrate fresh, so any data this test commits doesn't leak.
|
|
protected function setUp(): void
|
|
{
|
|
parent::setUp();
|
|
Artisan::call('migrate:fresh');
|
|
RefreshDatabaseState::$migrated = false;
|
|
}
|
|
|
|
public function test_forward_migrations_backfill_rows_from_both_json_sources(): void
|
|
{
|
|
// Roll back to pre-WS-5a state: 3 WS-5d migrations (drop-options-cols,
|
|
// backfill-options, create-options) + 4 WS-5c migrations
|
|
// (drop-conditional-logic-col, backfill-conditional-logic,
|
|
// create-conditional-logic-conditions,
|
|
// create-conditional-logic-groups) + 5 WS-5b migrations
|
|
// (drop-validation-cols, configs-backfill, create-configs,
|
|
// validation-rules-backfill, create-validation-rules) +
|
|
// 2 WS-6 migrations (action-failures, apply-status) +
|
|
// 2 WS-5a migrations (drop-binding-cols, create-bindings) = 16.
|
|
$this->artisan('migrate:rollback', ['--step' => 21])->assertSuccessful();
|
|
$this->assertFalse(Schema::hasTable('form_field_bindings'));
|
|
$this->assertTrue(Schema::hasColumn('form_fields', 'binding'));
|
|
$this->assertTrue(Schema::hasColumn('form_field_library', 'default_binding'));
|
|
|
|
[$fieldAId, $fieldCId, $fieldDId] = $this->seedFieldsWithBindingJson();
|
|
[$libAId, $libCId] = $this->seedLibraryWithBindingJson();
|
|
|
|
$this->artisan('migrate')->assertSuccessful();
|
|
|
|
$this->assertTrue(Schema::hasTable('form_field_bindings'));
|
|
$this->assertFalse(Schema::hasColumn('form_fields', 'binding'));
|
|
$this->assertFalse(Schema::hasColumn('form_field_library', 'default_binding'));
|
|
|
|
$rows = DB::table('form_field_bindings')->get();
|
|
$this->assertCount(5, $rows, 'Expected 3 field + 2 library rows');
|
|
|
|
$fieldRowA = DB::table('form_field_bindings')
|
|
->where('owner_type', 'form_field')
|
|
->where('owner_id', $fieldAId)
|
|
->first();
|
|
$this->assertSame('person', $fieldRowA->target_entity);
|
|
$this->assertSame('email', $fieldRowA->target_attribute);
|
|
$this->assertSame('entity_owned', $fieldRowA->mode);
|
|
$this->assertNull($fieldRowA->sync_direction);
|
|
$this->assertSame('overwrite', $fieldRowA->merge_strategy);
|
|
$this->assertSame(50, (int) $fieldRowA->trust_level);
|
|
$this->assertSame(0, (int) $fieldRowA->is_identity_key);
|
|
|
|
$fieldRowC = DB::table('form_field_bindings')
|
|
->where('owner_type', 'form_field')
|
|
->where('owner_id', $fieldCId)
|
|
->first();
|
|
$this->assertSame('mirrored', $fieldRowC->mode);
|
|
$this->assertSame('write_on_submit', $fieldRowC->sync_direction);
|
|
$this->assertSame('user_profile', $fieldRowC->target_entity);
|
|
$this->assertSame('emergency_contact_name', $fieldRowC->target_attribute);
|
|
|
|
$fieldRowD = DB::table('form_field_bindings')
|
|
->where('owner_type', 'form_field')
|
|
->where('owner_id', $fieldDId)
|
|
->first();
|
|
$this->assertSame('entity_owned', $fieldRowD->mode);
|
|
|
|
$libRowA = DB::table('form_field_bindings')
|
|
->where('owner_type', 'form_field_library')
|
|
->where('owner_id', $libAId)
|
|
->first();
|
|
$this->assertSame('person', $libRowA->target_entity);
|
|
$this->assertSame('first_name', $libRowA->target_attribute);
|
|
$this->assertSame('entity_owned', $libRowA->mode);
|
|
|
|
$libRowC = DB::table('form_field_bindings')
|
|
->where('owner_type', 'form_field_library')
|
|
->where('owner_id', $libCId)
|
|
->first();
|
|
$this->assertSame('mirrored', $libRowC->mode);
|
|
}
|
|
|
|
public function test_rollback_reconstructs_json_and_drops_table(): void
|
|
{
|
|
// Walk back the full WS-5d + WS-5c + WS-6 + WS-5b + WS-5a stack (16 migrations).
|
|
$this->artisan('migrate:rollback', ['--step' => 21])->assertSuccessful();
|
|
[$fieldAId] = $this->seedFieldsWithBindingJson();
|
|
[$libAId] = $this->seedLibraryWithBindingJson();
|
|
|
|
$this->artisan('migrate')->assertSuccessful();
|
|
|
|
// Fully-forward state: binding columns gone, rows in form_field_bindings.
|
|
$this->assertFalse(Schema::hasColumn('form_fields', 'binding'));
|
|
$this->assertSame(5, DB::table('form_field_bindings')->count());
|
|
|
|
// Step back over WS-5d (3 migrations) + WS-5c (4 migrations) +
|
|
// WS-6 (2 migrations) + WS-5b (5 migrations) in one go → restores
|
|
// the pre-WS-5b state (conditional-logic, validation-rules, configs
|
|
// and options tables gone, validation_rules + options JSON columns
|
|
// reappear on source tables; binding contract intact).
|
|
$this->artisan('migrate:rollback', ['--step' => 19])->assertSuccessful();
|
|
$this->assertFalse(Schema::hasTable('form_field_options'));
|
|
$this->assertFalse(Schema::hasTable('form_field_conditional_logic_groups'));
|
|
$this->assertFalse(Schema::hasTable('form_field_conditional_logic_conditions'));
|
|
$this->assertFalse(Schema::hasTable('form_field_validation_rules'));
|
|
$this->assertFalse(Schema::hasTable('form_field_configs'));
|
|
$this->assertTrue(Schema::hasTable('form_field_bindings'));
|
|
|
|
// Step back over drop_binding_json_columns → columns reappear empty.
|
|
$this->artisan('migrate:rollback', ['--step' => 1])->assertSuccessful();
|
|
$this->assertTrue(Schema::hasColumn('form_fields', 'binding'));
|
|
$this->assertNull(DB::table('form_fields')->where('id', $fieldAId)->value('binding'));
|
|
|
|
// Step back over create_form_field_bindings → JSON reconstructed.
|
|
$this->artisan('migrate:rollback', ['--step' => 1])->assertSuccessful();
|
|
$this->assertFalse(Schema::hasTable('form_field_bindings'));
|
|
|
|
// RFC-WS-6 session 2.7: rollback writes JSON directly from
|
|
// migration code (not the canonicalizing service). Compare on
|
|
// canonical form so the assertion is engine-agnostic.
|
|
$field = DB::table('form_fields')->where('id', $fieldAId)->first();
|
|
$this->assertNotNull($field->binding);
|
|
$this->assertSame(
|
|
JsonCanonicalizer::encode([
|
|
'mode' => 'entity_owned',
|
|
'entity' => 'person',
|
|
'column' => 'email',
|
|
]),
|
|
JsonCanonicalizer::encode(json_decode((string) $field->binding, true)),
|
|
);
|
|
|
|
$lib = DB::table('form_field_library')->where('id', $libAId)->first();
|
|
$this->assertNotNull($lib->default_binding);
|
|
$this->assertSame(
|
|
JsonCanonicalizer::encode([
|
|
'mode' => 'entity_owned',
|
|
'entity' => 'person',
|
|
'column' => 'first_name',
|
|
]),
|
|
JsonCanonicalizer::encode(json_decode((string) $lib->default_binding, true)),
|
|
);
|
|
}
|
|
|
|
/** @return array{0:string,1:string,2:string} */
|
|
private function seedFieldsWithBindingJson(): array
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
|
|
$fieldA = (string) Str::ulid();
|
|
$fieldC = (string) Str::ulid();
|
|
$fieldD = (string) Str::ulid();
|
|
|
|
DB::table('form_fields')->insert([
|
|
[
|
|
'id' => $fieldA,
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => 'EMAIL',
|
|
'slug' => 'email',
|
|
'label' => 'E-mail',
|
|
'binding' => json_encode(['mode' => 'entity_owned', 'entity' => 'person', 'column' => 'email']),
|
|
'value_storage_hint' => 'indexed',
|
|
'sort_order' => 0,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
],
|
|
[
|
|
'id' => $fieldC,
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => 'TEXT',
|
|
'slug' => 'noodcontact',
|
|
'label' => 'Noodcontact',
|
|
'binding' => json_encode([
|
|
'mode' => 'mirrored',
|
|
'entity' => 'user_profile',
|
|
'column' => 'emergency_contact_name',
|
|
'sync_direction' => 'write_on_submit',
|
|
]),
|
|
'value_storage_hint' => 'indexed',
|
|
'sort_order' => 1,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
],
|
|
[
|
|
'id' => $fieldD,
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => 'TEXT',
|
|
'slug' => 'voornaam',
|
|
'label' => 'Voornaam',
|
|
'binding' => json_encode(['mode' => 'entity_owned', 'entity' => 'person', 'column' => 'first_name']),
|
|
'value_storage_hint' => 'indexed',
|
|
'sort_order' => 2,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
],
|
|
]);
|
|
|
|
return [$fieldA, $fieldC, $fieldD];
|
|
}
|
|
|
|
/** @return array{0:string,1:string} */
|
|
private function seedLibraryWithBindingJson(): array
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
|
|
$libA = (string) Str::ulid();
|
|
$libC = (string) Str::ulid();
|
|
|
|
DB::table('form_field_library')->insert([
|
|
[
|
|
'id' => $libA,
|
|
'organisation_id' => $org->id,
|
|
'name' => 'Voornaam bibliotheek',
|
|
'slug' => 'voornaam-lib',
|
|
'field_type' => 'TEXT',
|
|
'label' => 'Voornaam',
|
|
'default_binding' => json_encode(['mode' => 'entity_owned', 'entity' => 'person', 'column' => 'first_name']),
|
|
'default_is_required' => false,
|
|
'default_is_filterable' => false,
|
|
'usage_count' => 0,
|
|
'is_system' => false,
|
|
'is_active' => true,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
],
|
|
[
|
|
'id' => $libC,
|
|
'organisation_id' => $org->id,
|
|
'name' => 'Noodcontact bibliotheek',
|
|
'slug' => 'noodcontact-lib',
|
|
'field_type' => 'TEXT',
|
|
'label' => 'Noodcontact',
|
|
'default_binding' => json_encode([
|
|
'mode' => 'mirrored',
|
|
'entity' => 'user_profile',
|
|
'column' => 'emergency_contact_phone',
|
|
'sync_direction' => 'write_on_submit',
|
|
]),
|
|
'default_is_required' => false,
|
|
'default_is_filterable' => false,
|
|
'usage_count' => 0,
|
|
'is_system' => false,
|
|
'is_active' => true,
|
|
'created_at' => now(),
|
|
'updated_at' => now(),
|
|
],
|
|
]);
|
|
|
|
return [$libA, $libC];
|
|
}
|
|
}
|