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
146 lines
5.2 KiB
PHP
146 lines
5.2 KiB
PHP
<?php
|
|
|
|
use App\Jobs\RunInventorySyncJob;
|
|
use App\Notifications\OperationRunCompleted;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Inventory\InventorySyncService;
|
|
use App\Services\OperationRunService;
|
|
use Mockery\MockInterface;
|
|
|
|
it('executes a pending inventory sync run and updates bulk progress + initiator attribution', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$this->mock(GraphClientInterface::class, function (MockInterface $mock) {
|
|
$mock->shouldReceive('listPolicies')->never();
|
|
});
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$selectionPayload = $sync->defaultSelectionPayload();
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
$policyTypes = $computed['selection']['policy_types'];
|
|
|
|
$mockSync = \Mockery::mock(InventorySyncService::class);
|
|
$mockSync
|
|
->shouldReceive('executeSelection')
|
|
->once()
|
|
->andReturn([
|
|
'status' => 'success',
|
|
'had_errors' => false,
|
|
'error_codes' => [],
|
|
'error_context' => [],
|
|
'errors_count' => 0,
|
|
'items_observed_count' => 0,
|
|
'items_upserted_count' => 0,
|
|
'skipped_policy_types' => [],
|
|
'processed_policy_types' => $computed['selection']['policy_types'],
|
|
'failed_policy_types' => [],
|
|
'selection_hash' => $computed['selection_hash'],
|
|
]);
|
|
|
|
/** @var OperationRunService $opService */
|
|
$opService = app(OperationRunService::class);
|
|
$opRun = $opService->ensureRun(
|
|
tenant: $tenant,
|
|
type: 'inventory.sync',
|
|
inputs: $computed['selection'],
|
|
initiator: $user,
|
|
);
|
|
|
|
$job = new RunInventorySyncJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle($mockSync, app(AuditLogger::class), $opService);
|
|
|
|
$opRun->refresh();
|
|
|
|
expect($opRun->status)->toBe('completed');
|
|
expect($opRun->outcome)->toBe('succeeded');
|
|
|
|
$counts = is_array($opRun->summary_counts) ? $opRun->summary_counts : [];
|
|
expect((int) ($counts['total'] ?? 0))->toBe(count($policyTypes));
|
|
expect((int) ($counts['processed'] ?? 0))->toBe(count($policyTypes));
|
|
expect((int) ($counts['succeeded'] ?? 0))->toBe(count($policyTypes));
|
|
expect((int) ($counts['failed'] ?? 0))->toBe(0);
|
|
|
|
expect($user->notifications()->count())->toBe(1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->getKey(),
|
|
'notifiable_type' => $user->getMorphClass(),
|
|
'type' => OperationRunCompleted::class,
|
|
'data->title' => 'Inventory sync completed',
|
|
]);
|
|
});
|
|
|
|
it('maps skipped inventory sync runs to bulk progress as skipped with reason', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$selectionPayload = $sync->defaultSelectionPayload();
|
|
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
$policyTypes = $computed['selection']['policy_types'];
|
|
|
|
/** @var OperationRunService $opService */
|
|
$opService = app(OperationRunService::class);
|
|
$opRun = $opService->ensureRun(
|
|
tenant: $tenant,
|
|
type: 'inventory.sync',
|
|
inputs: $computed['selection'],
|
|
initiator: $user,
|
|
);
|
|
|
|
$mockSync = \Mockery::mock(InventorySyncService::class);
|
|
$mockSync
|
|
->shouldReceive('executeSelection')
|
|
->once()
|
|
->andReturn([
|
|
'status' => 'skipped',
|
|
'had_errors' => true,
|
|
'error_codes' => ['locked'],
|
|
'error_context' => [],
|
|
'errors_count' => 0,
|
|
'items_observed_count' => 0,
|
|
'items_upserted_count' => 0,
|
|
'skipped_policy_types' => $computed['selection']['policy_types'],
|
|
'processed_policy_types' => [],
|
|
'failed_policy_types' => [],
|
|
'selection_hash' => $computed['selection_hash'],
|
|
]);
|
|
|
|
$job = new RunInventorySyncJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle($mockSync, app(AuditLogger::class), $opService);
|
|
|
|
$opRun->refresh();
|
|
|
|
expect($opRun->status)->toBe('completed');
|
|
expect($opRun->outcome)->toBe('failed');
|
|
|
|
$counts = is_array($opRun->summary_counts) ? $opRun->summary_counts : [];
|
|
expect((int) ($counts['processed'] ?? 0))->toBe(count($policyTypes));
|
|
expect((int) ($counts['skipped'] ?? 0))->toBe(count($policyTypes));
|
|
expect((int) ($counts['succeeded'] ?? 0))->toBe(0);
|
|
expect((int) ($counts['failed'] ?? 0))->toBe(0);
|
|
|
|
$failures = is_array($opRun->failure_summary) ? $opRun->failure_summary : [];
|
|
expect($failures)->toBeArray();
|
|
expect($failures[0]['code'] ?? null)->toBe('inventory.skipped');
|
|
expect($failures[0]['message'] ?? null)->toBe('locked');
|
|
|
|
expect($user->notifications()->count())->toBe(1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->getKey(),
|
|
'notifiable_type' => $user->getMorphClass(),
|
|
'type' => OperationRunCompleted::class,
|
|
'data->title' => 'Inventory sync failed',
|
|
]);
|
|
});
|