fix(restore): clear queue when restore fails

Fixes #65

Author: NeoIsRecursive

src/Jobs/RestoreJob.php

@@ -5,8 +5,10 @@
 namespace Itiden\Backup\Jobs;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Foundation\Queue\Queueable;
 use Itiden\Backup\Restorer;
+use Itiden\Backup\StateManager;
 use Statamic\Contracts\Auth\User;
 
 final class RestoreJob implements ShouldQueue
@@ -24,9 +26,17 @@ public function __construct(
     /**
      * Execute the job.
      */
-    public function handle(Restorer $backuper): void
+    public function handle(Restorer $backuper, Repository $cache): void
     {
         auth()->login($this->user); // ugly but it works;
+
         $backuper->restoreFromId($this->id);
+
+        $cache->forget(StateManager::JOB_QUEUED_KEY);
+    }
+
+    public function failed(): void
+    {
+        app(Repository::class)->forget(StateManager::JOB_QUEUED_KEY);
     }
 }

tests/Feature/CreateBackupTest.php

@@ -2,14 +2,17 @@
 
 declare(strict_types=1);
 
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
 use Itiden\Backup\Contracts\Repositories\BackupRepository;
 use Itiden\Backup\DataTransferObjects\BackupDto;
+use Itiden\Backup\Enums\State;
 use Itiden\Backup\Events\BackupCreated;
 use Itiden\Backup\Events\BackupFailed;
 use Itiden\Backup\Exceptions\RestoreFailed;
 use Itiden\Backup\Facades\Backuper;
 use Itiden\Backup\Facades\Restorer;
+use Itiden\Backup\StateManager;
 use Itiden\Backup\Tests\SkippingPipe;
 
 use function Itiden\Backup\Tests\user;
@@ -85,6 +88,8 @@
         postJson(cp_route('api.itiden.backup.store'));
 
         Event::assertDispatched(BackupFailed::class);
+        expect(Cache::has(StateManager::JOB_QUEUED_KEY))->toBeFalse();
+        expect(app(StateManager::class)->getState())->toBe(State::BackupFailed);
     });
 
     it('sets created by metadata when user is authenticated', function (): void {

tests/Feature/RestoreBackupTest.php

@@ -3,11 +3,15 @@
 declare(strict_types=1);
 
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
+use Itiden\Backup\Enums\State;
 use Itiden\Backup\Events\BackupRestored;
+use Itiden\Backup\Events\RestoreFailed;
 use Itiden\Backup\Facades\Backuper;
+use Itiden\Backup\StateManager;
 
 use function Itiden\Backup\Tests\fixtures_path;
 use function Itiden\Backup\Tests\user;
@@ -41,6 +45,24 @@
         expect($response->status())->toBe(Response::HTTP_INTERNAL_SERVER_ERROR);
     });
 
+    it('sets correct states if restore fails', function (): void {
+        Event::fake();
+        $backup = Backuper::backup();
+
+        $user = user();
+
+        $user->assignRole('super admin')->save();
+
+        actingAs($user);
+
+        config()->set('backup.pipeline', ['im-not-valid']);
+        postJson(cp_route('api.itiden.backup.restore', $backup->id));
+
+        Event::assertDispatched(RestoreFailed::class);
+        expect(Cache::has(StateManager::JOB_QUEUED_KEY))->toBeFalse();
+        expect(app(StateManager::class)->getState())->toBe(State::RestoreFailed);
+    });
+
     it('can restore by id', function (): void {
         $backup = Backuper::backup();