What Implements tenant-scoped backup scheduling end-to-end: schedules CRUD, minute-based dispatch, queued execution, run history, manual “Run now/Retry”, retention (keep last N), and auditability. Key changes Filament UI: Backup Schedules resource with tenant scoping + SEC-002 role gating. Scheduler + queue: tenantpilot:schedules:dispatch command wired in scheduler (runs every minute), creates idempotent BackupScheduleRun records and dispatches jobs. Execution: RunBackupScheduleJob syncs policies, creates immutable backup sets, updates run status, writes audit logs, applies retry/backoff mapping, and triggers retention. Run history: Relation manager + “View” modal rendering run details. UX polish: row actions grouped; bulk actions grouped (run now / retry / delete). Bulk dispatch writes DB notifications (shows in notifications panel). Validation: policy type hard-validation on save; unknown policy types handled safely at runtime (skipped/partial). Tests: comprehensive Pest coverage for CRUD/scoping/validation, idempotency, job outcomes, error mapping, retention, view modal, run-now/retry notifications, bulk delete (incl. operator forbidden). Files / Areas Filament: BackupScheduleResource.php and app/Filament/Resources/BackupScheduleResource/* Scheduling/Jobs: app/Console/Commands/TenantpilotDispatchBackupSchedules.php, app/Jobs/RunBackupScheduleJob.php, app/Jobs/ApplyBackupScheduleRetentionJob.php, console.php Models/Migrations: app/Models/BackupSchedule.php, app/Models/BackupScheduleRun.php, database/migrations/backup_schedules, backup_schedule_runs Notifications: BackupScheduleRunDispatchedNotification.php Specs: specs/032-backup-scheduling-mvp/* (tasks/checklist/quickstart updates) How to test (Sail) Run tests: ./vendor/bin/sail artisan test tests/Feature/BackupScheduling Run formatter: ./vendor/bin/sail php ./vendor/bin/pint --dirty Apply migrations: ./vendor/bin/sail artisan migrate Manual dispatch: ./vendor/bin/sail artisan tenantpilot:schedules:dispatch Notes Uses DB notifications for queued UI actions to ensure they appear in the notifications panel even under queue fakes in tests. Checklist gate for 032 is PASS; tasks updated accordingly. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #34
89 lines
2.5 KiB
PHP
89 lines
2.5 KiB
PHP
<?php
|
|
|
|
namespace App\Services\BackupScheduling;
|
|
|
|
use App\Models\BackupSchedule;
|
|
use Carbon\CarbonImmutable;
|
|
|
|
class ScheduleTimeService
|
|
{
|
|
public function nextRunFor(BackupSchedule $schedule, ?CarbonImmutable $after = null): ?CarbonImmutable
|
|
{
|
|
$timezone = $schedule->timezone;
|
|
$cursor = $after?->copy()->timezone($timezone) ?? CarbonImmutable::now($timezone);
|
|
|
|
if ($schedule->frequency === 'weekly') {
|
|
return $this->nextWeeklyRun($schedule, $cursor);
|
|
}
|
|
|
|
return $this->nextDailyRun($schedule, $cursor);
|
|
}
|
|
|
|
protected function nextDailyRun(BackupSchedule $schedule, CarbonImmutable $cursor): ?CarbonImmutable
|
|
{
|
|
$time = $schedule->time_of_day;
|
|
$attempts = 0;
|
|
|
|
if ($cursor->format('H:i:s') >= $time) {
|
|
$cursor = $cursor->addDay();
|
|
}
|
|
|
|
while ($attempts++ < 14) {
|
|
$candidate = $this->buildLocalSlot($schedule, $cursor);
|
|
|
|
if ($candidate) {
|
|
return $candidate;
|
|
}
|
|
|
|
$cursor = $cursor->addDay();
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
protected function nextWeeklyRun(BackupSchedule $schedule, CarbonImmutable $cursor): ?CarbonImmutable
|
|
{
|
|
$allowed = $schedule->days_of_week ?? [];
|
|
$allowed = array_filter($allowed, fn ($day) => is_numeric($day) && $day >= 1 && $day <= 7);
|
|
$allowed = array_values($allowed);
|
|
|
|
if (empty($allowed)) {
|
|
return null;
|
|
}
|
|
|
|
$attempts = 0;
|
|
|
|
while ($attempts++ < 21) {
|
|
$dayOfWeek = $cursor->dayOfWeekIso;
|
|
|
|
if (in_array($dayOfWeek, $allowed, true)) {
|
|
$candidate = $this->buildLocalSlot($schedule, $cursor);
|
|
|
|
$cursorUtc = $cursor->copy()->timezone('UTC');
|
|
|
|
if ($candidate && $candidate->greaterThan($cursorUtc)) {
|
|
return $candidate;
|
|
}
|
|
}
|
|
|
|
$cursor = $cursor->addDay()->startOfDay();
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
protected function buildLocalSlot(BackupSchedule $schedule, CarbonImmutable $date): ?CarbonImmutable
|
|
{
|
|
$timezone = $schedule->timezone;
|
|
$time = $schedule->time_of_day;
|
|
$datePart = $date->format('Y-m-d');
|
|
$candidate = CarbonImmutable::createFromFormat('Y-m-d H:i:s', "{$datePart} {$time}", $timezone);
|
|
|
|
if (! $candidate || $candidate->format('H:i:s') !== $time) {
|
|
return null;
|
|
}
|
|
|
|
return $candidate->startOfMinute()->timezone('UTC');
|
|
}
|
|
}
|