ahmido
a97beefda3
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
94 lines
2.9 KiB
PHP
94 lines
2.9 KiB
PHP
<?php
|
|
|
|
use App\Jobs\BulkPolicyDeleteJob;
|
|
use App\Jobs\Operations\PolicyBulkDeleteWorkerJob;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Policy;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Services\OperationRunService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Bus;
|
|
|
|
uses(RefreshDatabase::class);
|
|
test('job processes bulk delete successfully', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$user = User::factory()->create();
|
|
|
|
$policies = Policy::factory()->count(3)->create(['tenant_id' => $tenant->id]);
|
|
$policyIds = $policies->pluck('id')->toArray();
|
|
|
|
Bus::fake();
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'policy.delete',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'context' => ['scope' => 'subset', 'policy_ids' => $policyIds],
|
|
'summary_counts' => [],
|
|
]);
|
|
|
|
$job = new BulkPolicyDeleteJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
policyIds: $policyIds,
|
|
operationRun: $run,
|
|
);
|
|
|
|
$job->handle(app(OperationRunService::class));
|
|
|
|
$run->refresh();
|
|
|
|
expect($run->status)->toBe('running');
|
|
expect((int) ($run->summary_counts['total'] ?? 0))->toBe(3);
|
|
|
|
Bus::assertDispatched(PolicyBulkDeleteWorkerJob::class, 3);
|
|
Bus::assertDispatched(PolicyBulkDeleteWorkerJob::class, function (PolicyBulkDeleteWorkerJob $worker) use ($tenant, $user, $policyIds, $run) {
|
|
return $worker->tenantId === (int) $tenant->getKey()
|
|
&& $worker->userId === (int) $user->getKey()
|
|
&& in_array($worker->policyId, $policyIds, true)
|
|
&& $worker->operationRun?->is($run);
|
|
});
|
|
});
|
|
|
|
test('job dispatches workers for all normalized IDs (including missing)', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$user = User::factory()->create();
|
|
|
|
$policies = Policy::factory()->count(2)->create(['tenant_id' => $tenant->id]);
|
|
$policyIds = $policies->pluck('id')->toArray();
|
|
|
|
$policyIds[] = 99999;
|
|
|
|
Bus::fake();
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'policy.delete',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'context' => ['scope' => 'subset', 'policy_ids' => $policyIds],
|
|
'summary_counts' => [],
|
|
]);
|
|
|
|
$job = new BulkPolicyDeleteJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
userId: (int) $user->getKey(),
|
|
policyIds: $policyIds,
|
|
operationRun: $run,
|
|
);
|
|
|
|
$job->handle(app(OperationRunService::class));
|
|
|
|
$run->refresh();
|
|
expect($run->status)->toBe('running');
|
|
expect((int) ($run->summary_counts['total'] ?? 0))->toBe(3);
|
|
|
|
Bus::assertDispatched(PolicyBulkDeleteWorkerJob::class, 3);
|
|
});
|