refactor(form-field): resources + snapshot + validator read form_field_options
Atomic reader switch. All call paths that previously read
form_fields.options / form_field_library.options from the JSON column
now read through FormFieldOptionService::toJsonShape() via the
morphMany relation:
- FormFieldResource + FormFieldLibraryResource +
PublicFormSchemaResource emit the rich-shape array
- FilterRegistryController emits rich shape uniformly (no flat-array
carve-out for filter-UI compatibility — preflight scan confirmed
zero portal/app consumers, S5 territory)
- FormFieldRuleBuilder plucks values from the relation for in:options
rule construction
- FormSubmissionService::buildSnapshot writes rich-shape options into
snapshots and strips translations.{locale}.options from each field's
translations bag (defensive — commit 2 backfill already did the
bulk strip)
- Four FormFieldRequest variants accept array-of-spec-objects,
validate shape in after() via FormFieldOptionService::assertSpecsValid,
and hand off to FormFieldOptionService::replaceOptions for writes
- FormFieldService::create + update extract option specs from the
request data and route through the service after the FormField row
is persisted
FormField and FormFieldLibrary $casts no longer include 'options'; the
JSON column is no longer cast. Options removed from $fillable on both
models so ::create() / ::fill() / mass assignment can no longer touch
the legacy column. Both models gain a getOptionsAttribute() accessor
that resolves $model->options to the eager-loaded morphMany collection
— required because Eloquent's getAttribute() prefers a real DB column
over a relation method, and the JSON column lives on the table until
WS-5d commit 5 drops it.
Activity log — dual emit per §6.7 / §17.4.2 / §17.6.3:
- field.updated carries old.options / new.options diff via
toJsonShape() reconstruction, byte-equal JSON compare to avoid
cosmetic false positives. Field updates that don't touch options
omit the key entirely
- field.options_replaced emits inside replaceOptions() on FormField
subject only; library subject writes silent (mirrors the WS-5b /
WS-5c convention)
JSON columns (form_fields.options, form_field_library.options) remain
present but unread — column drops land atomically in commit 5.
Two pre-existing test fixtures that seeded options via the JSON column
(FormFieldApiTest + PublicFormValidationTest) migrated to the
spec-array path: FormField::factory()->withOptions([...]) where the
options live on the field, or explicit spec-array request bodies for
HTTP tests.
Tests: 1193 → 1206 green (+13 tests / +28 assertions).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -5,7 +5,9 @@ declare(strict_types=1);
|
||||
namespace App\Http\Requests\Api\V1\FormBuilder;
|
||||
|
||||
use App\Enums\FormBuilder\FormFieldType;
|
||||
use App\Exceptions\FormBuilder\InvalidOptionSpecException;
|
||||
use App\Exceptions\FormBuilder\UnknownValidationRuleTypeException;
|
||||
use App\Services\FormBuilder\FormFieldOptionService;
|
||||
use App\Services\FormBuilder\FormFieldValidationRuleService;
|
||||
use Illuminate\Contracts\Validation\Validator;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
@@ -35,6 +37,12 @@ final class StoreFormFieldLibraryRequest extends FormRequest
|
||||
'label' => ['required', 'string', 'max:255'],
|
||||
'help_text' => ['nullable', 'string'],
|
||||
'options' => ['nullable', 'array'],
|
||||
'options.*' => ['array'],
|
||||
'options.*.value' => ['required', 'string', 'max:255'],
|
||||
'options.*.label' => ['required', 'string', 'max:255'],
|
||||
'options.*.sort_order' => ['required', 'integer', 'min:0'],
|
||||
'options.*.translations' => ['nullable', 'array'],
|
||||
'options.*.translations.*' => ['string', 'max:255'],
|
||||
'validation_rules' => ['nullable', 'array'],
|
||||
'validation_rules.*' => ['array'],
|
||||
'validation_rules.*.rule_type' => ['required', 'string', 'max:40'],
|
||||
@@ -68,6 +76,17 @@ final class StoreFormFieldLibraryRequest extends FormRequest
|
||||
$validator->errors()->add('validation_rules', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
$specs = $this->input('options');
|
||||
if (! is_array($specs) || $specs === []) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
app(FormFieldOptionService::class)->assertSpecsValid($specs);
|
||||
} catch (InvalidOptionSpecException $e) {
|
||||
$validator->errors()->add('options', $e->getMessage());
|
||||
}
|
||||
},
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,9 +8,11 @@ use App\Enums\FormBuilder\FormFieldDisplayWidth;
|
||||
use App\Enums\FormBuilder\FormFieldType;
|
||||
use App\Enums\FormBuilder\FormValueStorageHint;
|
||||
use App\Exceptions\FormBuilder\InvalidConditionalLogicSpecException;
|
||||
use App\Exceptions\FormBuilder\InvalidOptionSpecException;
|
||||
use App\Exceptions\FormBuilder\UnknownValidationRuleTypeException;
|
||||
use App\Models\FormBuilder\FormSchema;
|
||||
use App\Services\FormBuilder\FormFieldConditionalLogicService;
|
||||
use App\Services\FormBuilder\FormFieldOptionService;
|
||||
use App\Services\FormBuilder\FormFieldValidationRuleService;
|
||||
use Illuminate\Contracts\Validation\Validator;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
@@ -51,6 +53,12 @@ final class StoreFormFieldRequest extends FormRequest
|
||||
Rule::exists('form_field_library', 'id'),
|
||||
],
|
||||
'options' => ['nullable', 'array'],
|
||||
'options.*' => ['array'],
|
||||
'options.*.value' => ['required', 'string', 'max:255'],
|
||||
'options.*.label' => ['required', 'string', 'max:255'],
|
||||
'options.*.sort_order' => ['required', 'integer', 'min:0'],
|
||||
'options.*.translations' => ['nullable', 'array'],
|
||||
'options.*.translations.*' => ['string', 'max:255'],
|
||||
'validation_rules' => ['nullable', 'array'],
|
||||
'validation_rules.*' => ['array'],
|
||||
'validation_rules.*.rule_type' => ['required', 'string', 'max:40'],
|
||||
@@ -91,6 +99,17 @@ final class StoreFormFieldRequest extends FormRequest
|
||||
$validator->errors()->add('validation_rules', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
$specs = $this->input('options');
|
||||
if (! is_array($specs) || $specs === []) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
app(FormFieldOptionService::class)->assertSpecsValid($specs);
|
||||
} catch (InvalidOptionSpecException $e) {
|
||||
$validator->errors()->add('options', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
$logic = $this->input('conditional_logic');
|
||||
if ($logic === null || $logic === [] || ! is_array($logic)) {
|
||||
|
||||
@@ -5,7 +5,9 @@ declare(strict_types=1);
|
||||
namespace App\Http\Requests\Api\V1\FormBuilder;
|
||||
|
||||
use App\Enums\FormBuilder\FormFieldType;
|
||||
use App\Exceptions\FormBuilder\InvalidOptionSpecException;
|
||||
use App\Exceptions\FormBuilder\UnknownValidationRuleTypeException;
|
||||
use App\Services\FormBuilder\FormFieldOptionService;
|
||||
use App\Services\FormBuilder\FormFieldValidationRuleService;
|
||||
use Illuminate\Contracts\Validation\Validator;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
@@ -35,6 +37,12 @@ final class UpdateFormFieldLibraryRequest extends FormRequest
|
||||
'label' => ['sometimes', 'string', 'max:255'],
|
||||
'help_text' => ['sometimes', 'nullable', 'string'],
|
||||
'options' => ['sometimes', 'nullable', 'array'],
|
||||
'options.*' => ['array'],
|
||||
'options.*.value' => ['required', 'string', 'max:255'],
|
||||
'options.*.label' => ['required', 'string', 'max:255'],
|
||||
'options.*.sort_order' => ['required', 'integer', 'min:0'],
|
||||
'options.*.translations' => ['nullable', 'array'],
|
||||
'options.*.translations.*' => ['string', 'max:255'],
|
||||
'validation_rules' => ['sometimes', 'nullable', 'array'],
|
||||
'validation_rules.*' => ['array'],
|
||||
'validation_rules.*.rule_type' => ['required', 'string', 'max:40'],
|
||||
@@ -71,6 +79,20 @@ final class UpdateFormFieldLibraryRequest extends FormRequest
|
||||
$validator->errors()->add('validation_rules', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
if (! $this->has('options')) {
|
||||
return;
|
||||
}
|
||||
$specs = $this->input('options');
|
||||
if (! is_array($specs) || $specs === []) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
app(FormFieldOptionService::class)->assertSpecsValid($specs);
|
||||
} catch (InvalidOptionSpecException $e) {
|
||||
$validator->errors()->add('options', $e->getMessage());
|
||||
}
|
||||
},
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,9 +8,11 @@ use App\Enums\FormBuilder\FormFieldDisplayWidth;
|
||||
use App\Enums\FormBuilder\FormFieldType;
|
||||
use App\Enums\FormBuilder\FormValueStorageHint;
|
||||
use App\Exceptions\FormBuilder\InvalidConditionalLogicSpecException;
|
||||
use App\Exceptions\FormBuilder\InvalidOptionSpecException;
|
||||
use App\Exceptions\FormBuilder\UnknownValidationRuleTypeException;
|
||||
use App\Models\FormBuilder\FormSchema;
|
||||
use App\Services\FormBuilder\FormFieldConditionalLogicService;
|
||||
use App\Services\FormBuilder\FormFieldOptionService;
|
||||
use App\Services\FormBuilder\FormFieldValidationRuleService;
|
||||
use Illuminate\Contracts\Validation\Validator;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
@@ -47,6 +49,12 @@ final class UpdateFormFieldRequest extends FormRequest
|
||||
Rule::exists('form_schema_sections', 'id')->where('form_schema_id', $schemaId),
|
||||
],
|
||||
'options' => ['sometimes', 'nullable', 'array'],
|
||||
'options.*' => ['array'],
|
||||
'options.*.value' => ['required', 'string', 'max:255'],
|
||||
'options.*.label' => ['required', 'string', 'max:255'],
|
||||
'options.*.sort_order' => ['required', 'integer', 'min:0'],
|
||||
'options.*.translations' => ['nullable', 'array'],
|
||||
'options.*.translations.*' => ['string', 'max:255'],
|
||||
'validation_rules' => ['sometimes', 'nullable', 'array'],
|
||||
'validation_rules.*' => ['array'],
|
||||
'validation_rules.*.rule_type' => ['required', 'string', 'max:40'],
|
||||
@@ -91,6 +99,20 @@ final class UpdateFormFieldRequest extends FormRequest
|
||||
$validator->errors()->add('validation_rules', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
if (! $this->has('options')) {
|
||||
return;
|
||||
}
|
||||
$specs = $this->input('options');
|
||||
if (! is_array($specs) || $specs === []) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
app(FormFieldOptionService::class)->assertSpecsValid($specs);
|
||||
} catch (InvalidOptionSpecException $e) {
|
||||
$validator->errors()->add('options', $e->getMessage());
|
||||
}
|
||||
},
|
||||
function (Validator $validator): void {
|
||||
if (! $this->has('conditional_logic')) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user