refactor: Remove unnecessary code in DatabaseBackupJob and BackupExecutions

This commit is contained in:
Andras Bacsai
2024-08-26 10:32:05 +02:00
parent 1a232b9b10
commit cb39544808
2 changed files with 4 additions and 4 deletions

View File

@@ -391,7 +391,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
{ {
try { try {
$commands[] = 'mkdir -p '.$this->backup_dir; $commands[] = 'mkdir -p '.$this->backup_dir;
$backupCommand = "docker exec"; $backupCommand = 'docker exec';
if ($this->postgres_password) { if ($this->postgres_password) {
$backupCommand .= " -e PGPASSWORD=$this->postgres_password"; $backupCommand .= " -e PGPASSWORD=$this->postgres_password";
} }
@@ -468,7 +468,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
if ($this->backup->number_of_backups_locally === 0) { if ($this->backup->number_of_backups_locally === 0) {
$deletable = $this->backup->executions()->where('status', 'success'); $deletable = $this->backup->executions()->where('status', 'success');
} else { } else {
$deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally - 1); $deletable = $this->backup->executions()->where('status', 'success')->skip($this->backup->number_of_backups_locally - 1);
} }
foreach ($deletable->get() as $execution) { foreach ($deletable->get() as $execution) {
delete_backup_locally($execution->filename, $this->server); delete_backup_locally($execution->filename, $this->server);

View File

@@ -58,7 +58,7 @@ class BackupExecutions extends Component
public function refreshBackupExecutions(): void public function refreshBackupExecutions(): void
{ {
if ($this->backup) { if ($this->backup) {
$this->executions = $this->backup->executions()->get()->sortBy('created_at'); $this->executions = $this->backup->executions()->get();
} }
} }
} }