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
147 lines
4.8 KiB
PHP
147 lines
4.8 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Models\InventorySyncRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Services\Drift\DriftFindingGenerator;
|
|
use App\Services\OperationRunService;
|
|
use App\Services\Operations\TargetScopeConcurrencyLimiter;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Illuminate\Support\Facades\Log;
|
|
use RuntimeException;
|
|
use Throwable;
|
|
|
|
class GenerateDriftFindingsJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
public ?OperationRun $operationRun = null;
|
|
|
|
/**
|
|
* @param array<string, mixed> $context
|
|
*/
|
|
public function __construct(
|
|
public int $tenantId,
|
|
public int $userId,
|
|
public int $baselineRunId,
|
|
public int $currentRunId,
|
|
public string $scopeKey,
|
|
?OperationRun $operationRun = null,
|
|
public array $context = [],
|
|
) {
|
|
$this->operationRun = $operationRun;
|
|
}
|
|
|
|
public function handle(
|
|
DriftFindingGenerator $generator,
|
|
OperationRunService $runs,
|
|
TargetScopeConcurrencyLimiter $limiter,
|
|
): void {
|
|
Log::info('GenerateDriftFindingsJob: started', [
|
|
'tenant_id' => $this->tenantId,
|
|
'baseline_run_id' => $this->baselineRunId,
|
|
'current_run_id' => $this->currentRunId,
|
|
'scope_key' => $this->scopeKey,
|
|
]);
|
|
|
|
if (! $this->operationRun instanceof OperationRun) {
|
|
throw new RuntimeException('OperationRun is required for drift generation.');
|
|
}
|
|
|
|
$this->operationRun->refresh();
|
|
|
|
if ($this->operationRun->status === 'completed') {
|
|
return;
|
|
}
|
|
|
|
$opContext = is_array($this->operationRun->context) ? $this->operationRun->context : [];
|
|
$targetScope = is_array($opContext['target_scope'] ?? null) ? $opContext['target_scope'] : [];
|
|
|
|
$lock = $limiter->acquireSlot($this->tenantId, $targetScope);
|
|
|
|
if (! $lock) {
|
|
$delay = (int) config('tenantpilot.bulk_operations.poll_interval_seconds', 3);
|
|
$this->release(max(1, $delay));
|
|
|
|
return;
|
|
}
|
|
|
|
try {
|
|
$tenant = Tenant::query()->find($this->tenantId);
|
|
if (! $tenant instanceof Tenant) {
|
|
throw new RuntimeException('Tenant not found.');
|
|
}
|
|
|
|
$baseline = InventorySyncRun::query()->find($this->baselineRunId);
|
|
if (! $baseline instanceof InventorySyncRun) {
|
|
throw new RuntimeException('Baseline run not found.');
|
|
}
|
|
|
|
$current = InventorySyncRun::query()->find($this->currentRunId);
|
|
if (! $current instanceof InventorySyncRun) {
|
|
throw new RuntimeException('Current run not found.');
|
|
}
|
|
|
|
$runs->updateRun($this->operationRun, 'running');
|
|
|
|
$counts = is_array($this->operationRun->summary_counts ?? null) ? $this->operationRun->summary_counts : [];
|
|
if ((int) ($counts['total'] ?? 0) === 0) {
|
|
$runs->incrementSummaryCounts($this->operationRun, ['total' => 1]);
|
|
}
|
|
|
|
$created = $generator->generate(
|
|
tenant: $tenant,
|
|
baseline: $baseline,
|
|
current: $current,
|
|
scopeKey: $this->scopeKey,
|
|
);
|
|
|
|
Log::info('GenerateDriftFindingsJob: completed', [
|
|
'tenant_id' => $this->tenantId,
|
|
'baseline_run_id' => $this->baselineRunId,
|
|
'current_run_id' => $this->currentRunId,
|
|
'scope_key' => $this->scopeKey,
|
|
'created_findings_count' => $created,
|
|
]);
|
|
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'succeeded' => 1,
|
|
'created' => $created,
|
|
]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
} catch (Throwable $e) {
|
|
Log::error('GenerateDriftFindingsJob: failed', [
|
|
'tenant_id' => $this->tenantId,
|
|
'baseline_run_id' => $this->baselineRunId,
|
|
'current_run_id' => $this->currentRunId,
|
|
'scope_key' => $this->scopeKey,
|
|
'error' => $e->getMessage(),
|
|
]);
|
|
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'failed' => 1,
|
|
]);
|
|
|
|
$runs->appendFailures($this->operationRun, [[
|
|
'code' => 'drift.generate.failed',
|
|
'message' => $e->getMessage(),
|
|
]]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
|
|
throw $e;
|
|
} finally {
|
|
$lock->release();
|
|
}
|
|
}
|
|
}
|