Merge pull request #1223 from Dokploy/fix/remove-cron-jobs-after-delete

Fix/remove cron jobs after delete

Author: Siumauricio

apps/dokploy/components/dashboard/project/add-database.tsx

@@ -89,7 +89,7 @@ const mySchema = z.discriminatedUnion("type", [
 	z
 		.object({
 			type: z.literal("postgres"),
-			databaseName: z.string().min(1, "Database name required"),
+			databaseName: z.string().default("postgres"),
 			databaseUser: z.string().default("postgres"),
 		})
 		.merge(baseDatabaseSchema),
@@ -110,7 +110,7 @@ const mySchema = z.discriminatedUnion("type", [
 			type: z.literal("mysql"),
 			databaseRootPassword: z.string().default(""),
 			databaseUser: z.string().default("mysql"),
-			databaseName: z.string().min(1, "Database name required"),
+			databaseName: z.string().default("mysql"),
 		})
 		.merge(baseDatabaseSchema),
 	z
@@ -119,7 +119,7 @@ const mySchema = z.discriminatedUnion("type", [
 			dockerImage: z.string().default("mariadb:4"),
 			databaseRootPassword: z.string().default(""),
 			databaseUser: z.string().default("mariadb"),
-			databaseName: z.string().min(1, "Database name required"),
+			databaseName: z.string().default("mariadb"),
 		})
 		.merge(baseDatabaseSchema),
 ]);
