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
119 lines
3.7 KiB
PHP
119 lines
3.7 KiB
PHP
<?php
|
|
|
|
use App\Jobs\BulkRestoreRunRestoreJob;
|
|
use App\Models\BackupSet;
|
|
use App\Models\OperationRun;
|
|
use App\Models\RestoreRun;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Services\OperationRunService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
test('bulk restore run restore restores archived runs', function () {
|
|
$tenant = Tenant::factory()->create(['is_current' => true]);
|
|
$user = User::factory()->create();
|
|
|
|
$backupSet = BackupSet::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Backup',
|
|
'status' => 'completed',
|
|
'item_count' => 0,
|
|
]);
|
|
|
|
$restoreRun = RestoreRun::create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'status' => 'completed',
|
|
'is_dry_run' => true,
|
|
'requested_by' => 'tester@example.com',
|
|
]);
|
|
|
|
$restoreRun->delete();
|
|
expect($restoreRun->trashed())->toBeTrue();
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'user_id' => $user->id,
|
|
'type' => 'restore_run.restore',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'summary_counts' => [],
|
|
'failure_summary' => [],
|
|
'context' => [
|
|
'target_scope' => ['directory_context_id' => 1],
|
|
],
|
|
]);
|
|
|
|
(new BulkRestoreRunRestoreJob(
|
|
tenantId: $tenant->id,
|
|
userId: $user->id,
|
|
restoreRunIds: [$restoreRun->id],
|
|
operationRun: $run,
|
|
))->handle(app(OperationRunService::class));
|
|
|
|
$restoreRun->refresh();
|
|
expect($restoreRun->trashed())->toBeFalse();
|
|
|
|
$run->refresh();
|
|
expect($run->status)->toBe('completed')
|
|
->and($run->outcome)->toBe('succeeded')
|
|
->and($run->summary_counts['total'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['processed'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['succeeded'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['skipped'] ?? null)->toBe(0)
|
|
->and($run->summary_counts['failed'] ?? null)->toBe(0);
|
|
});
|
|
|
|
test('bulk restore run restore skips active runs', function () {
|
|
$tenant = Tenant::factory()->create(['is_current' => true]);
|
|
$user = User::factory()->create();
|
|
|
|
$backupSet = BackupSet::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Backup',
|
|
'status' => 'completed',
|
|
'item_count' => 0,
|
|
]);
|
|
|
|
$restoreRun = RestoreRun::create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'status' => 'completed',
|
|
'is_dry_run' => true,
|
|
'requested_by' => 'tester@example.com',
|
|
]);
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'user_id' => $user->id,
|
|
'type' => 'restore_run.restore',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'summary_counts' => [],
|
|
'failure_summary' => [],
|
|
'context' => [
|
|
'target_scope' => ['directory_context_id' => 1],
|
|
],
|
|
]);
|
|
|
|
(new BulkRestoreRunRestoreJob(
|
|
tenantId: $tenant->id,
|
|
userId: $user->id,
|
|
restoreRunIds: [$restoreRun->id],
|
|
operationRun: $run,
|
|
))->handle(app(OperationRunService::class));
|
|
|
|
$restoreRun->refresh();
|
|
expect($restoreRun->trashed())->toBeFalse();
|
|
|
|
$run->refresh();
|
|
expect($run->status)->toBe('completed')
|
|
->and($run->outcome)->toBe('succeeded')
|
|
->and($run->summary_counts['total'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['processed'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['succeeded'] ?? null)->toBe(0)
|
|
->and($run->summary_counts['skipped'] ?? null)->toBe(1)
|
|
->and($run->summary_counts['failed'] ?? null)->toBe(0);
|
|
});
|