Merge pull request #150 from jkaninda/refactor

chore: add convert backup size from bytes to Mib
jkaninda · Dec 10, 2024 · fdb79d3 · fdb79d3
2 parents f9dbd0b + 0191503
commit fdb79d3
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/pkg/azure.go b/pkg/azure.go
@@ -63,7 +63,7 @@ func azureBackup(db *dbConfig, config *BackupConfig) {
 	// Send notification
 	utils.NotifySuccess(&utils.NotificationData{
 		File:           finalFileName,
-		BackupSize:     backupSize,
+		BackupSize:     utils.BytesToMb(uint64(backupSize)),
 		Database:       db.dbName,
 		Storage:        config.storage,
 		BackupLocation: filepath.Join(config.remotePath, finalFileName),

diff --git a/pkg/backup.go b/pkg/backup.go
@@ -290,7 +290,7 @@ func localBackup(db *dbConfig, config *BackupConfig) {
 	// Send notification
 	utils.NotifySuccess(&utils.NotificationData{
 		File:           finalFileName,
-		BackupSize:     backupSize,
+		BackupSize:     utils.BytesToMb(uint64(backupSize)),
 		Database:       db.dbName,
 		Storage:        config.storage,
 		BackupLocation: filepath.Join(storagePath, finalFileName),

diff --git a/pkg/remote.go b/pkg/remote.go
@@ -92,7 +92,7 @@ func sshBackup(db *dbConfig, config *BackupConfig) {
 	// Send notification
 	utils.NotifySuccess(&utils.NotificationData{
 		File:           finalFileName,
-		BackupSize:     backupSize,
+		BackupSize:     utils.BytesToMb(uint64(backupSize)),
 		Database:       db.dbName,
 		Storage:        config.storage,
 		BackupLocation: filepath.Join(config.remotePath, finalFileName),
@@ -204,7 +204,7 @@ func ftpBackup(db *dbConfig, config *BackupConfig) {
 	// Send notification
 	utils.NotifySuccess(&utils.NotificationData{
 		File:           finalFileName,
-		BackupSize:     backupSize,
+		BackupSize:     utils.BytesToMb(uint64(backupSize)),
 		Database:       db.dbName,
 		Storage:        config.storage,
 		BackupLocation: filepath.Join(config.remotePath, finalFileName),

diff --git a/pkg/s3.go b/pkg/s3.go
@@ -93,7 +93,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
 	// Send notification
 	utils.NotifySuccess(&utils.NotificationData{
 		File:           finalFileName,
-		BackupSize:     backupSize,
+		BackupSize:     utils.BytesToMb(uint64(backupSize)),
 		Database:       db.dbName,
 		Storage:        config.storage,
 		BackupLocation: filepath.Join(config.remotePath, finalFileName),

diff --git a/pkg/var.go b/pkg/var.go
@@ -45,14 +45,12 @@ var (
 // dbHVars Required environment variables for database
 var dbHVars = []string{
 	"DB_HOST",
-	"DB_PORT",
 	"DB_PASSWORD",
 	"DB_USERNAME",
 	"DB_NAME",
 }
 var tdbRVars = []string{
 	"TARGET_DB_HOST",
-	"TARGET_DB_PORT",
 	"TARGET_DB_NAME",
 	"TARGET_DB_USERNAME",
 	"TARGET_DB_PASSWORD",

diff --git a/templates/email-error.tmpl b/templates/email-error.tmpl
@@ -52,9 +52,9 @@
         <h3>Failure Details:</h3>
         <ul>
             <li><strong>Database Name:</strong> {{.DatabaseName}}</li>
-            <li><strong>Error Message:</strong> {{.Error}}</li>
             <li><strong>Date:</strong> {{.EndTime}}</li>
             <li><strong>Backup Reference:</strong> {{.BackupReference}}</li>
+            <li><strong>Error Message:</strong> {{.Error}}</li>
         </ul>
     </div>
 

diff --git a/templates/email.tmpl b/templates/email.tmpl
@@ -45,7 +45,7 @@
 </head>
 <body>
     <h2>✅ Database Backup Successful</h2>
-    <p>Dear Team,</p>
+    <p>Hi,</p>
     <p>The backup process for the <strong>{{.Database}}</strong> database was successfully completed. Please find the details below:</p>
 
     <div class="details">
@@ -56,7 +56,7 @@
             <li><strong>Backup End Time:</strong> {{.EndTime}}</li>
             <li><strong>Backup Storage:</strong> {{.Storage}}</li>
             <li><strong>Backup Location:</strong> {{.BackupLocation}}</li>
-            <li><strong>Backup Size:</strong> {{.BackupSize}} bytes</li>
+            <li><strong>Backup Size:</strong> {{.BackupSize}}  MiB</li>
             <li><strong>Backup Reference:</strong> {{.BackupReference}}</li>
         </ul>
     </div>

diff --git a/templates/telegram.tmpl b/templates/telegram.tmpl
@@ -1,6 +1,6 @@
 ✅ Database Backup Successful
 
-Dear Team,
+Hi,
 The backup process for the {{.Database}} database was successfully completed.
 Please find the details below:
 
@@ -10,7 +10,7 @@ Backup Details:
 - Backup EndTime: {{.EndTime}}
 - Backup Storage: {{.Storage}}
 - Backup Location: {{.BackupLocation}}
-- Backup Size: {{.BackupSize}} bytes
+- Backup Size: {{.BackupSize}}  MiB
 - Backup Reference: {{.BackupReference}}
 
 You can access the backup at the specified location if needed.
diff --git a/utils/config.go b/utils/config.go
@@ -37,7 +37,7 @@ type MailConfig struct {
 }
 type NotificationData struct {
 	File            string
-	BackupSize      int64
+	BackupSize      uint64
 	Database        string
 	StartTime       string
 	EndTime         string

diff --git a/utils/utils.go b/utils/utils.go
@@ -254,3 +254,7 @@ func CronNextTime(cronExpr string) time.Time {
 	next := schedule.Next(now)
 	return next
 }
+
+func BytesToMb(b uint64) uint64 {
+	return b / 1024 / 1024
+}