@@ -206,7 +206,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 			promise = postgresMutation.mutateAsync({
 				...commonParams,
 				databasePassword: data.databasePassword,
-				databaseName: data.databaseName,
+				databaseName: data.databaseName || "postgres",
 
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
@@ -233,7 +233,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				...commonParams,
 				databasePassword: data.databasePassword,
 				databaseRootPassword: data.databaseRootPassword,
-				databaseName: data.databaseName,
+				databaseName: data.databaseName || "mariadb",
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
 				serverId: data.serverId,
@@ -242,7 +242,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 			promise = mysqlMutation.mutateAsync({
 				...commonParams,
 				databasePassword: data.databasePassword,
-				databaseName: data.databaseName,
+				databaseName: data.databaseName || "mysql",
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
 				databaseRootPassword: data.databaseRootPassword,

apps/dokploy/server/api/routers/mariadb.ts

@@ -9,13 +9,15 @@ import {
 	apiSaveExternalPortMariaDB,
 	apiUpdateMariaDB,
 } from "@/server/db/schema";
+import { cancelJobs } from "@/server/utils/backup";
 import {
 	IS_CLOUD,
 	addNewService,
 	checkServiceAccess,
 	createMariadb,
 	createMount,
 	deployMariadb,
+	findBackupsByDbId,
 	findMariadbById,
 	findProjectById,
 	findServerById,
@@ -211,8 +213,10 @@ export const mariadbRouter = createTRPCRouter({
 				});
 			}
 
+			const backups = await findBackupsByDbId(input.mariadbId, "mariadb");
 			const cleanupOperations = [
 				async () => await removeService(mongo?.appName, mongo.serverId),
+				async () => await cancelJobs(backups),
 				async () => await removeMariadbById(input.mariadbId),
 			];
 

apps/dokploy/server/api/routers/mongo.ts

@@ -9,13 +9,15 @@ import {
 	apiSaveExternalPortMongo,
 	apiUpdateMongo,
 } from "@/server/db/schema";
+import { cancelJobs } from "@/server/utils/backup";
 import {
 	IS_CLOUD,
 	addNewService,
 	checkServiceAccess,
 	createMongo,
 	createMount,
 	deployMongo,
+	findBackupsByDbId,
 	findMongoById,
 	findProjectById,
 	removeMongoById,
@@ -252,9 +254,11 @@ export const mongoRouter = createTRPCRouter({
 					message: "You are not authorized to delete this mongo",
 				});
 			}
+			const backups = await findBackupsByDbId(input.mongoId, "mongo");
 
 			const cleanupOperations = [
 				async () => await removeService(mongo?.appName, mongo.serverId),
+				async () => await cancelJobs(backups),
 				async () => await removeMongoById(input.mongoId),
 			];
 

apps/dokploy/server/api/routers/mysql.ts

@@ -12,13 +12,15 @@ import {
 
 import { TRPCError } from "@trpc/server";
 
+import { cancelJobs } from "@/server/utils/backup";
 import {
 	IS_CLOUD,
 	addNewService,
 	checkServiceAccess,
 	createMount,
 	createMysql,
 	deployMySql,
+	findBackupsByDbId,
 	findMySqlById,
 	findProjectById,
 	removeMySqlById,
@@ -249,8 +251,10 @@ export const mysqlRouter = createTRPCRouter({
 				});
 			}
 
+			const backups = await findBackupsByDbId(input.mysqlId, "mysql");
 			const cleanupOperations = [
 				async () => await removeService(mongo?.appName, mongo.serverId),
+				async () => await cancelJobs(backups),
 				async () => await removeMySqlById(input.mysqlId),
 			];
 

apps/dokploy/server/api/routers/postgres.ts

@@ -14,13 +14,15 @@ import {
 	apiSaveExternalPortPostgres,
 	apiUpdatePostgres,
 } from "@/server/db/schema";
+import { cancelJobs } from "@/server/utils/backup";
 import {
 	IS_CLOUD,
 	addNewService,
 	checkServiceAccess,
 	createMount,
 	createPostgres,
 	deployPostgres,
+	findBackupsByDbId,
 	findPostgresById,
 	findProjectById,
 	removePostgresById,
@@ -231,8 +233,11 @@ export const postgresRouter = createTRPCRouter({
 				});
 			}
 
+			const backups = await findBackupsByDbId(input.postgresId, "postgres");
+
 			const cleanupOperations = [
 				removeService(postgres.appName, postgres.serverId),
+				cancelJobs(backups),
 				removePostgresById(input.postgresId),
 			];
 

apps/dokploy/server/api/routers/redis.ts

@@ -244,7 +244,6 @@ export const redisRouter = createTRPCRouter({
 					message: "You are not authorized to delete this Redis",
 				});
 			}
-
 			const cleanupOperations = [
 				async () => await removeService(redis?.appName, redis.serverId),
 				async () => await removeRedisById(input.redisId),

apps/dokploy/server/utils/backup.ts

@@ -1,3 +1,10 @@
+import {
+	type BackupScheduleList,
+	IS_CLOUD,
+	removeScheduleBackup,
+	scheduleBackup,
+} from "@dokploy/server/index";
+
 type QueueJob =
 	| {
 			type: "backup";
@@ -59,3 +66,19 @@ export const updateJob = async (job: QueueJob) => {
 		throw error;
 	}
 };
+
+export const cancelJobs = async (backups: BackupScheduleList) => {
+	for (const backup of backups) {
+		if (backup.enabled) {
+			if (IS_CLOUD) {
+				await removeJob({
+					cronSchedule: backup.schedule,
+					backupId: backup.backupId,
+					type: "backup",
+				});
+			} else {
+				removeScheduleBackup(backup.backupId);
+			}
+		}
+	}
+};

packages/server/src/services/backup.ts

@@ -2,11 +2,13 @@ import { db } from "@dokploy/server/db";
 import { type apiCreateBackup, backups } from "@dokploy/server/db/schema";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
+import { IS_CLOUD } from "../constants";
+import { removeScheduleBackup, scheduleBackup } from "../utils/backups/utils";
 
 export type Backup = typeof backups.$inferSelect;
 
 export type BackupSchedule = Awaited<ReturnType<typeof findBackupById>>;
-
+export type BackupScheduleList = Awaited<ReturnType<typeof findBackupsByDbId>>;
 export const createBackup = async (input: typeof apiCreateBackup._type) => {
 	const newBackup = await db
 		.insert(backups)
@@ -69,3 +71,20 @@ export const removeBackupById = async (backupId: string) => {
 
 	return result[0];
 };
+
+export const findBackupsByDbId = async (
+	id: string,
+	type: "postgres" | "mysql" | "mariadb" | "mongo",
+) => {
+	const result = await db.query.backups.findMany({
+		where: eq(backups[`${type}Id`], id),
+		with: {
+			postgres: true,
+			mysql: true,
+			mariadb: true,
+			mongo: true,
+			destination: true,
+		},
+	});
+	return result || [];
+};