Merge 499022a328 into 2a89be6efc

packages/server/src/utils/backups/compose.ts

@@ -49,6 +49,7 @@ export const runComposeBackup = async (
 			databaseType: "mongodb",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
@@ -62,6 +63,7 @@ export const runComposeBackup = async (
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "error");

packages/server/src/utils/backups/mariadb.ts

@@ -48,6 +48,7 @@ export const runMariadbBackup = async (
 			databaseType: "mariadb",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -60,6 +61,7 @@ export const runMariadbBackup = async (
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/mongo.ts

@@ -46,6 +46,7 @@ export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => {
 			databaseType: "mongodb",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -58,6 +59,7 @@ export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => {
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/mysql.ts

@@ -47,6 +47,7 @@ export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => {
 			databaseType: "mysql",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -59,6 +60,7 @@ export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => {
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/postgres.ts

@@ -50,6 +50,7 @@ export const runPostgresBackup = async (
 			databaseType: "postgres",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
@@ -62,6 +63,7 @@ export const runPostgresBackup = async (
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "error");

packages/server/src/utils/notifications/database-backup.ts

@@ -19,6 +19,7 @@ export const sendDatabaseBackupNotifications = async ({
 	type,
 	errorMessage,
 	organizationId,
+	databaseName
 }: {
 	projectName: string;
 	applicationName: string;
@@ -26,6 +27,7 @@ export const sendDatabaseBackupNotifications = async ({
 	type: "error" | "success";
 	organizationId: string;
 	errorMessage?: string;
+	databaseName: string;
 }) => {
 	const date = new Date();
 	const unixDate = ~~(Number(date) / 1000);
@@ -90,6 +92,11 @@ export const sendDatabaseBackupNotifications = async ({
 						value: databaseType,
 						inline: true,
 					},
+					{
+						name: decorate("`📂`", "Database Name"),
+						value: databaseName,
+						inline: true,
+					},
 					{
 						name: decorate("`📅`", "Date"),
 						value: `<t:${unixDate}:D>`,
@@ -136,6 +143,7 @@ export const sendDatabaseBackupNotifications = async ({
 				`${decorate("🛠️", `Project: ${projectName}`)}` +
 					`${decorate("⚙️", `Application: ${applicationName}`)}` +
 					`${decorate("❔", `Type: ${databaseType}`)}` +
+					`${decorate("📂", `Database Name: ${databaseName}`)}` +
 					`${decorate("🕒", `Date: ${date.toLocaleString()}`)}` +
 					`${type === "error" && errorMessage ? decorate("❌", `Error:\n${errorMessage}`) : ""}`,
 			);
@@ -150,7 +158,7 @@ export const sendDatabaseBackupNotifications = async ({
 				? `\n\n<b>Error:</b>\n<pre>${errorMessage}</pre>`
 				: "";
 
-			const messageText = `<b>${statusEmoji} Database Backup ${typeStatus}</b>\n\n<b>Project:</b> ${projectName}\n<b>Application:</b> ${applicationName}\n<b>Type:</b> ${databaseType}\n<b>Date:</b> ${format(date, "PP")}\n<b>Time:</b> ${format(date, "pp")}${isError ? errorMsg : ""}`;
+			const messageText = `<b>${statusEmoji} Database Backup ${typeStatus}</b>\n\n<b>Project:</b> ${projectName}\n<b>Application:</b> ${applicationName}\n<b>Type:</b> ${databaseType}\n<b>Database Name:</b> ${databaseName}\n<b>Date:</b> ${format(date, "PP")}\n<b>Time:</b> ${format(date, "pp")}${isError ? errorMsg : ""}`;
 
 			await sendTelegramNotification(telegram, messageText);
 		}
@@ -191,6 +199,10 @@ export const sendDatabaseBackupNotifications = async ({
 								value: databaseType,
 								short: true,
 							},
+							{
+								title: "Database Name",
+								value: databaseName
+							},
 							{
 								title: "Time",
 								value: date.toLocaleString(),