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
124 lines
4.2 KiB
PHP
124 lines
4.2 KiB
PHP
<?php
|
|
|
|
use App\Jobs\RunBackupScheduleJob;
|
|
use App\Models\BackupSchedule;
|
|
use App\Models\BackupScheduleRun;
|
|
use App\Models\BackupSet;
|
|
use App\Services\Intune\BackupService;
|
|
use App\Services\Intune\PolicySyncService;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Support\Facades\Cache;
|
|
|
|
it('creates a backup set and marks the run successful', function () {
|
|
CarbonImmutable::setTestNow(CarbonImmutable::create(2026, 1, 5, 10, 0, 30, 'UTC'));
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$schedule = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Daily 10:00',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '10:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['deviceConfiguration'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
'next_run_at' => null,
|
|
]);
|
|
|
|
$run = BackupScheduleRun::query()->create([
|
|
'backup_schedule_id' => $schedule->id,
|
|
'tenant_id' => $tenant->id,
|
|
'scheduled_for' => CarbonImmutable::now('UTC')->startOfMinute(),
|
|
'status' => BackupScheduleRun::STATUS_RUNNING,
|
|
]);
|
|
|
|
app()->bind(PolicySyncService::class, fn () => new class extends PolicySyncService
|
|
{
|
|
public function __construct() {}
|
|
|
|
public function syncPoliciesWithReport($tenant, ?array $supportedTypes = null): array
|
|
{
|
|
return ['synced' => [], 'failures' => []];
|
|
}
|
|
});
|
|
|
|
$backupSet = BackupSet::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'status' => 'completed',
|
|
'item_count' => 0,
|
|
]);
|
|
|
|
app()->bind(BackupService::class, fn () => new class($backupSet) extends BackupService
|
|
{
|
|
public function __construct(private readonly BackupSet $backupSet) {}
|
|
|
|
public function createBackupSet($tenant, $policyIds, ?string $actorEmail = null, ?string $actorName = null, ?string $name = null, bool $includeAssignments = false, bool $includeScopeTags = false, bool $includeFoundations = false): BackupSet
|
|
{
|
|
return $this->backupSet;
|
|
}
|
|
});
|
|
|
|
Cache::flush();
|
|
|
|
(new RunBackupScheduleJob($run->id))->handle(
|
|
app(PolicySyncService::class),
|
|
app(BackupService::class),
|
|
app(\App\Services\BackupScheduling\PolicyTypeResolver::class),
|
|
app(\App\Services\BackupScheduling\ScheduleTimeService::class),
|
|
app(\App\Services\Intune\AuditLogger::class),
|
|
app(\App\Services\BackupScheduling\RunErrorMapper::class),
|
|
);
|
|
|
|
$run->refresh();
|
|
expect($run->status)->toBe(BackupScheduleRun::STATUS_SUCCESS);
|
|
expect($run->backup_set_id)->toBe($backupSet->id);
|
|
});
|
|
|
|
it('skips runs when all policy types are unknown', function () {
|
|
CarbonImmutable::setTestNow(CarbonImmutable::create(2026, 1, 5, 10, 0, 30, 'UTC'));
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$schedule = BackupSchedule::query()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Daily 10:00',
|
|
'is_enabled' => true,
|
|
'timezone' => 'UTC',
|
|
'frequency' => 'daily',
|
|
'time_of_day' => '10:00:00',
|
|
'days_of_week' => null,
|
|
'policy_types' => ['definitelyNotARealPolicyType'],
|
|
'include_foundations' => true,
|
|
'retention_keep_last' => 30,
|
|
'next_run_at' => null,
|
|
]);
|
|
|
|
$run = BackupScheduleRun::query()->create([
|
|
'backup_schedule_id' => $schedule->id,
|
|
'tenant_id' => $tenant->id,
|
|
'scheduled_for' => CarbonImmutable::now('UTC')->startOfMinute(),
|
|
'status' => BackupScheduleRun::STATUS_RUNNING,
|
|
]);
|
|
|
|
Cache::flush();
|
|
|
|
(new RunBackupScheduleJob($run->id))->handle(
|
|
app(PolicySyncService::class),
|
|
app(BackupService::class),
|
|
app(\App\Services\BackupScheduling\PolicyTypeResolver::class),
|
|
app(\App\Services\BackupScheduling\ScheduleTimeService::class),
|
|
app(\App\Services\Intune\AuditLogger::class),
|
|
app(\App\Services\BackupScheduling\RunErrorMapper::class),
|
|
);
|
|
|
|
$run->refresh();
|
|
expect($run->status)->toBe(BackupScheduleRun::STATUS_SKIPPED);
|
|
expect($run->error_code)->toBe('UNKNOWN_POLICY_TYPE');
|
|
expect($run->backup_set_id)->toBeNull();
|
|
});
|