feat(form-builder): retry history table + integration (WS-6)
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>
This commit is contained in:
@@ -4,14 +4,12 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\FormBuilder\ApplyStatus;
|
||||
use App\FormBuilder\Bindings\FormBindingApplicator;
|
||||
use App\Models\FormBuilder\FormSubmission;
|
||||
use App\Exceptions\FormBuilder\FailureNotRetriableException;
|
||||
use App\Exceptions\FormBuilder\ParentSubmissionGoneException;
|
||||
use App\Models\FormBuilder\FormSubmissionActionFailure;
|
||||
use App\Services\FormBuilder\FormFailureRetryService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* RFC-WS-6 §3 (Q5) — replay open failures via the applicator.
|
||||
@@ -29,7 +27,7 @@ final class RetryFormSubmissionActionFailures extends Command
|
||||
|
||||
protected $description = 'Replay open FormSubmissionActionFailure rows via the applicator';
|
||||
|
||||
public function handle(FormBindingApplicator $applicator): int
|
||||
public function handle(FormFailureRetryService $retryService): int
|
||||
{
|
||||
if (
|
||||
$this->option('id') === null
|
||||
@@ -54,10 +52,11 @@ final class RetryFormSubmissionActionFailures extends Command
|
||||
foreach ($failures as $failure) {
|
||||
if ($this->option('dry-run')) {
|
||||
$rows[] = ['id' => (string) $failure->id, 'submission' => (string) $failure->form_submission_id, 'result' => 'would-retry'];
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$rows[] = $this->retryOne($failure, $applicator);
|
||||
$rows[] = $this->retryOne($failure, $retryService);
|
||||
}
|
||||
|
||||
$this->table(['id', 'submission', 'result'], $rows);
|
||||
@@ -95,48 +94,28 @@ final class RetryFormSubmissionActionFailures extends Command
|
||||
/**
|
||||
* @return array{id:string, submission:string, result:string}
|
||||
*/
|
||||
private function retryOne(FormSubmissionActionFailure $failure, FormBindingApplicator $applicator): array
|
||||
private function retryOne(FormSubmissionActionFailure $failure, FormFailureRetryService $retryService): array
|
||||
{
|
||||
$submission = FormSubmission::query()->withoutGlobalScopes()->find($failure->form_submission_id);
|
||||
if ($submission === null) {
|
||||
return ['id' => (string) $failure->id, 'submission' => (string) $failure->form_submission_id, 'result' => 'submission-gone'];
|
||||
}
|
||||
|
||||
try {
|
||||
DB::transaction(function () use ($applicator, $submission): void {
|
||||
$result = $applicator->apply($submission);
|
||||
FormSubmission::query()
|
||||
->whereKey($submission->id)
|
||||
->update([
|
||||
'apply_status' => $result->applyStatus()->value,
|
||||
'apply_completed_at' => now(),
|
||||
]);
|
||||
});
|
||||
$failure->retry_count = (int) $failure->retry_count + 1;
|
||||
$failure->resolved_at = now();
|
||||
$failure->save();
|
||||
$result = $retryService->retry($failure);
|
||||
|
||||
return ['id' => (string) $failure->id, 'submission' => (string) $submission->id, 'result' => 'succeeded'];
|
||||
} catch (Throwable $e) {
|
||||
// Append a NEW row preserving history, increment retry_count on original.
|
||||
DB::transaction(function () use ($failure, $submission, $e): void {
|
||||
FormSubmissionActionFailure::query()->create([
|
||||
'form_submission_id' => $submission->id,
|
||||
'listener_class' => $failure->listener_class,
|
||||
'failed_at' => now(),
|
||||
'exception_class' => $e::class,
|
||||
'exception_message' => $e->getMessage(),
|
||||
'context' => ['retry_of' => (string) $failure->id],
|
||||
]);
|
||||
FormSubmissionActionFailure::query()
|
||||
->whereKey($failure->id)
|
||||
->update(['retry_count' => (int) $failure->retry_count + 1]);
|
||||
FormSubmission::query()
|
||||
->whereKey($submission->id)
|
||||
->update(['apply_status' => ApplyStatus::FAILED->value]);
|
||||
});
|
||||
|
||||
return ['id' => (string) $failure->id, 'submission' => (string) $submission->id, 'result' => 'failed-again'];
|
||||
return [
|
||||
'id' => (string) $failure->id,
|
||||
'submission' => (string) $failure->form_submission_id,
|
||||
'result' => $result['outcome'] === 'succeeded' ? 'succeeded' : 'failed-again',
|
||||
];
|
||||
} catch (FailureNotRetriableException $e) {
|
||||
return [
|
||||
'id' => (string) $failure->id,
|
||||
'submission' => (string) $failure->form_submission_id,
|
||||
'result' => "skipped-{$e->reason}",
|
||||
];
|
||||
} catch (ParentSubmissionGoneException) {
|
||||
return [
|
||||
'id' => (string) $failure->id,
|
||||
'submission' => (string) $failure->form_submission_id,
|
||||
'result' => 'submission-gone',
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user