ahmido
8426741068
## Summary - add explicit BaselineSnapshot lifecycle truth with conservative backfill and a shared truth resolver - block baseline compare from building, incomplete, or superseded snapshots and align workspace/tenant UI truth surfaces with effective snapshot state - surface artifact truth separately from operation outcome across baseline profile, snapshot, compare, and operation run pages ## Testing - integrated browser smoke test on the active feature surfaces - `vendor/bin/sail artisan test --compact tests/Feature/Filament/BaselineSnapshotTruthSurfaceTest.php tests/Feature/Filament/BaselineProfileCompareStartSurfaceTest.php` - targeted baseline lifecycle and compare guard coverage added in Pest - `vendor/bin/sail bin pint --dirty --format agent` ## Notes - Livewire v4 compliance preserved - no panel provider registration changes were needed; Laravel 12 providers remain in `bootstrap/providers.php` - global search remains disabled for the affected baseline resources by design - destructive actions remain confirmation-gated; capture and compare actions keep their existing authorization and confirmation behavior - no new panel assets were added; existing deploy flow for `filament:assets` is unchanged Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #189
296 lines
10 KiB
PHP
296 lines
10 KiB
PHP
<?php
|
|
|
|
use App\Jobs\CompareBaselineToTenantJob;
|
|
use App\Models\BaselineProfile;
|
|
use App\Models\BaselineSnapshot;
|
|
use App\Models\BaselineTenantAssignment;
|
|
use App\Models\OperationRun;
|
|
use App\Services\Baselines\BaselineCompareService;
|
|
use App\Support\Baselines\BaselineProfileStatus;
|
|
use App\Support\Baselines\BaselineReasonCodes;
|
|
use App\Support\OperationRunType;
|
|
use Illuminate\Support\Facades\Queue;
|
|
|
|
// --- T040: Compare precondition 422 tests ---
|
|
|
|
it('rejects compare when tenant has no baseline assignment', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_NO_ASSIGNMENT);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
expect(OperationRun::query()->where('type', OperationRunType::BaselineCompare->value)->count())->toBe(0);
|
|
});
|
|
|
|
it('rejects compare when assigned profile is in draft status', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'status' => BaselineProfileStatus::Draft->value,
|
|
]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_PROFILE_NOT_ACTIVE);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
expect(OperationRun::query()->where('type', OperationRunType::BaselineCompare->value)->count())->toBe(0);
|
|
});
|
|
|
|
it('rejects compare when assigned profile is archived [EC-001]', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->archived()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_PROFILE_NOT_ACTIVE);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
expect(OperationRun::query()->where('type', OperationRunType::BaselineCompare->value)->count())->toBe(0);
|
|
});
|
|
|
|
it('rejects compare when profile has no consumable snapshot', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'active_snapshot_id' => null,
|
|
]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_NO_CONSUMABLE_SNAPSHOT);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
expect(OperationRun::query()->where('type', OperationRunType::BaselineCompare->value)->count())->toBe(0);
|
|
});
|
|
|
|
it('rejects compare when the latest attempted snapshot is still building and no complete snapshot exists', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'active_snapshot_id' => null,
|
|
]);
|
|
|
|
BaselineSnapshot::factory()->building()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_SNAPSHOT_BUILDING);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
});
|
|
|
|
it('rejects explicit snapshot overrides when the snapshot is historically superseded', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'scope_jsonb' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
]);
|
|
|
|
$historicalSnapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
'captured_at' => now()->subHour(),
|
|
'completed_at' => now()->subHour(),
|
|
]);
|
|
|
|
$currentSnapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
'captured_at' => now(),
|
|
'completed_at' => now(),
|
|
]);
|
|
|
|
$profile->update(['active_snapshot_id' => $currentSnapshot->getKey()]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user, baselineSnapshotId: (int) $historicalSnapshot->getKey());
|
|
|
|
expect($result['ok'])->toBeFalse();
|
|
expect($result['reason_code'])->toBe(BaselineReasonCodes::COMPARE_SNAPSHOT_SUPERSEDED);
|
|
|
|
Queue::assertNotPushed(CompareBaselineToTenantJob::class);
|
|
});
|
|
|
|
it('enqueues compare successfully when all preconditions are met', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'scope_jsonb' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
]);
|
|
|
|
$snapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
]);
|
|
|
|
$profile->update(['active_snapshot_id' => $snapshot->getKey()]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user);
|
|
|
|
expect($result['ok'])->toBeTrue();
|
|
expect($result)->toHaveKey('run');
|
|
|
|
/** @var OperationRun $run */
|
|
$run = $result['run'];
|
|
expect($run->type)->toBe(OperationRunType::BaselineCompare->value);
|
|
expect($run->status)->toBe('queued');
|
|
|
|
$context = is_array($run->context) ? $run->context : [];
|
|
expect($context['baseline_profile_id'])->toBe((int) $profile->getKey());
|
|
expect($context['baseline_snapshot_id'])->toBe((int) $snapshot->getKey());
|
|
|
|
Queue::assertPushed(CompareBaselineToTenantJob::class);
|
|
});
|
|
|
|
it('uses an explicit snapshot override instead of baseline_profiles.active_snapshot_id when provided', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'scope_jsonb' => ['policy_types' => ['deviceConfiguration'], 'foundation_types' => []],
|
|
]);
|
|
|
|
$activeSnapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
]);
|
|
|
|
$overrideSnapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
]);
|
|
|
|
$profile->update(['active_snapshot_id' => $activeSnapshot->getKey()]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
$result = $service->startCompare($tenant, $user, baselineSnapshotId: (int) $overrideSnapshot->getKey());
|
|
|
|
expect($result['ok'])->toBeTrue();
|
|
|
|
/** @var OperationRun $run */
|
|
$run = $result['run'];
|
|
$context = is_array($run->context) ? $run->context : [];
|
|
|
|
expect($context['baseline_snapshot_id'])->toBe((int) $overrideSnapshot->getKey());
|
|
|
|
Queue::assertPushed(CompareBaselineToTenantJob::class);
|
|
});
|
|
|
|
// --- EC-004: Concurrent compare reuses active run ---
|
|
|
|
it('reuses an existing active run for the same profile/tenant instead of creating a new one [EC-004]', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$profile = BaselineProfile::factory()->active()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
]);
|
|
|
|
$snapshot = BaselineSnapshot::factory()->create([
|
|
'workspace_id' => $tenant->workspace_id,
|
|
'baseline_profile_id' => $profile->getKey(),
|
|
]);
|
|
|
|
$profile->update(['active_snapshot_id' => $snapshot->getKey()]);
|
|
|
|
BaselineTenantAssignment::create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'baseline_profile_id' => (int) $profile->getKey(),
|
|
]);
|
|
|
|
$service = app(BaselineCompareService::class);
|
|
|
|
$result1 = $service->startCompare($tenant, $user);
|
|
$result2 = $service->startCompare($tenant, $user);
|
|
|
|
expect($result1['ok'])->toBeTrue();
|
|
expect($result2['ok'])->toBeTrue();
|
|
expect($result1['run']->getKey())->toBe($result2['run']->getKey());
|
|
expect(OperationRun::query()->where('type', OperationRunType::BaselineCompare->value)->count())->toBe(1);
|
|
});
|