diff --git a/app/Services/Backup/Tasks/DatabaseBackupTask.php b/app/Services/Backup/Tasks/DatabaseBackupTask.php index 1fb10f3a..05c55479 100644 --- a/app/Services/Backup/Tasks/DatabaseBackupTask.php +++ b/app/Services/Backup/Tasks/DatabaseBackupTask.php @@ -38,6 +38,9 @@ protected function performBackup(): void $dumpFileName = $this->generateBackupFileName('sql'); $remoteDumpPath = '/tmp/' . $dumpFileName; + $dirSize = $this->getRemoteDirectorySize($sftp, $remoteDumpPath); + $this->backupSize = $dirSize; + $this->dumpRemoteDatabase($sftp, $databaseType, $remoteDumpPath, $databasePassword, $databaseName, $this->backupTask->getAttribute('excluded_database_tables')); if (! $this->backupDestinationDriver($backupDestinationModel->type, $sftp, $remoteDumpPath, $backupDestinationModel, $dumpFileName, $storagePath)) { diff --git a/tests/Unit/Services/Backup/Tasks/DatabaseBackupTaskTest.php b/tests/Unit/Services/Backup/Tasks/DatabaseBackupTaskTest.php index 9c103a25..313fefa6 100644 --- a/tests/Unit/Services/Backup/Tasks/DatabaseBackupTaskTest.php +++ b/tests/Unit/Services/Backup/Tasks/DatabaseBackupTaskTest.php @@ -65,6 +65,7 @@ $this->databaseBackupTask->shouldReceive('getDatabaseType')->andReturn(BackupConstants::DATABASE_TYPE_MYSQL); $this->databaseBackupTask->shouldReceive('dumpRemoteDatabase')->andReturnNull(); $this->databaseBackupTask->shouldReceive('createBackupDestinationInstance')->andReturn($this->s3Mock); + $this->databaseBackupTask->shouldReceive('getRemoteDirectorySize')->andReturn('500'); $this->databaseBackupTask->shouldReceive('rotateOldBackups')->andReturnNull(); $this->databaseBackupTask->shouldReceive('updateBackupTaskStatus')->twice(); @@ -145,6 +146,7 @@ $this->databaseBackupTask->shouldReceive('dumpRemoteDatabase')->andReturnNull(); $this->databaseBackupTask->shouldReceive('createBackupDestinationInstance')->andReturn($this->s3Mock); $this->databaseBackupTask->shouldReceive('rotateOldBackups')->once()->andReturnNull(); + $this->databaseBackupTask->shouldReceive('getRemoteDirectorySize')->andReturn('500'); $this->databaseBackupTask->shouldReceive('updateBackupTaskStatus')->twice();