Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
151 lines
4.9 KiB
PHP
151 lines
4.9 KiB
PHP
<?php
|
|
|
|
namespace App\Services\BackupScheduling;
|
|
|
|
use App\Jobs\RunBackupScheduleJob;
|
|
use App\Models\BackupSchedule;
|
|
use App\Models\Tenant;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\OperationRunService;
|
|
use App\Support\OperationRunType;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Support\Facades\Bus;
|
|
use Illuminate\Support\Facades\Log;
|
|
|
|
class BackupScheduleDispatcher
|
|
{
|
|
public function __construct(
|
|
private readonly ScheduleTimeService $scheduleTimeService,
|
|
private readonly AuditLogger $auditLogger,
|
|
private readonly OperationRunService $operationRunService,
|
|
) {}
|
|
|
|
/**
|
|
* Dispatch due schedules.
|
|
*
|
|
* No catch-up policy: we only dispatch if the current minute-slot is due.
|
|
*
|
|
* @return array{created_runs:int, skipped_runs:int, scanned_schedules:int}
|
|
*/
|
|
public function dispatchDue(?array $tenantIdentifiers = null): array
|
|
{
|
|
$nowUtc = CarbonImmutable::now('UTC');
|
|
|
|
$schedulesQuery = BackupSchedule::query()
|
|
->where('is_enabled', true)
|
|
->whereHas('tenant', fn ($query) => $query->where('status', 'active'))
|
|
->with('tenant');
|
|
|
|
if (is_array($tenantIdentifiers) && ! empty($tenantIdentifiers)) {
|
|
$schedulesQuery->whereIn('tenant_id', $this->resolveTenantIds($tenantIdentifiers));
|
|
}
|
|
|
|
$createdRuns = 0;
|
|
$skippedRuns = 0;
|
|
$scannedSchedules = 0;
|
|
|
|
foreach ($schedulesQuery->cursor() as $schedule) {
|
|
$scannedSchedules++;
|
|
|
|
$slot = $this->scheduleTimeService->nextRunFor($schedule, $nowUtc->subMinute());
|
|
|
|
if ($slot === null) {
|
|
$schedule->forceFill(['next_run_at' => null])->saveQuietly();
|
|
|
|
continue;
|
|
}
|
|
|
|
if ($slot->greaterThan($nowUtc)) {
|
|
if (! $schedule->next_run_at || ! $schedule->next_run_at->equalTo($slot)) {
|
|
$schedule->forceFill(['next_run_at' => $slot])->saveQuietly();
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
$scheduledFor = $slot->startOfMinute();
|
|
|
|
$operationRun = $this->operationRunService->ensureRunWithIdentityStrict(
|
|
tenant: $schedule->tenant,
|
|
type: OperationRunType::BackupScheduleScheduled->value,
|
|
identityInputs: [
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'scheduled_for' => $scheduledFor->toDateTimeString(),
|
|
],
|
|
context: [
|
|
'backup_schedule_id' => (int) $schedule->id,
|
|
'scheduled_for' => $scheduledFor->toDateTimeString(),
|
|
'trigger' => 'scheduled',
|
|
],
|
|
);
|
|
|
|
if (! $operationRun->wasRecentlyCreated) {
|
|
$skippedRuns++;
|
|
|
|
Log::debug('Backup schedule operation already dispatched for slot.', [
|
|
'schedule_id' => $schedule->id,
|
|
'scheduled_for' => $scheduledFor->toDateTimeString(),
|
|
'operation_run_id' => $operationRun->getKey(),
|
|
]);
|
|
|
|
$schedule->forceFill([
|
|
'next_run_at' => $this->scheduleTimeService->nextRunFor($schedule, $nowUtc),
|
|
])->saveQuietly();
|
|
|
|
continue;
|
|
}
|
|
|
|
$createdRuns++;
|
|
|
|
$this->auditLogger->log(
|
|
tenant: $schedule->tenant,
|
|
action: 'backup_schedule.run_dispatched',
|
|
context: [
|
|
'metadata' => [
|
|
'backup_schedule_id' => $schedule->id,
|
|
'operation_run_id' => $operationRun->getKey(),
|
|
'scheduled_for' => $scheduledFor->toDateTimeString(),
|
|
],
|
|
],
|
|
resourceType: 'operation_run',
|
|
resourceId: (string) $operationRun->getKey(),
|
|
status: 'success'
|
|
);
|
|
|
|
$schedule->forceFill([
|
|
'next_run_at' => $this->scheduleTimeService->nextRunFor($schedule, $nowUtc),
|
|
])->saveQuietly();
|
|
|
|
Bus::dispatch(new RunBackupScheduleJob(0, $operationRun, (int) $schedule->id));
|
|
}
|
|
|
|
return [
|
|
'created_runs' => $createdRuns,
|
|
'skipped_runs' => $skippedRuns,
|
|
'scanned_schedules' => $scannedSchedules,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param array<int, string> $tenantIdentifiers
|
|
* @return array<int>
|
|
*/
|
|
private function resolveTenantIds(array $tenantIdentifiers): array
|
|
{
|
|
$tenantIds = [];
|
|
|
|
foreach ($tenantIdentifiers as $identifier) {
|
|
$tenant = Tenant::query()
|
|
->where('status', 'active')
|
|
->forTenant($identifier)
|
|
->first();
|
|
|
|
if ($tenant) {
|
|
$tenantIds[] = $tenant->id;
|
|
}
|
|
}
|
|
|
|
return array_values(array_unique($tenantIds));
|
|
}
|
|
}
|