Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
70 lines
2.3 KiB
PHP
70 lines
2.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Jobs\ExecuteRestoreRunJob;
|
|
use App\Models\OperationRun;
|
|
use App\Models\RestoreRun;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Intune\RestoreService;
|
|
use App\Services\OperationRunService;
|
|
|
|
it('syncs restore execution into OperationRun even if restore status updates bypass model events', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$backupSet = \App\Models\BackupSet::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
]);
|
|
|
|
$restoreRun = RestoreRun::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'status' => 'queued',
|
|
'started_at' => null,
|
|
'completed_at' => null,
|
|
]);
|
|
|
|
// Canonical OperationRun must exist at dispatch time and be passed into the job.
|
|
$operationRun = app(OperationRunService::class)->ensureRun(
|
|
tenant: $tenant,
|
|
type: 'restore.execute',
|
|
inputs: [
|
|
'restore_run_id' => $restoreRun->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'is_dry_run' => (bool) ($restoreRun->is_dry_run ?? false),
|
|
],
|
|
initiator: $user,
|
|
);
|
|
|
|
expect($operationRun)->not->toBeNull();
|
|
expect($operationRun?->status)->toBe('queued');
|
|
|
|
// Simulate downstream code updating RestoreRun status via query builder (no model events).
|
|
$this->mock(RestoreService::class, function ($mock) use ($restoreRun): void {
|
|
$mock->shouldReceive('executeForRun')
|
|
->once()
|
|
->andReturnUsing(function () use ($restoreRun): RestoreRun {
|
|
RestoreRun::query()->whereKey($restoreRun->id)->update([
|
|
'status' => 'completed',
|
|
'completed_at' => now(),
|
|
]);
|
|
|
|
return RestoreRun::query()->findOrFail($restoreRun->id);
|
|
});
|
|
});
|
|
|
|
$job = new ExecuteRestoreRunJob($restoreRun->id, null, null, $operationRun);
|
|
$job->handle(
|
|
app(RestoreService::class),
|
|
app(AuditLogger::class),
|
|
);
|
|
|
|
$operationRun = $operationRun?->fresh();
|
|
|
|
expect($operationRun)->not->toBeNull();
|
|
expect($operationRun?->status)->toBe('completed');
|
|
expect($operationRun?->outcome)->toBe('succeeded');
|
|
expect($operationRun?->completed_at)->not->toBeNull();
|
|
})->group('ops-ux');
|