Kurzbeschreibung Versteckt die Rerun-Row-Action für archivierte (soft-deleted) RestoreRuns und verhindert damit fehlerhafte Neu-Starts aus dem Archiv; ergänzt einen Regressionstest. Änderungen Code: RestoreRunResource.php — Sichtbarkeit der rerun-Action geprüft auf ! $record->trashed() und defensive Abbruchprüfung im Action-Handler. Tests: RestoreRunRerunTest.php — neuer Test rerun action is hidden for archived restore runs. Warum Archivierte RestoreRuns durften nicht neu gestartet werden; UI zeigte trotzdem die Option. Das führte zu verwirrendem Verhalten und möglichen Fehlern beim Enqueueing. Verifikation / QA Unit/Feature: ./vendor/bin/sail artisan test tests/Feature/RestoreRunRerunTest.php Stil/format: ./vendor/bin/pint --dirty Manuell (UI): Als Tenant-Admin Filament → Restore Runs öffnen. Filter Archived aktivieren (oder Trashed filter auswählen). Sicherstellen, dass für archivierte Einträge die Rerun-Action nicht sichtbar ist. Auf einem aktiven (nicht-archivierten) Run prüfen, dass Rerun sichtbar bleibt und wie erwartet eine neue RestoreRun erzeugt. Wichtige Hinweise Kein DB-Migration required. Diese PR enthält nur den UI-/Filament-Fix; die zuvor gemachten operative Fixes für Queue/adapter-Reconciliation bleiben ebenfalls auf dem Branch (z. B. frühere commits während der Debugging-Session). T055 (Schema squash) wurde bewusst zurückgestellt und ist nicht Teil dieses PRs. Merge-Checklist Tests lokal laufen (RestoreRunRerunTest grünt) Pint läuft ohne ungepatchte Fehler Branch gepusht: 056-remove-legacy-bulkops (PR-URL: https://git.cloudarix.de/ahmido/TenantAtlas/compare/dev...056-remove-legacy-bulkops) Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #65
129 lines
4.6 KiB
PHP
129 lines
4.6 KiB
PHP
<?php
|
|
|
|
use App\Jobs\RunInventorySyncJob;
|
|
use App\Models\InventorySyncRun;
|
|
use App\Services\OperationRunService;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Inventory\InventorySyncService;
|
|
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')
|
|
->atLeast()
|
|
->once()
|
|
->andReturn(new GraphResponse(true, [], 200));
|
|
});
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$selectionPayload = $sync->defaultSelectionPayload();
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
$policyTypes = $computed['selection']['policy_types'];
|
|
$run = $sync->createPendingRunForUser($tenant, $user, $computed['selection']);
|
|
|
|
/** @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(),
|
|
inventorySyncRunId: (int) $run->getKey(),
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle($sync, app(AuditLogger::class), $opService);
|
|
|
|
$run->refresh();
|
|
$opRun->refresh();
|
|
|
|
expect($run->user_id)->toBe($user->id);
|
|
expect($run->status)->toBe(InventorySyncRun::STATUS_SUCCESS);
|
|
expect($run->started_at)->not->toBeNull();
|
|
expect($run->finished_at)->not->toBeNull();
|
|
|
|
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);
|
|
});
|
|
|
|
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();
|
|
$run = $sync->createPendingRunForUser($tenant, $user, $selectionPayload);
|
|
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
$policyTypes = $computed['selection']['policy_types'];
|
|
|
|
$run->update(['selection_payload' => $computed['selection']]);
|
|
|
|
/** @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('executePendingRun')
|
|
->once()
|
|
->andReturnUsing(function (InventorySyncRun $inventorySyncRun) {
|
|
$inventorySyncRun->forceFill([
|
|
'status' => InventorySyncRun::STATUS_SKIPPED,
|
|
'error_codes' => ['locked'],
|
|
'selection_payload' => $inventorySyncRun->selection_payload ?? [],
|
|
'started_at' => now(),
|
|
'finished_at' => now(),
|
|
])->save();
|
|
|
|
return $inventorySyncRun;
|
|
});
|
|
|
|
$job = new RunInventorySyncJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
inventorySyncRunId: (int) $run->getKey(),
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle($mockSync, app(AuditLogger::class), $opService);
|
|
|
|
$run->refresh();
|
|
$opRun->refresh();
|
|
|
|
expect($run->status)->toBe(InventorySyncRun::STATUS_SKIPPED);
|
|
|
|
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');
|
|
});
|