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
385 lines
13 KiB
PHP
385 lines
13 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\BackupScheduleResource\Pages\ListBackupSchedules;
|
|
use App\Jobs\RunBackupScheduleJob;
|
|
use App\Models\BackupSchedule;
|
|
use App\Models\BackupScheduleRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\User;
|
|
use App\Notifications\OperationRunQueued;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Support\OperationRunLinks;
|
|
use Carbon\CarbonImmutable;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Queue;
|
|
use Livewire\Livewire;
|
|
|
|
beforeEach(function () {
|
|
$this->mock(GraphClientInterface::class, function ($mock): void {
|
|
$mock->shouldReceive('listPolicies')->never();
|
|
$mock->shouldReceive('getPolicy')->never();
|
|
$mock->shouldReceive('getOrganization')->never();
|
|
$mock->shouldReceive('applyPolicy')->never();
|
|
$mock->shouldReceive('getServicePrincipalPermissions')->never();
|
|
$mock->shouldReceive('request')->never();
|
|
});
|
|
});
|
|
|
|
test('operator can run now and it persists a database notification', function () {
|
|
Queue::fake([RunBackupScheduleJob::class]);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator');
|
|
|
|
$schedule = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableAction('runNow', $schedule);
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $schedule->id)->count())
|
|
->toBe(1);
|
|
|
|
$run = BackupScheduleRun::query()->where('backup_schedule_id', $schedule->id)->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->user_id)->toBe($user->id);
|
|
|
|
$operationRun = OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('type', 'backup_schedule.run_now')
|
|
->first();
|
|
|
|
expect($operationRun)->not->toBeNull();
|
|
expect($operationRun->context)->toMatchArray([
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'backup_schedule_run_id' => (int) $run->id,
|
|
]);
|
|
|
|
Queue::assertPushed(RunBackupScheduleJob::class, function (RunBackupScheduleJob $job) use ($run, $operationRun): bool {
|
|
return $job->backupScheduleRunId === (int) $run->id
|
|
&& $job->operationRun instanceof OperationRun
|
|
&& $job->operationRun->is($operationRun);
|
|
});
|
|
|
|
$this->assertDatabaseCount('notifications', 1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->id,
|
|
'notifiable_type' => User::class,
|
|
'type' => OperationRunQueued::class,
|
|
'data->format' => 'filament',
|
|
'data->title' => 'Backup schedule run queued',
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::view($operationRun, $tenant));
|
|
});
|
|
|
|
test('operator can retry and it persists a database notification', function () {
|
|
Queue::fake([RunBackupScheduleJob::class]);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator');
|
|
|
|
$schedule = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableAction('retry', $schedule);
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $schedule->id)->count())
|
|
->toBe(1);
|
|
|
|
$run = BackupScheduleRun::query()->where('backup_schedule_id', $schedule->id)->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->user_id)->toBe($user->id);
|
|
|
|
$operationRun = OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('type', 'backup_schedule.retry')
|
|
->first();
|
|
|
|
expect($operationRun)->not->toBeNull();
|
|
expect($operationRun->context)->toMatchArray([
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'backup_schedule_run_id' => (int) $run->id,
|
|
]);
|
|
|
|
Queue::assertPushed(RunBackupScheduleJob::class, function (RunBackupScheduleJob $job) use ($run, $operationRun): bool {
|
|
return $job->backupScheduleRunId === (int) $run->id
|
|
&& $job->operationRun instanceof OperationRun
|
|
&& $job->operationRun->is($operationRun);
|
|
});
|
|
$this->assertDatabaseCount('notifications', 1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->id,
|
|
'notifiable_type' => User::class,
|
|
'type' => OperationRunQueued::class,
|
|
'data->format' => 'filament',
|
|
'data->title' => 'Backup schedule retry queued',
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::view($operationRun, $tenant));
|
|
});
|
|
|
|
test('readonly cannot dispatch run now or retry', function () {
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
|
|
$schedule = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
try {
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableAction('runNow', $schedule);
|
|
} catch (\Throwable) {
|
|
// Action should be hidden/blocked for readonly users.
|
|
}
|
|
|
|
try {
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableAction('retry', $schedule);
|
|
} catch (\Throwable) {
|
|
// Action should be hidden/blocked for readonly users.
|
|
}
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $schedule->id)->count())
|
|
->toBe(0);
|
|
|
|
expect(OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->whereIn('type', ['backup_schedule.run_now', 'backup_schedule.retry'])
|
|
->count())
|
|
->toBe(0);
|
|
});
|
|
|
|
test('operator can bulk run now and it persists a database notification', function () {
|
|
Queue::fake([RunBackupScheduleJob::class]);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator');
|
|
|
|
$scheduleA = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly A',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$scheduleB = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly B',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '02:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableBulkAction('bulk_run_now', collect([$scheduleA, $scheduleB]));
|
|
|
|
expect(BackupScheduleRun::query()->whereIn('backup_schedule_id', [$scheduleA->id, $scheduleB->id])->count())
|
|
->toBe(2);
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleA->id)->value('user_id'))->toBe($user->id);
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleB->id)->value('user_id'))->toBe($user->id);
|
|
|
|
expect(OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('type', 'backup_schedule.run_now')
|
|
->count())
|
|
->toBe(2);
|
|
|
|
Queue::assertPushed(RunBackupScheduleJob::class, 2);
|
|
$this->assertDatabaseCount('notifications', 1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->id,
|
|
'data->format' => 'filament',
|
|
'data->title' => 'Runs dispatched',
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::index($tenant));
|
|
});
|
|
|
|
test('operator can bulk retry and it persists a database notification', function () {
|
|
Queue::fake([RunBackupScheduleJob::class]);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator');
|
|
|
|
$scheduleA = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly A',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$scheduleB = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly B',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '02:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableBulkAction('bulk_retry', collect([$scheduleA, $scheduleB]));
|
|
|
|
expect(BackupScheduleRun::query()->whereIn('backup_schedule_id', [$scheduleA->id, $scheduleB->id])->count())
|
|
->toBe(2);
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleA->id)->value('user_id'))->toBe($user->id);
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleB->id)->value('user_id'))->toBe($user->id);
|
|
|
|
expect(OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('type', 'backup_schedule.retry')
|
|
->count())
|
|
->toBe(2);
|
|
|
|
Queue::assertPushed(RunBackupScheduleJob::class, 2);
|
|
$this->assertDatabaseCount('notifications', 1);
|
|
$this->assertDatabaseHas('notifications', [
|
|
'notifiable_id' => $user->id,
|
|
'data->format' => 'filament',
|
|
'data->title' => 'Retries dispatched',
|
|
]);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
expect($notification->data['actions'][0]['url'] ?? null)
|
|
->toBe(OperationRunLinks::index($tenant));
|
|
});
|
|
|
|
test('operator can bulk retry even if a run already exists for this minute', function () {
|
|
Queue::fake([RunBackupScheduleJob::class]);
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator');
|
|
|
|
$scheduleA = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly A',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '01:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$scheduleB = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Nightly B',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '02:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
]);
|
|
|
|
$scheduledFor = CarbonImmutable::now('UTC')->startOfMinute();
|
|
BackupScheduleRun::query()->create([
|
|
'backup_schedule_id' => $scheduleA->id,
|
|
'tenant_id' => $tenant->id,
|
|
'scheduled_for' => $scheduledFor->toDateTimeString(),
|
|
'status' => BackupScheduleRun::STATUS_RUNNING,
|
|
'summary' => null,
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListBackupSchedules::class)
|
|
->callTableBulkAction('bulk_retry', collect([$scheduleA, $scheduleB]));
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleA->id)->count())
|
|
->toBe(2);
|
|
|
|
$newRunA = BackupScheduleRun::query()
|
|
->where('backup_schedule_id', $scheduleA->id)
|
|
->orderByDesc('id')
|
|
->first();
|
|
|
|
expect($newRunA)->not->toBeNull();
|
|
expect($newRunA->scheduled_for->setTimezone('UTC')->toDateTimeString())
|
|
->toBe($scheduledFor->addMinute()->toDateTimeString());
|
|
|
|
expect(BackupScheduleRun::query()->where('backup_schedule_id', $scheduleB->id)->count())
|
|
->toBe(1);
|
|
|
|
Queue::assertPushed(RunBackupScheduleJob::class, 2);
|
|
});
|