MySQL 8.0 JSON columns may reorder associative-array keys on round-trip. For audit-immutable values (schema snapshots, webhook payloads, activity log diffs), this is corrupting: re-emits produce different byte sequences for the same logical content. Introduced JsonCanonicalizer (recursive ksort on associative arrays; numeric-indexed lists preserve order) and applied at every writer site that produces byte-stable JSON: - FormSubmissionService: canonicalize the schema_snapshot array before storage (audit-immutable per ARCH §4.3, RFC-WS-6 v1.1). - FormField::logFieldChange / FormSchema::logSchemaChange: canonicalize activity-log properties before withProperties() so old/new diffs read back byte-stable. - BindingActivityLogger: canonicalize both the pass-level and per-binding activity properties. - FormWebhookDispatcher: canonicalize payload_snapshot before storage (delivery-time HMAC re-encodes the same canonical bytes). - DeliverFormWebhookJob: switched json_encode to JsonCanonicalizer::encode for the HMAC-signed body, so the signature is byte-stable across re-deliveries and reproducible by receivers from the same logical payload. Sites NOT canonicalized (deliberate): - form_schemas.settings — opaque UI config; key order has no semantic meaning, no byte-stability requirement. - form_schemas.translations / form_fields.translations — read by display layer; key order doesn't matter. - form_templates.schema_snapshot — user-supplied input via store/ update; user is the source of truth, not audit-immutable in the same way as form_submissions.schema_snapshot. Reverted the 7 assertEquals workarounds from session 2.6: - ConditionalLogicActivityLogPayloadTest - ConditionalLogicBackfillTest::test_rollback_reconstructs_canonical_json - FormFieldBindingMigrationTest::test_rollback_reconstructs_json_and_drops_table - FormFieldOptionServiceAndScopeTest::test_replace_options_emits_activity_log_on_field_only - FormFieldOptionsActivityLogTest::test_field_updated_payload_contains_options_diff_when_options_change - FormFieldOptionsBackfillTest::test_forward_migration_backfills_rows_strips_translations_and_rewrites_snapshot - FormFieldOptionsSnapshotAndStrictRequestTest::test_submission_snapshot_embeds_rich_shape_options Each now uses assertSame on JsonCanonicalizer::encode of both sides — byte-stable comparison meaningful regardless of MySQL JSON storage behavior. New regression test SchemaSnapshotByteStableAcrossReemitsTest exercises the contract end-to-end: complex schema with bindings, validation rules, options, conditional logic, submitted; reads schema_snapshot via three roads (Eloquent cast, fresh model, raw bytes) and asserts the canonical encode is identical. ARCH-FORM-BUILDER.md §4.6.1 gets a "Byte-stability" sub-section explaining what's canonicalized and why. Test count: 1388 → 1400 (+11 JsonCanonicalizer unit, +1 snapshot regression). Larastan clean. Rector dry-run unchanged at 355. Refs: WS-6 session 2.6 deviation #4 cleanup, RFC-WS-6 v1.1 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
166 lines
4.9 KiB
PHP
166 lines
4.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Models\FormBuilder;
|
|
|
|
use App\Enums\FormBuilder\FormPurpose;
|
|
use App\Enums\FormBuilder\FormSchemaSnapshotMode;
|
|
use App\Enums\FormBuilder\FormSubmissionMode;
|
|
use App\Models\CrowdType;
|
|
use App\Models\Organisation;
|
|
use App\Models\Scopes\OrganisationScope;
|
|
use App\Models\User;
|
|
use App\Support\Json\JsonCanonicalizer;
|
|
use Illuminate\Database\Eloquent\Concerns\HasUlids;
|
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
|
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
|
|
/**
|
|
* Activity log strategy: explicit calls via logSchemaChange() — no LogsActivity
|
|
* trait (would produce noise). See ARCH-FORM-BUILDER.md §17.1 and S1 Phase 4b.
|
|
*/
|
|
final class FormSchema extends Model
|
|
{
|
|
use HasFactory;
|
|
use HasUlids;
|
|
use SoftDeletes;
|
|
|
|
public string $organisationScopeColumn = 'organisation_id';
|
|
|
|
protected static function booted(): void
|
|
{
|
|
self::addGlobalScope(new OrganisationScope);
|
|
}
|
|
|
|
protected $fillable = [
|
|
'organisation_id',
|
|
'owner_type',
|
|
'owner_id',
|
|
'name',
|
|
'slug',
|
|
'purpose',
|
|
'default_crowd_type_id',
|
|
'description',
|
|
'is_published',
|
|
'submission_mode',
|
|
'public_token',
|
|
'public_token_previous',
|
|
'public_token_rotated_at',
|
|
'submission_deadline',
|
|
'locale',
|
|
'settings',
|
|
'version',
|
|
'snapshot_mode',
|
|
'freeze_on_submit',
|
|
'retention_days',
|
|
'consent_version',
|
|
'section_level_submit',
|
|
'auto_save_enabled',
|
|
'max_submissions',
|
|
'created_by_user_id',
|
|
'last_updated_by_user_id',
|
|
'edit_lock_user_id',
|
|
'edit_lock_expires_at',
|
|
];
|
|
|
|
/** @var array<string, string> */
|
|
protected $casts = [
|
|
'purpose' => FormPurpose::class,
|
|
'submission_mode' => FormSubmissionMode::class,
|
|
'snapshot_mode' => FormSchemaSnapshotMode::class,
|
|
'is_published' => 'bool',
|
|
'freeze_on_submit' => 'bool',
|
|
'section_level_submit' => 'bool',
|
|
'auto_save_enabled' => 'bool',
|
|
'settings' => 'array',
|
|
'submission_deadline' => 'datetime',
|
|
'public_token_rotated_at' => 'datetime',
|
|
'edit_lock_expires_at' => 'datetime',
|
|
'version' => 'int',
|
|
'retention_days' => 'int',
|
|
'max_submissions' => 'int',
|
|
];
|
|
|
|
public function organisation(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Organisation::class);
|
|
}
|
|
|
|
/** @return BelongsTo<CrowdType, $this> */
|
|
public function defaultCrowdType(): BelongsTo
|
|
{
|
|
return $this->belongsTo(CrowdType::class, 'default_crowd_type_id');
|
|
}
|
|
|
|
public function owner(): MorphTo
|
|
{
|
|
return $this->morphTo();
|
|
}
|
|
|
|
public function fields(): HasMany
|
|
{
|
|
return $this->hasMany(FormField::class);
|
|
}
|
|
|
|
public function sections(): HasMany
|
|
{
|
|
return $this->hasMany(FormSchemaSection::class);
|
|
}
|
|
|
|
public function submissions(): HasMany
|
|
{
|
|
return $this->hasMany(FormSubmission::class);
|
|
}
|
|
|
|
public function webhooks(): HasMany
|
|
{
|
|
return $this->hasMany(FormSchemaWebhook::class);
|
|
}
|
|
|
|
public function createdBy(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'created_by_user_id');
|
|
}
|
|
|
|
public function lastUpdatedBy(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'last_updated_by_user_id');
|
|
}
|
|
|
|
public function editLockUser(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'edit_lock_user_id');
|
|
}
|
|
|
|
/**
|
|
* Nuanced activity log (ARCH §17.1; S1 Phase 4b). Callers choose which
|
|
* events are worth logging — e.g. created/deleted/restored, published
|
|
* toggled, purpose changed, freeze_on_submit toggled, retention_days
|
|
* changed, consent_version changed, public_token rotated, snapshot_mode
|
|
* changed. NOT logged (noise): name/description/slug, settings, locale.
|
|
*
|
|
* Bulk-fixture suppression: the activitylog.enabled config key is the
|
|
* kill-switch. Seeders and one-shot commands wrap themselves in
|
|
* App\Support\ActivityLog::suppressed(...). activity()->log() becomes
|
|
* a silent no-op while disabled, so no guard is needed here.
|
|
*
|
|
* @param array<string, mixed> $properties
|
|
*/
|
|
public function logSchemaChange(string $event, array $properties = []): void
|
|
{
|
|
// RFC-WS-6 session 2.7: properties land in activity_log.properties
|
|
// (MySQL JSON column). Canonicalize so diff/regression assertions
|
|
// and downstream consumers see byte-stable structure regardless of
|
|
// MySQL key-order normalization on round-trip.
|
|
activity()
|
|
->performedOn($this)
|
|
->withProperties(JsonCanonicalizer::canonicalize($properties))
|
|
->log($event);
|
|
}
|
|
}
|