Summary This PR implements Spec 049 – Backup/Restore Job Orchestration: all critical Backup/Restore execution paths are job-only, idempotent, tenant-scoped, and observable via run records + DB notifications (Phase 1). The UI no longer performs heavy Graph work inside request/Filament actions for these flows. Why We want predictable UX and operations at MSP scale: • no timeouts / long-running requests • reproducible run state + per-item results • safe error persistence (no secrets / no token leakage) • strict tenant isolation + auditability for write paths What changed Foundational (Runs + Idempotency + Observability) • Added a shared RunIdempotency helper (dedupe while queued/running). • Added a read-only BulkOperationRuns surface (list + view) for status/progress. • Added DB notifications for run status changes (with “View run” link). US1 – Policy “Capture snapshot” is job-only • Policy detail “Capture snapshot” now: • creates/reuses a run (dedupe key: tenant + policy.capture_snapshot + policy DB id) • dispatches a queued job • returns immediately with notification + link to run detail • Graph capture work moved fully into the job; request path stays Graph-free. US3 – Restore runs orchestration is job-only + safe • Live restore execution is queued and updates RestoreRun status/progress. • Per-item outcomes are persisted deterministically (per internal DB record). • Audit logging is written for live restore. • Preview/dry-run is enforced as read-only (no writes). Tenant isolation / authorization (non-negotiable) • Run list/view/start are tenant-scoped and policy-guarded (cross-tenant access => 403, not 404). • Explicit Pest tests cover cross-tenant denial and start authorization. Tests / Verification • ./vendor/bin/pint --dirty • Targeted suite (examples): • policy capture snapshot queued + idempotency tests • restore orchestration + audit logging + preview read-only tests • run authorization / tenant isolation tests Notes / Scope boundaries • Phase 1 UX = DB notifications + run detail page. A global “progress widget” is tracked as Phase 2 and not required for merge. • Resilience/backoff is tracked in tasks but can be iterated further after merge. Review focus • Dedupe behavior for queued/running runs (reuse vs create-new) • Tenant scoping & policy gates for all run surfaces • Restore safety: audit event + preview no-writes Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #56
108 lines
3.2 KiB
PHP
108 lines
3.2 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Models\BulkOperationRun;
|
|
use App\Models\Policy;
|
|
use App\Notifications\RunStatusChangedNotification;
|
|
use App\Services\BulkOperationService;
|
|
use App\Services\Intune\VersionService;
|
|
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 CapturePolicySnapshotJob implements ShouldQueue
|
|
{
|
|
use Dispatchable;
|
|
use InteractsWithQueue;
|
|
use Queueable;
|
|
use SerializesModels;
|
|
|
|
public function __construct(
|
|
public int $bulkOperationRunId,
|
|
public int $policyId,
|
|
public bool $includeAssignments = true,
|
|
public bool $includeScopeTags = true,
|
|
public ?string $createdBy = null,
|
|
) {}
|
|
|
|
public function handle(BulkOperationService $bulkOperationService, VersionService $versionService): void
|
|
{
|
|
$run = BulkOperationRun::query()->with(['tenant', 'user'])->find($this->bulkOperationRunId);
|
|
|
|
if (! $run) {
|
|
return;
|
|
}
|
|
|
|
$policy = Policy::query()->with('tenant')->find($this->policyId);
|
|
|
|
if (! $policy || ! $policy->tenant) {
|
|
$bulkOperationService->abort($run, 'policy_not_found');
|
|
$this->notifyStatus($run, 'failed');
|
|
|
|
return;
|
|
}
|
|
|
|
$this->notifyStatus($run, 'queued');
|
|
$bulkOperationService->start($run);
|
|
$this->notifyStatus($run, 'running');
|
|
|
|
try {
|
|
$versionService->captureFromGraph(
|
|
tenant: $policy->tenant,
|
|
policy: $policy,
|
|
createdBy: $this->createdBy,
|
|
includeAssignments: $this->includeAssignments,
|
|
includeScopeTags: $this->includeScopeTags,
|
|
);
|
|
|
|
$bulkOperationService->recordSuccess($run);
|
|
$bulkOperationService->complete($run);
|
|
|
|
$this->notifyStatus($run, $run->refresh()->status);
|
|
} catch (Throwable $e) {
|
|
$bulkOperationService->recordFailure(
|
|
run: $run,
|
|
itemId: (string) $policy->getKey(),
|
|
reason: $bulkOperationService->sanitizeFailureReason($e->getMessage())
|
|
);
|
|
|
|
$bulkOperationService->complete($run);
|
|
|
|
$this->notifyStatus($run->refresh(), $run->status);
|
|
|
|
throw $e;
|
|
}
|
|
}
|
|
|
|
private function notifyStatus(BulkOperationRun $run, string $status): void
|
|
{
|
|
if (! $run->relationLoaded('user')) {
|
|
$run->loadMissing('user');
|
|
}
|
|
|
|
if (! $run->user) {
|
|
return;
|
|
}
|
|
|
|
$normalizedStatus = $status === 'pending' ? 'queued' : $status;
|
|
|
|
$run->user->notify(new RunStatusChangedNotification([
|
|
'tenant_id' => (int) $run->tenant_id,
|
|
'run_type' => 'bulk_operation',
|
|
'run_id' => (int) $run->getKey(),
|
|
'status' => (string) $normalizedStatus,
|
|
'counts' => [
|
|
'total' => (int) $run->total_items,
|
|
'processed' => (int) $run->processed_items,
|
|
'succeeded' => (int) $run->succeeded,
|
|
'failed' => (int) $run->failed,
|
|
'skipped' => (int) $run->skipped,
|
|
],
|
|
]));
|
|
}
|
|
}
|