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
333 lines
14 KiB
PHP
333 lines
14 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Jobs\Middleware\TrackOperationRun;
|
|
use App\Models\BackupItem;
|
|
use App\Models\BackupSet;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Policy;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Services\OperationRunService;
|
|
use App\Support\OperationRunLinks;
|
|
use App\Support\OperationRunOutcome;
|
|
use App\Support\OperationRunStatus;
|
|
use Filament\Notifications\Notification;
|
|
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 BulkPolicyExportJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
public ?OperationRun $operationRun = null;
|
|
|
|
public function __construct(
|
|
public int $tenantId,
|
|
public int $userId,
|
|
/** @var array<int, int|string> */
|
|
public array $policyIds,
|
|
public string $backupName,
|
|
public ?string $backupDescription = null,
|
|
?OperationRun $operationRun = null,
|
|
) {
|
|
$this->operationRun = $operationRun;
|
|
}
|
|
|
|
public function middleware(): array
|
|
{
|
|
return [new TrackOperationRun];
|
|
}
|
|
|
|
public function handle(OperationRunService $operationRunService): void
|
|
{
|
|
$tenant = Tenant::query()->find($this->tenantId);
|
|
if (! $tenant instanceof Tenant) {
|
|
throw new \RuntimeException('Tenant not found.');
|
|
}
|
|
|
|
$user = User::query()->find($this->userId);
|
|
if (! $user instanceof User) {
|
|
throw new \RuntimeException('User not found.');
|
|
}
|
|
|
|
$ids = collect($this->policyIds)
|
|
->map(static fn ($id): int => (int) $id)
|
|
->unique()
|
|
->sort()
|
|
->values()
|
|
->all();
|
|
|
|
try {
|
|
// Create Backup Set
|
|
$backupSet = BackupSet::create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'name' => $this->backupName,
|
|
// 'description' => $this->backupDescription, // Not in schema
|
|
'status' => 'completed',
|
|
'created_by' => $user->name,
|
|
'item_count' => count($ids),
|
|
'completed_at' => now(),
|
|
]);
|
|
|
|
$itemCount = 0;
|
|
$succeeded = 0;
|
|
$failed = 0;
|
|
$failures = [];
|
|
|
|
$totalItems = count($ids);
|
|
$failureThreshold = (int) floor($totalItems / 2);
|
|
|
|
foreach ($ids as $policyId) {
|
|
$itemCount++;
|
|
|
|
try {
|
|
$policy = Policy::query()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->find($policyId);
|
|
|
|
if (! $policy) {
|
|
$failed++;
|
|
$failures[] = ['code' => 'policy.not_found', 'message' => "Policy {$policyId} not found."];
|
|
|
|
if ($failed > $failureThreshold) {
|
|
$backupSet->update(['status' => 'failed']);
|
|
|
|
if ($this->operationRun) {
|
|
$operationRunService->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Failed->value,
|
|
summaryCounts: [
|
|
'total' => $totalItems,
|
|
'processed' => $itemCount,
|
|
'succeeded' => $succeeded,
|
|
'failed' => $failed,
|
|
'created' => $succeeded,
|
|
],
|
|
failures: array_merge($failures, [
|
|
['code' => 'export.circuit_breaker', 'message' => 'Circuit breaker: more than 50% of items failed.'],
|
|
]),
|
|
);
|
|
}
|
|
|
|
if ($user) {
|
|
Notification::make()
|
|
->title('Bulk Export Aborted')
|
|
->body('Circuit breaker triggered: too many failures (>50%).')
|
|
->icon('heroicon-o-exclamation-triangle')
|
|
->danger()
|
|
->actions($this->operationRun ? [
|
|
\Filament\Actions\Action::make('view_run')
|
|
->label('View run')
|
|
->url(OperationRunLinks::view($this->operationRun, $tenant)),
|
|
] : [])
|
|
->sendToDatabase($user)
|
|
->send();
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
// Get latest version for snapshot
|
|
$latestVersion = $policy->versions()->orderByDesc('captured_at')->first();
|
|
|
|
if (! $latestVersion) {
|
|
$failed++;
|
|
$failures[] = ['code' => 'policy.no_versions', 'message' => "No versions available for policy {$policyId}."];
|
|
|
|
if ($failed > $failureThreshold) {
|
|
$backupSet->update(['status' => 'failed']);
|
|
|
|
if ($this->operationRun) {
|
|
$operationRunService->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Failed->value,
|
|
summaryCounts: [
|
|
'total' => $totalItems,
|
|
'processed' => $itemCount,
|
|
'succeeded' => $succeeded,
|
|
'failed' => $failed,
|
|
'created' => $succeeded,
|
|
],
|
|
failures: array_merge($failures, [
|
|
['code' => 'export.circuit_breaker', 'message' => 'Circuit breaker: more than 50% of items failed.'],
|
|
]),
|
|
);
|
|
}
|
|
|
|
if ($user) {
|
|
Notification::make()
|
|
->title('Bulk Export Aborted')
|
|
->body('Circuit breaker triggered: too many failures (>50%).')
|
|
->icon('heroicon-o-exclamation-triangle')
|
|
->danger()
|
|
->actions($this->operationRun ? [
|
|
\Filament\Actions\Action::make('view_run')
|
|
->label('View run')
|
|
->url(OperationRunLinks::view($this->operationRun, $tenant)),
|
|
] : [])
|
|
->sendToDatabase($user)
|
|
->send();
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
// Create Backup Item
|
|
BackupItem::create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'backup_set_id' => $backupSet->id,
|
|
'policy_id' => $policy->id,
|
|
'policy_identifier' => $policy->external_id, // Added
|
|
'policy_type' => $policy->policy_type,
|
|
'platform' => $policy->platform ?? null, // Added
|
|
// 'display_name' => $policy->display_name, // Not in schema, maybe in metadata?
|
|
'payload' => $latestVersion->snapshot, // Mapped to payload
|
|
'metadata' => [
|
|
'display_name' => $policy->display_name, // Stored in metadata
|
|
'version_captured_at' => $latestVersion->captured_at->toIso8601String(),
|
|
],
|
|
]);
|
|
|
|
$succeeded++;
|
|
|
|
} catch (Throwable $e) {
|
|
$failed++;
|
|
$failures[] = ['code' => 'policy.export.failed', 'message' => $e->getMessage()];
|
|
|
|
if ($failed > $failureThreshold) {
|
|
$backupSet->update(['status' => 'failed']);
|
|
|
|
if ($this->operationRun) {
|
|
$operationRunService->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Failed->value,
|
|
summaryCounts: [
|
|
'total' => $totalItems,
|
|
'processed' => $itemCount,
|
|
'succeeded' => $succeeded,
|
|
'failed' => $failed,
|
|
'created' => $succeeded,
|
|
],
|
|
failures: array_merge($failures, [
|
|
['code' => 'export.circuit_breaker', 'message' => 'Circuit breaker: more than 50% of items failed.'],
|
|
]),
|
|
);
|
|
}
|
|
|
|
if ($user) {
|
|
Notification::make()
|
|
->title('Bulk Export Aborted')
|
|
->body('Circuit breaker triggered: too many failures (>50%).')
|
|
->icon('heroicon-o-exclamation-triangle')
|
|
->danger()
|
|
->actions($this->operationRun ? [
|
|
\Filament\Actions\Action::make('view_run')
|
|
->label('View run')
|
|
->url(OperationRunLinks::view($this->operationRun, $tenant)),
|
|
] : [])
|
|
->sendToDatabase($user)
|
|
->send();
|
|
}
|
|
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Update BackupSet item count (if denormalized) or just leave it
|
|
// Assuming BackupSet might need an item count or status update
|
|
|
|
$outcome = OperationRunOutcome::Succeeded->value;
|
|
|
|
if ($failed > 0 && $failed < $totalItems) {
|
|
$outcome = OperationRunOutcome::PartiallySucceeded->value;
|
|
}
|
|
|
|
if ($failed >= $totalItems && $totalItems > 0) {
|
|
$outcome = OperationRunOutcome::Failed->value;
|
|
}
|
|
|
|
if ($this->operationRun) {
|
|
$operationRunService->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: $outcome,
|
|
summaryCounts: [
|
|
'total' => $totalItems,
|
|
'processed' => $totalItems,
|
|
'succeeded' => $succeeded,
|
|
'failed' => $failed,
|
|
'created' => $succeeded,
|
|
],
|
|
failures: $failures,
|
|
);
|
|
}
|
|
|
|
if ($succeeded > 0 || $failed > 0) {
|
|
$message = "Successfully exported {$succeeded} policies to backup '{$this->backupName}'";
|
|
if ($failed > 0) {
|
|
$message .= " ({$failed} failed)";
|
|
}
|
|
$message .= '.';
|
|
|
|
Notification::make()
|
|
->title('Bulk Export Completed')
|
|
->body($message)
|
|
->icon('heroicon-o-check-circle')
|
|
->success()
|
|
->actions($this->operationRun ? [
|
|
\Filament\Actions\Action::make('view_run')
|
|
->label('View run')
|
|
->url(OperationRunLinks::view($this->operationRun, $tenant)),
|
|
] : [])
|
|
->sendToDatabase($user)
|
|
->send();
|
|
}
|
|
|
|
} catch (Throwable $e) {
|
|
if ($this->operationRun) {
|
|
$operationRunService->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Failed->value,
|
|
failures: [
|
|
['code' => 'exception.unhandled', 'message' => $e->getMessage()],
|
|
],
|
|
);
|
|
}
|
|
|
|
if (isset($user) && $user instanceof User) {
|
|
Notification::make()
|
|
->title('Bulk Export Failed')
|
|
->body($e->getMessage())
|
|
->icon('heroicon-o-x-circle')
|
|
->danger()
|
|
->actions($this->operationRun ? [
|
|
\Filament\Actions\Action::make('view_run')
|
|
->label('View run')
|
|
->url(OperationRunLinks::view($this->operationRun, $tenant)),
|
|
] : [])
|
|
->sendToDatabase($user)
|
|
->send();
|
|
}
|
|
|
|
throw $e;
|
|
}
|
|
}
|
|
}
|