refactor: frontend components consolidation

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

@@ -30,9 +30,12 @@ const backupScheduleSchema = type({
 	nextBackupAt: "number | null",
 	createdAt: "number",
 	updatedAt: "number",
-});
-
-export type BackupScheduleDto = typeof backupScheduleSchema.infer;
+}).and(
+	type({
+		volume: volumeSchema,
+		repository: repositorySchema,
+	}),
+);
 
 /**
  * List all backup schedules
@@ -60,12 +63,7 @@ export const listBackupSchedulesDto = describeRoute({
 /**
  * Get a single backup schedule
  */
-export const getBackupScheduleResponse = backupScheduleSchema.and(
-	type({
-		volume: volumeSchema,
-		repository: repositorySchema,
-	}),
-);
+export const getBackupScheduleResponse = backupScheduleSchema;
 
 export type GetBackupScheduleDto = typeof getBackupScheduleResponse.infer;
 
@@ -121,7 +119,7 @@ export const createBackupScheduleBody = type({
 
 export type CreateBackupScheduleBody = typeof createBackupScheduleBody.infer;
 
-export const createBackupScheduleResponse = backupScheduleSchema;
+export const createBackupScheduleResponse = backupScheduleSchema.omit("volume", "repository");
 
 export type CreateBackupScheduleDto = typeof createBackupScheduleResponse.infer;
 
@@ -156,7 +154,7 @@ export const updateBackupScheduleBody = type({
 
 export type UpdateBackupScheduleBody = typeof updateBackupScheduleBody.infer;
 
-export const updateBackupScheduleResponse = backupScheduleSchema;
+export const updateBackupScheduleResponse = backupScheduleSchema.omit("volume", "repository");
 
 export type UpdateBackupScheduleDto = typeof updateBackupScheduleResponse.infer;
 
@@ -192,7 +190,7 @@ export const upsertBackupScheduleBody = type({
 
 export type UpsertBackupScheduleBody = typeof upsertBackupScheduleBody.infer;
 
-export const upsertBackupScheduleResponse = backupScheduleSchema;
+export const upsertBackupScheduleResponse = backupScheduleSchema.omit("volume", "repository");
 
 export type UpsertBackupScheduleDto = typeof upsertBackupScheduleResponse.infer;
 

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

@@ -27,7 +27,12 @@ const calculateNextRun = (cronExpression: string): number => {
 };
 
 const listSchedules = async () => {
-	const schedules = await db.query.backupSchedulesTable.findMany({});
+	const schedules = await db.query.backupSchedulesTable.findMany({
+		with: {
+			volume: true,
+			repository: true,
+		},
+	});
 	return schedules;
 };
 
@@ -259,6 +264,7 @@ const getSchedulesToExecute = async () => {
 const getScheduleForVolume = async (volumeId: number) => {
 	const schedule = await db.query.backupSchedulesTable.findFirst({
 		where: eq(backupSchedulesTable.volumeId, volumeId),
+		with: { volume: true, repository: true },
 	});
 
 	return schedule ?? null;

apps/server/src/modules/volumes/volume.controller.ts

@@ -29,14 +29,7 @@ export const volumeController = new Hono()
 	.get("/", listVolumesDto, async (c) => {
 		const volumes = await volumeService.listVolumes();
 
-		const response = {
-			volumes: volumes.map((volume) => ({
-				path: getVolumePath(volume.name),
-				...volume,
-			})),
-		};
-
-		return c.json<ListVolumesDto>(response, 200);
+		return c.json<ListVolumesDto>(volumes, 200);
 	})
 	.post("/", createVolumeDto, validator("json", createVolumeBody), async (c) => {
 		const body = c.req.valid("json");

apps/server/src/modules/volumes/volume.dto.ts

@@ -5,7 +5,6 @@ import { describeRoute, resolver } from "hono-openapi";
 export const volumeSchema = type({
 	id: "number",
 	name: "string",
-	path: "string",
 	type: type.valueOf(BACKEND_TYPES),
 	status: type.valueOf(BACKEND_STATUS),
 	lastError: "string | null",
@@ -21,9 +20,7 @@ export type VolumeDto = typeof volumeSchema.infer;
 /**
  * List all volumes
  */
-export const listVolumesResponse = type({
-	volumes: volumeSchema.array(),
-});
+export const listVolumesResponse = volumeSchema.array();
 export type ListVolumesDto = typeof listVolumesResponse.infer;
 
 export const listVolumesDto = describeRoute({