Per-attempt retry history (timestamp, user, outcome, exception detail
if failed) replaces the counter-only retry_count tracking.
Changes:
- New `form_submission_action_failure_retry_attempts` table (cascade on
parent delete, nullOnDelete on user). Explicit short FK names
(`fsafra_failure_fk`, `fsafra_user_fk`) — auto-generated names exceed
MySQL's 64-char identifier limit.
- New FormSubmissionActionFailureRetryAttempt model + factory +
succeeded() state.
- Parent FormSubmissionActionFailure gets retryAttempts() HasMany
relation (latest('attempted_at')).
- New FormFailureRetryService centralises the retry-flow logic. Both
the API controller and the artisan command delegate to it. Service
writes a retry_attempt record per attempt; parent's retry_count
stays as denormalised cache for index-view performance.
- Successful retry: attempt(succeeded) + parent.retry_count++ +
parent.resolved_at + parent.resolved_by_user_id + parent.resolved_note
("Geslaagde retry door {actor.name}" or "Geslaagde retry
(geautomatiseerd)" for command-line invocation without an actor).
- Failed retry: attempt(failed) with NEW exception details +
parent.retry_count++. Parent's exception_class/_message stay
audit-immutable — they represent the FIRST failure.
- canBeRetried() now correctly checks both resolved_at AND
dismissed_at (sessie 2's open question Q2 closure).
- New FailureNotRetriableException (controller → 422) and
ParentSubmissionGoneException (controller → 410) for cleaner
flow control.
12 new tests:
- FormSubmissionActionFailureRetryAttemptTest (5 unit tests)
- RetryFlowProducesRetryAttemptsTest (7 integration tests covering
succeeded path, failed path, resolved/dismissed blocking,
multiple-retries chronological ordering, canBeRetried truth tables)
Pre-existing tests touched:
- FormSubmissionActionFailureTest::test_can_be_retried_only_for_open_state
— updated to reflect Q2 closure (resolved now blocks too).
- Ws6FoundationMigrationTest::test_down_methods_clean_up_columns_and_table
— child table must drop before parent (FK constraint).
- 5 backfill test step-counts bumped +1 (new migration sits at top).
SCHEMA.md → v2.9. Schema dump regenerated.
Refs: RFC-WS-6.md §3 Q5 addendum, sessie 2 Q2
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 4 WS-5c migrations + 2 WS-6 migrations + 5 WS-5b
|
|
// migrations = 11, to get the pre-WS-5b state where the JSON column
|
|
// still exists on form_fields / form_field_library.
|
|
$this->artisan('migrate:rollback', ['--step' => 15])->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;
|
|
}
|
|
}
|