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
137 lines
3.9 KiB
PHP
137 lines
3.9 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs\Operations;
|
|
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Services\Intune\PolicySyncService;
|
|
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 RuntimeException;
|
|
use Throwable;
|
|
|
|
class TenantSyncWorkerJob 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,
|
|
?OperationRun $operationRun = null,
|
|
public array $context = [],
|
|
) {
|
|
$this->operationRun = $operationRun;
|
|
}
|
|
|
|
public function handle(
|
|
OperationRunService $runs,
|
|
TargetScopeConcurrencyLimiter $limiter,
|
|
PolicySyncService $syncService,
|
|
): void {
|
|
if (! $this->operationRun instanceof OperationRun) {
|
|
throw new RuntimeException('OperationRun is required for tenant sync worker.');
|
|
}
|
|
|
|
$this->operationRun->refresh();
|
|
|
|
if ($this->operationRun->status === 'completed') {
|
|
return;
|
|
}
|
|
|
|
$lock = null;
|
|
|
|
try {
|
|
$tenant = Tenant::query()->whereKey($this->tenantId)->first();
|
|
|
|
if (! $tenant instanceof Tenant) {
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'failed' => 1,
|
|
]);
|
|
|
|
$runs->appendFailures($this->operationRun, [[
|
|
'code' => 'tenant.not_found',
|
|
'message' => 'Tenant '.$this->tenantId.' not found.',
|
|
]]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
|
|
return;
|
|
}
|
|
|
|
$lock = $limiter->acquireSlot($tenant->getKey(), [
|
|
'entra_tenant_id' => (string) ($tenant->tenant_id ?? $tenant->external_id),
|
|
]);
|
|
|
|
if (! $lock) {
|
|
$delay = (int) config('tenantpilot.bulk_operations.poll_interval_seconds', 3);
|
|
$this->release(max(1, $delay));
|
|
|
|
return;
|
|
}
|
|
|
|
if (! $tenant->isActive()) {
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'skipped' => 1,
|
|
]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
|
|
return;
|
|
}
|
|
|
|
$user = User::query()->whereKey($this->userId)->first();
|
|
|
|
if (! $user instanceof User || ! $user->canSyncTenant($tenant)) {
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'skipped' => 1,
|
|
]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
|
|
return;
|
|
}
|
|
|
|
$supported = config('tenantpilot.supported_policy_types', []);
|
|
|
|
$syncService->syncPolicies($tenant, $supported);
|
|
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'succeeded' => 1,
|
|
]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
} catch (Throwable $e) {
|
|
$runs->incrementSummaryCounts($this->operationRun, [
|
|
'processed' => 1,
|
|
'failed' => 1,
|
|
]);
|
|
|
|
$runs->appendFailures($this->operationRun, [[
|
|
'code' => 'tenant.sync_failed',
|
|
'message' => $e->getMessage(),
|
|
]]);
|
|
|
|
$runs->maybeCompleteBulkRun($this->operationRun);
|
|
|
|
throw $e;
|
|
} finally {
|
|
$lock?->release();
|
|
}
|
|
}
|
|
}
|