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
93 lines
3.0 KiB
PHP
93 lines
3.0 KiB
PHP
<?php
|
|
|
|
use App\Models\BackupSchedule;
|
|
use App\Models\BackupScheduleRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('reconciles completed backup schedule runs into operation runs', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
|
|
$schedule = BackupSchedule::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Daily',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '10:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
'last_run_at' => null,
|
|
'last_run_status' => null,
|
|
'next_run_at' => null,
|
|
]);
|
|
|
|
$startedAt = CarbonImmutable::parse('2026-01-01 00:00:00', 'UTC');
|
|
$finishedAt = CarbonImmutable::parse('2026-01-01 00:00:05', 'UTC');
|
|
|
|
$scheduleRun = BackupScheduleRun::create([
|
|
'backup_schedule_id' => $schedule->id,
|
|
'tenant_id' => $tenant->id,
|
|
'scheduled_for' => CarbonImmutable::parse('2026-01-01 00:00:00', 'UTC'),
|
|
'started_at' => $startedAt,
|
|
'finished_at' => $finishedAt,
|
|
'status' => BackupScheduleRun::STATUS_SUCCESS,
|
|
'summary' => [
|
|
'policies_total' => 5,
|
|
'policies_backed_up' => 18,
|
|
'sync_failures' => [],
|
|
],
|
|
'error_code' => null,
|
|
'error_message' => null,
|
|
'backup_set_id' => null,
|
|
]);
|
|
|
|
$operationRun = OperationRun::create([
|
|
'tenant_id' => $tenant->id,
|
|
'user_id' => null,
|
|
'initiator_name' => 'System',
|
|
'type' => 'backup_schedule.run_now',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'run_identity_hash' => hash('sha256', 'backup_schedule.run_now|'.$scheduleRun->id),
|
|
'summary_counts' => [],
|
|
'failure_summary' => [],
|
|
'context' => [
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'backup_schedule_run_id' => (int) $scheduleRun->id,
|
|
],
|
|
]);
|
|
|
|
$this->artisan('tenantpilot:operation-runs:reconcile-backup-schedules', [
|
|
'--tenant' => [$tenant->id],
|
|
'--older-than' => 0,
|
|
])->assertSuccessful();
|
|
|
|
$operationRun->refresh();
|
|
|
|
expect($operationRun->status)->toBe('completed');
|
|
expect($operationRun->outcome)->toBe('succeeded');
|
|
expect($operationRun->failure_summary)->toBe([]);
|
|
|
|
expect($operationRun->started_at?->format('Y-m-d H:i:s'))->toBe($startedAt->format('Y-m-d H:i:s'));
|
|
expect($operationRun->completed_at?->format('Y-m-d H:i:s'))->toBe($finishedAt->format('Y-m-d H:i:s'));
|
|
|
|
expect($operationRun->context)->toMatchArray([
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'backup_schedule_run_id' => (int) $scheduleRun->id,
|
|
]);
|
|
|
|
expect($operationRun->summary_counts)->toMatchArray([
|
|
'total' => 5,
|
|
'processed' => 5,
|
|
'succeeded' => 18,
|
|
'items' => 5,
|
|
]);
|
|
});
|