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>
150 lines
5.3 KiB
PHP
150 lines
5.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Tests\Feature\FormBuilder\Options;
|
|
|
|
use App\Enums\FormBuilder\FormFieldType;
|
|
use App\Models\FormBuilder\FormField;
|
|
use App\Models\FormBuilder\FormFieldLibrary;
|
|
use App\Models\FormBuilder\FormSchema;
|
|
use App\Models\Organisation;
|
|
use App\Services\FormBuilder\FormFieldOptionService;
|
|
use App\Services\FormBuilder\FormFieldService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Spatie\Activitylog\Models\Activity;
|
|
use Tests\TestCase;
|
|
|
|
/**
|
|
* Dual-emit pattern for option changes per ARCH §17.6.3 (mirrors the
|
|
* §8.6 / §17.4.2 convention from WS-5b/c): every options change on a
|
|
* FormField emits both `field.updated` (carrying the old/new diff in
|
|
* its payload) and `field.options_replaced` (semantic event from
|
|
* FormFieldOptionService::replaceOptions). FormFieldLibrary writes are
|
|
* silent.
|
|
*/
|
|
final class FormFieldOptionsActivityLogTest extends TestCase
|
|
{
|
|
use RefreshDatabase;
|
|
|
|
public function test_field_updated_payload_contains_options_diff_when_options_change(): void
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
$field = FormField::factory()
|
|
->withOptions(['a', 'b'])
|
|
->create([
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => FormFieldType::SELECT->value,
|
|
'slug' => 'colour',
|
|
'label' => 'Colour',
|
|
]);
|
|
|
|
// Suppress prior activity (factory creation) and re-bound the
|
|
// window for assertion clarity.
|
|
Activity::query()->delete();
|
|
|
|
app(FormFieldService::class)->update($field, [
|
|
'options' => [
|
|
['value' => 'a', 'label' => 'A', 'sort_order' => 0],
|
|
['value' => 'b', 'label' => 'b', 'sort_order' => 1],
|
|
['value' => 'c', 'label' => 'c', 'sort_order' => 2],
|
|
],
|
|
]);
|
|
|
|
$event = Activity::query()
|
|
->where('subject_type', 'form_field')
|
|
->where('subject_id', $field->id)
|
|
->where('description', 'field.updated')
|
|
->first();
|
|
$this->assertNotNull($event);
|
|
$payload = $event->properties->toArray();
|
|
$this->assertArrayHasKey('options', $payload['old']);
|
|
$this->assertArrayHasKey('options', $payload['new']);
|
|
$this->assertSame(
|
|
[
|
|
['value' => 'a', 'label' => 'a', 'sort_order' => 0],
|
|
['value' => 'b', 'label' => 'b', 'sort_order' => 1],
|
|
],
|
|
$payload['old']['options'],
|
|
);
|
|
$this->assertSame(
|
|
[
|
|
['value' => 'a', 'label' => 'A', 'sort_order' => 0],
|
|
['value' => 'b', 'label' => 'b', 'sort_order' => 1],
|
|
['value' => 'c', 'label' => 'c', 'sort_order' => 2],
|
|
],
|
|
$payload['new']['options'],
|
|
);
|
|
}
|
|
|
|
public function test_field_updated_payload_omits_options_key_when_only_label_changed(): void
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
$field = FormField::factory()
|
|
->withOptions(['a', 'b'])
|
|
->create([
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => FormFieldType::SELECT->value,
|
|
'slug' => 'choice',
|
|
'label' => 'Old',
|
|
]);
|
|
|
|
Activity::query()->delete();
|
|
|
|
app(FormFieldService::class)->update($field, [
|
|
'label' => 'New',
|
|
]);
|
|
|
|
$event = Activity::query()
|
|
->where('subject_type', 'form_field')
|
|
->where('subject_id', $field->id)
|
|
->where('description', 'field.updated')
|
|
->first();
|
|
$this->assertNotNull($event);
|
|
$payload = $event->properties->toArray();
|
|
$this->assertArrayNotHasKey('options', $payload['old']);
|
|
$this->assertArrayNotHasKey('options', $payload['new']);
|
|
}
|
|
|
|
public function test_options_replaced_emits_on_form_field_subject(): void
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $org->id]);
|
|
$field = FormField::factory()->create([
|
|
'form_schema_id' => $schema->id,
|
|
'field_type' => FormFieldType::SELECT->value,
|
|
]);
|
|
|
|
Activity::query()->delete();
|
|
|
|
app(FormFieldOptionService::class)->replaceOptions($field, [
|
|
['value' => 'x', 'label' => 'X', 'sort_order' => 0],
|
|
]);
|
|
|
|
$this->assertNotNull(Activity::query()
|
|
->where('subject_type', 'form_field')
|
|
->where('subject_id', $field->id)
|
|
->where('description', 'field.options_replaced')
|
|
->first());
|
|
}
|
|
|
|
public function test_options_replaced_silent_on_library_subject(): void
|
|
{
|
|
$org = Organisation::factory()->create();
|
|
$library = FormFieldLibrary::factory()->create(['organisation_id' => $org->id]);
|
|
|
|
Activity::query()->delete();
|
|
|
|
app(FormFieldOptionService::class)->replaceOptions($library, [
|
|
['value' => 'x', 'label' => 'X', 'sort_order' => 0],
|
|
]);
|
|
|
|
$this->assertNull(Activity::query()
|
|
->where('subject_type', 'form_field_library')
|
|
->where('description', 'field.options_replaced')
|
|
->first());
|
|
}
|
|
}
|