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
159 lines
5.3 KiB
PHP
159 lines
5.3 KiB
PHP
<?php
|
|
|
|
use App\Jobs\GenerateDriftFindingsJob;
|
|
use App\Models\InventorySyncRun;
|
|
use App\Models\OperationRun;
|
|
use App\Notifications\OperationRunCompleted;
|
|
use App\Services\Drift\DriftFindingGenerator;
|
|
use App\Services\OperationRunService;
|
|
use App\Services\Operations\TargetScopeConcurrencyLimiter;
|
|
use App\Support\OperationRunLinks;
|
|
use Mockery\MockInterface;
|
|
|
|
test('drift generation job sends completion notification with view link', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'manager');
|
|
|
|
config()->set('tenantpilot.bulk_operations.concurrency.per_target_scope_max', 1);
|
|
|
|
$scopeKey = hash('sha256', 'scope-job-notification-success');
|
|
|
|
$baseline = InventorySyncRun::factory()->for($tenant)->create([
|
|
'selection_hash' => $scopeKey,
|
|
'status' => InventorySyncRun::STATUS_SUCCESS,
|
|
'finished_at' => now()->subDays(2),
|
|
]);
|
|
|
|
$current = InventorySyncRun::factory()->for($tenant)->create([
|
|
'selection_hash' => $scopeKey,
|
|
'status' => InventorySyncRun::STATUS_SUCCESS,
|
|
'finished_at' => now()->subDay(),
|
|
]);
|
|
|
|
$opRun = OperationRun::create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'drift.generate',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'run_identity_hash' => 'drift-hash-1',
|
|
'context' => [
|
|
'target_scope' => [
|
|
'entra_tenant_id' => 'entra-1',
|
|
],
|
|
'scope_key' => $scopeKey,
|
|
'baseline_run_id' => (int) $baseline->getKey(),
|
|
'current_run_id' => (int) $current->getKey(),
|
|
],
|
|
]);
|
|
|
|
$this->mock(DriftFindingGenerator::class, function (MockInterface $mock) {
|
|
$mock->shouldReceive('generate')->once()->andReturn(0);
|
|
});
|
|
|
|
$job = new GenerateDriftFindingsJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
baselineRunId: (int) $baseline->getKey(),
|
|
currentRunId: (int) $current->getKey(),
|
|
scopeKey: $scopeKey,
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle(
|
|
app(DriftFindingGenerator::class),
|
|
app(OperationRunService::class),
|
|
app(TargetScopeConcurrencyLimiter::class),
|
|
);
|
|
|
|
$opRun->refresh();
|
|
expect($opRun->status)->toBe('completed');
|
|
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->getKey(),
|
|
'notifiable_type' => $user->getMorphClass(),
|
|
'type' => OperationRunCompleted::class,
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::view($opRun, $tenant));
|
|
});
|
|
|
|
test('drift generation job sends failure notification with view link', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'manager');
|
|
|
|
config()->set('tenantpilot.bulk_operations.concurrency.per_target_scope_max', 1);
|
|
|
|
$scopeKey = hash('sha256', 'scope-job-notification-failure');
|
|
|
|
$baseline = InventorySyncRun::factory()->for($tenant)->create([
|
|
'selection_hash' => $scopeKey,
|
|
'status' => InventorySyncRun::STATUS_SUCCESS,
|
|
'finished_at' => now()->subDays(2),
|
|
]);
|
|
|
|
$current = InventorySyncRun::factory()->for($tenant)->create([
|
|
'selection_hash' => $scopeKey,
|
|
'status' => InventorySyncRun::STATUS_SUCCESS,
|
|
'finished_at' => now()->subDay(),
|
|
]);
|
|
|
|
$opRun = OperationRun::create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'drift.generate',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'run_identity_hash' => 'drift-hash-2',
|
|
'context' => [
|
|
'target_scope' => [
|
|
'entra_tenant_id' => 'entra-1',
|
|
],
|
|
'scope_key' => $scopeKey,
|
|
'baseline_run_id' => (int) $baseline->getKey(),
|
|
'current_run_id' => (int) $current->getKey(),
|
|
],
|
|
]);
|
|
|
|
$this->mock(DriftFindingGenerator::class, function (MockInterface $mock) {
|
|
$mock->shouldReceive('generate')->once()->andThrow(new \RuntimeException('boom'));
|
|
});
|
|
|
|
$job = new GenerateDriftFindingsJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
baselineRunId: (int) $baseline->getKey(),
|
|
currentRunId: (int) $current->getKey(),
|
|
scopeKey: $scopeKey,
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
try {
|
|
$job->handle(
|
|
app(DriftFindingGenerator::class),
|
|
app(OperationRunService::class),
|
|
app(TargetScopeConcurrencyLimiter::class),
|
|
);
|
|
} catch (\RuntimeException) {
|
|
// Expected.
|
|
}
|
|
|
|
$opRun->refresh();
|
|
expect($opRun->status)->toBe('completed')
|
|
->and($opRun->outcome)->toBe('failed');
|
|
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->getKey(),
|
|
'notifiable_type' => $user->getMorphClass(),
|
|
'type' => OperationRunCompleted::class,
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::view($opRun, $tenant));
|
|
});
|