fix: fixed backup failure email not being sent

vanguardbackup · Jul 5, 2024 · 924b670 · 924b670
1 parent 7c17704
commit 924b670
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/app/Services/Backup/Backup.php b/app/Services/Backup/Backup.php
@@ -149,14 +149,6 @@ public function sendEmailNotificationOfTaskFailure(BackupTask $backupTask, strin
         }
     }
 
-    public function handleFailure(BackupTask $backupTask, string &$logOutput, string $errorMessage): void
-    {
-        $this->logError('Handling failure for backup task.', ['backup_task_id' => $backupTask->getAttribute('id'), 'error' => $errorMessage]);
-
-        $logOutput .= "\n" . $errorMessage;
-        $this->sendEmailNotificationOfTaskFailure($backupTask, $errorMessage);
-    }
-
     /**
      * @throws SFTPConnectionException
      */

diff --git a/app/Services/Backup/Tasks/AbstractBackupTask.php b/app/Services/Backup/Tasks/AbstractBackupTask.php
@@ -85,6 +85,7 @@ protected function finalizeSuccessfulBackup(): void
     protected function handleBackupFailure(Exception $exception): void
     {
         $this->logOutput .= 'Error in backup process: ' . $exception->getMessage() . "\n";
+        $this->sendEmailNotificationOfTaskFailure($this->backupTask, $exception->getMessage());
         Log::error("Error in backup process for task {$this->backupTask->id}: " . $exception->getMessage(), ['exception' => $exception]);
     }
 

diff --git a/tests/Unit/Services/Backup/Tasks/AbstractBackupTaskTest.php b/tests/Unit/Services/Backup/Tasks/AbstractBackupTaskTest.php
@@ -4,13 +4,15 @@
 
 namespace Tests\Unit\Services\Backup\Tasks;
 
+use App\Mail\BackupTaskFailed;
 use App\Models\BackupTask;
 use App\Models\BackupTaskLog;
 use App\Services\Backup\Contracts\SFTPInterface;
 use App\Services\Backup\Tasks\AbstractBackupTask;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
+use Mail;
 use Mockery;
 use ReflectionClass;
 
@@ -102,11 +104,14 @@ protected function performBackup(): void
 });
 
 it('handles backup failure', function (): void {
+    Mail::fake();
     $method = $this->reflection->getMethod('handleBackupFailure');
 
     $exception = new Exception('Test exception');
     $method->invoke($this->abstractBackupTask, $exception);
 
+    Mail::assertQueued(BackupTaskFailed::class);
+
     expect($this->abstractBackupTask->getLogOutput())
         ->toContain('Error in backup process: Test exception');
 });