Skip to content

Commit cbf502c

Browse files
FIX (backups): Fix deleting backups on storage change from joined storages
1 parent 6ccf52b commit cbf502c

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

backend/internal/features/backups/backups/model.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package backups
22

33
import (
4-
"log/slog"
54
"postgresus-backend/internal/features/databases"
65
"postgresus-backend/internal/features/storages"
76
"time"
@@ -27,16 +26,3 @@ type Backup struct {
2726

2827
CreatedAt time.Time `json:"createdAt" gorm:"column:created_at"`
2928
}
30-
31-
func (b *Backup) DeleteBackupFromStorage(logger *slog.Logger) {
32-
if b.Status != BackupStatusCompleted {
33-
return
34-
}
35-
36-
err := b.Storage.DeleteFile(b.ID)
37-
if err != nil {
38-
logger.Error("Failed to delete backup from storage", "error", err)
39-
// we ignore the error, because the access to the storage
40-
// may be lost, file already deleted, etc.
41-
}
42-
}

backend/internal/features/backups/backups/service.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,15 @@ func (s *BackupService) deleteBackup(backup *Backup) error {
347347
}
348348
}
349349

350-
backup.DeleteBackupFromStorage(s.logger)
350+
storage, err := s.storageService.GetStorageByID(backup.StorageID)
351+
if err != nil {
352+
return err
353+
}
354+
355+
err = storage.DeleteFile(backup.ID)
356+
if err != nil {
357+
return err
358+
}
351359

352360
return s.backupRepository.DeleteByID(backup.ID)
353361
}

0 commit comments

Comments
 (0)