refactor: simplify scheduled restore schema and add schedule guards

- Drop redundant scheduled_restores.last_restore_id; derive latest restore
  via hasOne()->latestOfMany() on the existing scheduled_restore_id FK.
- Switch source/target FKs on scheduled_restores from RESTRICT to CASCADE
  so deleting a database server cleans up its scheduled restores.
- Guard backup-schedule deletion when referenced by a scheduled restore
  and surface the relation in the Configuration > Backup UI alongside
  the existing server badge.
- Remove the schedule "Run now" button: it only triggers backups, which
  is now ambiguous because schedules can also be used by scheduled
  restores.

Author: David-Crty

app/Console/Commands/RunScheduledRestores.php

@@ -76,7 +76,6 @@ public function handle(BackupJobFactory $backupJobFactory, LatestSnapshotResolve
 
         $scheduledRestore->forceFill([
             'last_executed_at' => now(),
-            'last_restore_id' => $restore->id,
             'last_skip_reason' => null,
         ])->save();
 

app/Http/Resources/ScheduledRestoreResource.php

@@ -27,7 +27,6 @@ public function toArray(Request $request): array
             'options' => $this->options,
             'enabled' => $this->enabled,
             'last_executed_at' => $this->last_executed_at,
-            'last_restore_id' => $this->last_restore_id,
             'last_skip_reason' => $this->last_skip_reason,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,

app/Livewire/Configuration/Backup.php

@@ -6,7 +6,6 @@
 use App\Jobs\VerifySnapshotFileJob;
 use App\Livewire\Forms\ConfigurationForm;
 use App\Models\BackupSchedule;
-use App\Services\Backup\TriggerBackupAction;
 use App\Services\CurrentOrganization;
 use App\Traits\Toast;
 use Illuminate\Contracts\View\View;
@@ -133,7 +132,7 @@ public function deleteSchedule(): void
             return;
         }
 
-        $schedule = BackupSchedule::withCount('backups')->findOrFail($this->deleteScheduleId);
+        $schedule = BackupSchedule::withCount(['backups', 'scheduledRestores'])->findOrFail($this->deleteScheduleId);
 
         if ($schedule->backups_count > 0) {
             $this->error(__('Cannot delete a schedule that is in use by database servers.'));
@@ -143,48 +142,21 @@ public function deleteSchedule(): void
             return;
         }
 
+        if ($schedule->scheduled_restores_count > 0) {
+            $this->error(__('Cannot delete a schedule that is in use by scheduled restores.'));
+            $this->showDeleteScheduleModal = false;
+            $this->deleteScheduleId = null;
+
+            return;
+        }
+
         $schedule->delete();
         $this->showDeleteScheduleModal = false;
         $this->deleteScheduleId = null;
 
         $this->success(__('Backup schedule deleted.'));
     }
 
-    public function runSchedule(string $scheduleId, TriggerBackupAction $action): void
-    {
-        abort_unless(auth()->user()->isAdmin(), Response::HTTP_FORBIDDEN);
-
-        $schedule = BackupSchedule::findOrFail($scheduleId);
-
-        $backups = $schedule->backups()
-            ->whereRelation('databaseServer', 'backups_enabled', true)
-            ->with(['databaseServer', 'volume'])
-            ->get();
-
-        $totalSnapshots = 0;
-        $errors = [];
-
-        foreach ($backups as $backup) {
-            try {
-                $userId = auth()->id();
-                $result = $action->execute($backup, is_int($userId) ? $userId : null);
-                $totalSnapshots += count($result['snapshots']);
-            } catch (\Throwable $e) {
-                $errors[] = $backup->databaseServer->name.': '.$e->getMessage();
-            }
-        }
-
-        if ($totalSnapshots > 0) {
-            $this->success(
-                trans_choice(':count backup started successfully!|:count backups started successfully!', $totalSnapshots)
-            );
-        }
-
-        if (! empty($errors)) {
-            $this->error(implode('; ', $errors));
-        }
-    }
-
     // --- Computed Properties ---
 
     /**
@@ -198,10 +170,15 @@ public function backupSchedules(): Collection
                 $query->whereRelation('databaseServer', 'backups_enabled', true);
             },
             'backups as total_backups_count',
+            'scheduledRestores as scheduled_restores_count',
         ])
-            ->with(['backups' => function ($query) {
-                $query->whereRelation('databaseServer', 'backups_enabled', true);
-            }, 'backups.databaseServer:id,name'])
+            ->with([
+                'backups' => function ($query) {
+                    $query->whereRelation('databaseServer', 'backups_enabled', true);
+                },
+                'backups.databaseServer:id,name',
+                'scheduledRestores:id,name,backup_schedule_id',
+            ])
             ->orderBy('name')
             ->get();
     }

app/Models/BackupSchedule.php

@@ -28,4 +28,12 @@ public function backups(): HasMany
     {
         return $this->hasMany(Backup::class);
     }
+
+    /**
+     * @return HasMany<ScheduledRestore, BackupSchedule>
+     */
+    public function scheduledRestores(): HasMany
+    {
+        return $this->hasMany(ScheduledRestore::class);
+    }
 }

