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
203 lines
6.6 KiB
PHP
203 lines
6.6 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Listeners\SyncRestoreRunToOperationRun;
|
|
use App\Models\RestoreRun;
|
|
use App\Models\User;
|
|
use App\Notifications\RunStatusChangedNotification;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Intune\RestoreService;
|
|
use App\Support\OpsUx\RunFailureSanitizer;
|
|
use App\Support\RestoreRunStatus;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Throwable;
|
|
|
|
class ExecuteRestoreRunJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
public function __construct(
|
|
public int $restoreRunId,
|
|
public ?string $actorEmail = null,
|
|
public ?string $actorName = null,
|
|
) {}
|
|
|
|
public function handle(RestoreService $restoreService, AuditLogger $auditLogger): void
|
|
{
|
|
$restoreRun = RestoreRun::with(['tenant', 'backupSet'])->find($this->restoreRunId);
|
|
|
|
if (! $restoreRun) {
|
|
return;
|
|
}
|
|
|
|
if ($restoreRun->status !== RestoreRunStatus::Queued->value) {
|
|
return;
|
|
}
|
|
|
|
$this->notifyStatus($restoreRun, 'queued');
|
|
app(SyncRestoreRunToOperationRun::class)->handle($restoreRun);
|
|
|
|
$tenant = $restoreRun->tenant;
|
|
$backupSet = $restoreRun->backupSet;
|
|
|
|
if (! $tenant || ! $backupSet || $backupSet->trashed()) {
|
|
$restoreRun->update([
|
|
'status' => RestoreRunStatus::Failed->value,
|
|
'failure_reason' => 'Backup set is archived or unavailable.',
|
|
'completed_at' => CarbonImmutable::now(),
|
|
]);
|
|
|
|
app(SyncRestoreRunToOperationRun::class)->handle($restoreRun->refresh());
|
|
|
|
$this->notifyStatus($restoreRun->refresh(), 'failed');
|
|
|
|
if ($tenant) {
|
|
$auditLogger->log(
|
|
tenant: $tenant,
|
|
action: 'restore.failed',
|
|
context: [
|
|
'metadata' => [
|
|
'restore_run_id' => $restoreRun->id,
|
|
'backup_set_id' => $restoreRun->backup_set_id,
|
|
'reason' => 'Backup set is archived or unavailable.',
|
|
],
|
|
],
|
|
actorEmail: $this->actorEmail,
|
|
actorName: $this->actorName,
|
|
resourceType: 'restore_run',
|
|
resourceId: (string) $restoreRun->id,
|
|
status: 'failed',
|
|
);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
$restoreRun->update([
|
|
'status' => RestoreRunStatus::Running->value,
|
|
'started_at' => CarbonImmutable::now(),
|
|
'failure_reason' => null,
|
|
]);
|
|
|
|
// Keep the canonical Monitoring/Operations adapter row in sync even if downstream
|
|
// code performs restore-run updates without firing model events.
|
|
app(SyncRestoreRunToOperationRun::class)->handle($restoreRun->refresh());
|
|
|
|
$this->notifyStatus($restoreRun->refresh(), 'running');
|
|
|
|
$auditLogger->log(
|
|
tenant: $tenant,
|
|
action: 'restore.started',
|
|
context: [
|
|
'metadata' => [
|
|
'restore_run_id' => $restoreRun->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
],
|
|
],
|
|
actorEmail: $this->actorEmail,
|
|
actorName: $this->actorName,
|
|
resourceType: 'restore_run',
|
|
resourceId: (string) $restoreRun->id,
|
|
status: 'success',
|
|
);
|
|
|
|
try {
|
|
$restoreService->executeForRun(
|
|
restoreRun: $restoreRun,
|
|
tenant: $tenant,
|
|
backupSet: $backupSet,
|
|
actorEmail: $this->actorEmail,
|
|
actorName: $this->actorName,
|
|
);
|
|
|
|
app(SyncRestoreRunToOperationRun::class)->handle($restoreRun->refresh());
|
|
|
|
$this->notifyStatus($restoreRun->refresh(), (string) $restoreRun->status);
|
|
} catch (Throwable $throwable) {
|
|
$restoreRun->refresh();
|
|
|
|
$safeReason = RunFailureSanitizer::sanitizeMessage($throwable->getMessage());
|
|
|
|
if ($restoreRun->status === RestoreRunStatus::Running->value) {
|
|
$restoreRun->update([
|
|
'status' => RestoreRunStatus::Failed->value,
|
|
'failure_reason' => $safeReason,
|
|
'completed_at' => CarbonImmutable::now(),
|
|
]);
|
|
}
|
|
|
|
app(SyncRestoreRunToOperationRun::class)->handle($restoreRun->refresh());
|
|
|
|
$this->notifyStatus($restoreRun->refresh(), (string) $restoreRun->status);
|
|
|
|
if ($tenant) {
|
|
$auditLogger->log(
|
|
tenant: $tenant,
|
|
action: 'restore.failed',
|
|
context: [
|
|
'metadata' => [
|
|
'restore_run_id' => $restoreRun->id,
|
|
'backup_set_id' => $backupSet->id,
|
|
'reason' => $safeReason,
|
|
],
|
|
],
|
|
actorEmail: $this->actorEmail,
|
|
actorName: $this->actorName,
|
|
resourceType: 'restore_run',
|
|
resourceId: (string) $restoreRun->id,
|
|
status: 'failed',
|
|
);
|
|
}
|
|
|
|
throw $throwable;
|
|
}
|
|
}
|
|
|
|
private function notifyStatus(RestoreRun $restoreRun, string $status): void
|
|
{
|
|
$email = $this->actorEmail;
|
|
|
|
if (! is_string($email) || $email === '') {
|
|
$email = is_string($restoreRun->requested_by) ? $restoreRun->requested_by : null;
|
|
}
|
|
|
|
if (! is_string($email) || $email === '') {
|
|
return;
|
|
}
|
|
|
|
$user = User::query()->where('email', $email)->first();
|
|
|
|
if (! $user) {
|
|
return;
|
|
}
|
|
|
|
$metadata = is_array($restoreRun->metadata) ? $restoreRun->metadata : [];
|
|
$counts = [];
|
|
|
|
foreach (['total', 'succeeded', 'failed', 'skipped'] as $key) {
|
|
if (array_key_exists($key, $metadata) && is_numeric($metadata[$key])) {
|
|
$counts[$key] = (int) $metadata[$key];
|
|
}
|
|
}
|
|
|
|
$payload = [
|
|
'tenant_id' => (int) $restoreRun->tenant_id,
|
|
'run_type' => 'restore',
|
|
'run_id' => (int) $restoreRun->getKey(),
|
|
'status' => $status,
|
|
];
|
|
|
|
if ($counts !== []) {
|
|
$payload['counts'] = $counts;
|
|
}
|
|
|
|
$user->notify(new RunStatusChangedNotification($payload));
|
|
}
|
|
}
|