refactor(backups): use upsert instead of create/update split

apps/server/src/modules/backups/backups.controller.ts

@@ -10,6 +10,8 @@ import {
 	runBackupNowDto,
 	updateBackupScheduleBody,
 	updateBackupScheduleDto,
+	upsertBackupScheduleBody,
+	upsertBackupScheduleDto,
 	type CreateBackupScheduleDto,
 	type DeleteBackupScheduleDto,
 	type GetBackupScheduleDto,
@@ -17,6 +19,7 @@ import {
 	type ListBackupSchedulesResponseDto,
 	type RunBackupNowDto,
 	type UpdateBackupScheduleDto,
+	type UpsertBackupScheduleDto,
 } from "./backups.dto";
 import { backupsService } from "./backups.service";
 
@@ -54,6 +57,13 @@ export const backupScheduleController = new Hono()
 
 		return c.json<UpdateBackupScheduleDto>(schedule, 200);
 	})
+	.put("/upsert", upsertBackupScheduleDto, validator("json", upsertBackupScheduleBody), async (c) => {
+		const body = c.req.valid("json");
+
+		const schedule = await backupsService.upsertSchedule(body);
+
+		return c.json<UpsertBackupScheduleDto>(schedule, 200);
+	})
 	.delete("/:scheduleId", deleteBackupScheduleDto, async (c) => {
 		const scheduleId = c.req.param("scheduleId");
 

apps/server/src/modules/backups/backups.dto.ts

@@ -169,6 +169,42 @@ export const updateBackupScheduleDto = describeRoute({
 	},
 });
 
+/**
+ * Upsert a backup schedule (create or update)
+ */
+export const upsertBackupScheduleBody = type({
+	volumeId: "number",
+	repositoryId: "string",
+	enabled: "boolean",
+	cronExpression: "string",
+	retentionPolicy: retentionPolicySchema.optional(),
+	excludePatterns: "string[]?",
+	includePatterns: "string[]?",
+	tags: "string[]?",
+});
+
+export type UpsertBackupScheduleBody = typeof upsertBackupScheduleBody.infer;
+
+export const upsertBackupScheduleResponse = backupScheduleSchema;
+
+export type UpsertBackupScheduleDto = typeof upsertBackupScheduleResponse.infer;
+
+export const upsertBackupScheduleDto = describeRoute({
+	description: "Create or update a backup schedule for a volume",
+	operationId: "upsertBackupSchedule",
+	tags: ["Backups"],
+	responses: {
+		200: {
+			description: "Backup schedule upserted successfully",
+			content: {
+				"application/json": {
+					schema: resolver(upsertBackupScheduleResponse),
+				},
+			},
+		},
+	},
+});
+
 /**
  * Delete a backup schedule
  */

apps/server/src/modules/backups/backups.service.ts

@@ -7,7 +7,7 @@ import { backupSchedulesTable, repositoriesTable, volumesTable } from "../../db/
 import { restic } from "../../utils/restic";
 import { logger } from "../../utils/logger";
 import { getVolumePath } from "../volumes/helpers";
-import type { CreateBackupScheduleBody, UpdateBackupScheduleBody } from "./backups.dto";
+import type { CreateBackupScheduleBody, UpdateBackupScheduleBody, UpsertBackupScheduleBody } from "./backups.dto";
 import { toMessage } from "../../utils/errors";
 
 const calculateNextRun = (cronExpression: string): number => {
@@ -255,6 +255,77 @@ const getScheduleForVolume = async (volumeId: number) => {
 	return schedule ?? null;
 };
 
+const upsertSchedule = async (data: UpsertBackupScheduleBody) => {
+	if (!cron.validate(data.cronExpression)) {
+		throw new BadRequestError("Invalid cron expression");
+	}
+
+	const volume = await db.query.volumesTable.findFirst({
+		where: eq(volumesTable.id, data.volumeId),
+	});
+
+	if (!volume) {
+		throw new NotFoundError("Volume not found");
+	}
+
+	const repository = await db.query.repositoriesTable.findFirst({
+		where: eq(repositoriesTable.id, data.repositoryId),
+	});
+
+	if (!repository) {
+		throw new NotFoundError("Repository not found");
+	}
+
+	const existingSchedule = await db.query.backupSchedulesTable.findFirst({
+		where: eq(backupSchedulesTable.volumeId, data.volumeId),
+	});
+
+	const nextBackupAt = calculateNextRun(data.cronExpression);
+
+	if (existingSchedule) {
+		const [updated] = await db
+			.update(backupSchedulesTable)
+			.set({
+				repositoryId: data.repositoryId,
+				enabled: data.enabled,
+				cronExpression: data.cronExpression,
+				retentionPolicy: data.retentionPolicy ?? null,
+				excludePatterns: data.excludePatterns ?? [],
+				includePatterns: data.includePatterns ?? [],
+				nextBackupAt: nextBackupAt,
+				updatedAt: Date.now(),
+			})
+			.where(eq(backupSchedulesTable.id, existingSchedule.id))
+			.returning();
+
+		if (!updated) {
+			throw new Error("Failed to update backup schedule");
+		}
+
+		return updated;
+	}
+
+	const [newSchedule] = await db
+		.insert(backupSchedulesTable)
+		.values({
+			volumeId: data.volumeId,
+			repositoryId: data.repositoryId,
+			enabled: data.enabled,
+			cronExpression: data.cronExpression,
+			retentionPolicy: data.retentionPolicy ?? null,
+			excludePatterns: data.excludePatterns ?? [],
+			includePatterns: data.includePatterns ?? [],
+			nextBackupAt: nextBackupAt,
+		})
+		.returning();
+
+	if (!newSchedule) {
+		throw new Error("Failed to create backup schedule");
+	}
+
+	return newSchedule;
+};
+
 export const backupsService = {
 	listSchedules,
 	getSchedule,
@@ -264,4 +335,5 @@ export const backupsService = {
 	executeBackup,
 	getSchedulesToExecute,
 	getScheduleForVolume,
+	upsertSchedule,
 };