app/Models/ScheduledRestore.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * @mixin IdeHelperScheduledRestore
@@ -33,7 +34,6 @@ class ScheduledRestore extends Model
         'options',
         'enabled',
         'last_executed_at',
-        'last_restore_id',
         'last_skip_reason',
     ];
 
@@ -74,11 +74,11 @@ public function targetServer(): BelongsTo
     }
 
     /**
-     * @return BelongsTo<Restore, ScheduledRestore>
+     * @return HasOne<Restore, ScheduledRestore>
      */
-    public function lastRestore(): BelongsTo
+    public function lastRestore(): HasOne
     {
-        return $this->belongsTo(Restore::class, 'last_restore_id');
+        return $this->hasOne(Restore::class)->latestOfMany();
     }
 
     /**

database/factories/ScheduledRestoreFactory.php

@@ -26,7 +26,6 @@ public function definition(): array
             'options' => null,
             'enabled' => true,
             'last_executed_at' => null,
-            'last_restore_id' => null,
             'last_skip_reason' => null,
         ];
     }

database/migrations/2026_05_15_000001_create_scheduled_restores.php

@@ -19,14 +19,12 @@ public function up(): void
             $table->json('options')->nullable();
             $table->boolean('enabled')->default(true);
             $table->timestamp('last_executed_at')->nullable();
-            $table->ulid('last_restore_id')->nullable();
             $table->string('last_skip_reason')->nullable();
             $table->timestamps();
 
-            $table->foreign('source_server_id')->references('id')->on('database_servers')->restrictOnDelete();
-            $table->foreign('target_server_id')->references('id')->on('database_servers')->restrictOnDelete();
+            $table->foreign('source_server_id')->references('id')->on('database_servers')->cascadeOnDelete();
+            $table->foreign('target_server_id')->references('id')->on('database_servers')->cascadeOnDelete();
             $table->foreign('backup_schedule_id')->references('id')->on('backup_schedules')->restrictOnDelete();
-            $table->foreign('last_restore_id')->references('id')->on('restores')->nullOnDelete();
 
             $table->index(['enabled', 'source_server_id']);
         });

resources/views/livewire/configuration/backup.blade.php

@@ -35,6 +35,19 @@
                                         </x-slot:content>
                                     </x-popover>
                                 @endif
+                                @if ($schedule->scheduled_restores_count > 0)
+                                    <x-popover>
+                                        <x-slot:trigger>
+                                            <span class="badge badge-outline badge-info cursor-default">
+                                                <x-icon name="o-calendar" class="w-3 h-3" />
+                                                {{ trans_choice(':count scheduled restore|:count scheduled restores', $schedule->scheduled_restores_count) }}
+                                            </span>
+                                        </x-slot:trigger>
+                                        <x-slot:content>
+                                            {{ $schedule->scheduledRestores->pluck('name')->join(', ') }}
+                                        </x-slot:content>
+                                    </x-popover>
+                                @endif
                             </span>
                         </x-slot:label>
                         <div class="flex flex-wrap items-center gap-3">
@@ -45,16 +58,21 @@
                             <span class="text-sm text-base-content/60 min-w-0">{{ \App\Support\Formatters::cronTranslation($schedule->expression) }}</span>
                             @if ($this->isAdmin)
                                 <div class="flex items-center gap-0.5 shrink-0 ml-auto">
-                                    @if ($schedule->backups_count > 0)
-                                        <x-button icon="bi.database-fill-up" class="btn-ghost btn-sm text-info" wire:click="runSchedule('{{ $schedule->id }}')" spinner="runSchedule('{{ $schedule->id }}')" :tooltip-left="__('Run now')" />
-                                    @endif
                                     <x-button icon="o-pencil-square" class="btn-ghost btn-sm" wire:click="openScheduleModal('{{ $schedule->id }}')" :tooltip-left="__('Edit')" />
-                                    @if ($schedule->total_backups_count > 0)
+                                    @if ($schedule->total_backups_count > 0 || $schedule->scheduled_restores_count > 0)
                                         <x-popover>
                                             <x-slot:trigger>
                                                 <x-button icon="o-trash" class="btn-ghost btn-sm opacity-40" disabled />
                                             </x-slot:trigger>
-                                            <x-slot:content>{{ __('In use by servers') }}</x-slot:content>
+                                            <x-slot:content>
+                                                @if ($schedule->total_backups_count > 0 && $schedule->scheduled_restores_count > 0)
+                                                    {{ __('In use by servers and scheduled restores') }}
+                                                @elseif ($schedule->total_backups_count > 0)
+                                                    {{ __('In use by servers') }}
+                                                @else
+                                                    {{ __('In use by scheduled restores') }}
+                                                @endif
+                                            </x-slot:content>
                                         </x-popover>
                                     @else
                                         <x-button icon="o-trash" class="btn-ghost btn-sm text-error hover:bg-error/10" wire:click="confirmDeleteSchedule('{{ $schedule->id }}')" :tooltip-left="__('Delete')" />

tests/Feature/Configuration/BackupTest.php

@@ -3,12 +3,11 @@
 use App\Enums\UserRole;
 use App\Facades\AppConfig;
 use App\Jobs\CleanupExpiredSnapshotsJob;
-use App\Jobs\ProcessBackupJob;
 use App\Jobs\VerifySnapshotFileJob;
 use App\Livewire\Configuration\Backup;
 use App\Models\BackupSchedule;
 use App\Models\DatabaseServer;
-use App\Models\Snapshot;
+use App\Models\ScheduledRestore;
 use App\Models\User;
 use Illuminate\Support\Facades\Queue;
 use Livewire\Livewire;
@@ -130,6 +129,18 @@
     $this->assertDatabaseHas('backup_schedules', ['id' => $schedule->id]);
 });
 
+test('cannot delete a backup schedule that is referenced by a scheduled restore', function () {
+    $schedule = BackupSchedule::factory()->create();
+    ScheduledRestore::factory()->create(['backup_schedule_id' => $schedule->id]);
+
+    Livewire::actingAs(User::factory()->create(['role' => UserRole::Admin]))
+        ->test(Backup::class)
+        ->call('confirmDeleteSchedule', $schedule->id)
+        ->call('deleteSchedule');
+
+    $this->assertDatabaseHas('backup_schedules', ['id' => $schedule->id]);
+});
+
 test('schedule name must be unique', function () {
     Livewire::actingAs(User::factory()->create(['role' => UserRole::Admin]))
         ->test(Backup::class)
@@ -164,49 +175,6 @@
         ->assertForbidden();
 });
 
-test('admin can run a schedule to trigger backups for all its servers', function () {
-    Queue::fake();
-
-    $schedule = BackupSchedule::factory()->create();
-    $server = DatabaseServer::factory()->create(['database_names' => ['app']]);
-    $server->backups->first()->update(['backup_schedule_id' => $schedule->id]);
-
-    Livewire::actingAs(User::factory()->create(['role' => UserRole::Admin]))
-        ->test(Backup::class)
-        ->call('runSchedule', $schedule->id);
-
-    Queue::assertPushed(ProcessBackupJob::class);
-});
-
-test('running a schedule skips servers with backups disabled', function () {
-    Queue::fake();
-
-    $schedule = BackupSchedule::factory()->create();
-    $enabledServer = DatabaseServer::factory()->create(['database_names' => ['app'], 'backups_enabled' => true]);
-    $disabledServer = DatabaseServer::factory()->create(['database_names' => ['app'], 'backups_enabled' => false]);
-    $enabledServer->backups->first()->update(['backup_schedule_id' => $schedule->id]);
-    $disabledServer->backups->first()->update(['backup_schedule_id' => $schedule->id]);
-
-    Livewire::actingAs(User::factory()->create(['role' => UserRole::Admin]))
-        ->test(Backup::class)
-        ->call('runSchedule', $schedule->id);
-
-    Queue::assertPushed(ProcessBackupJob::class, function ($job) use ($enabledServer) {
-        return Snapshot::find($job->snapshotId)->database_server_id === $enabledServer->id;
-    });
-
-    Queue::assertNotPushed(ProcessBackupJob::class, function ($job) use ($disabledServer) {
-        return Snapshot::find($job->snapshotId)->database_server_id === $disabledServer->id;
-    });
-});
-
-test('non-admin cannot run a schedule', function () {
-    Livewire::actingAs(User::factory()->create(['role' => UserRole::Member]))
-        ->test(Backup::class)
-        ->call('runSchedule', 'fake-id')
-        ->assertForbidden();
-});
-
 test('admin can run cleanup manually', function () {
     Queue::fake();
 

tests/Feature/Console/RunScheduledRestoresTest.php

@@ -90,7 +90,7 @@
         ->and($restore->triggered_by_user_id)->toBeNull();
 
     $scheduled->refresh();
-    expect($scheduled->last_restore_id)->toBe($restore->id)
+    expect($scheduled->lastRestore?->id)->toBe($restore->id)
         ->and($scheduled->last_executed_at)->not->toBeNull()
         ->and($scheduled->last_skip_reason)->toBeNull();
 });