refactor: simplify dtos and improve type saftey in json returns

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

@@ -5,11 +5,12 @@ import {
 	createRepositoryDto,
 	deleteRepositoryDto,
 	getRepositoryDto,
-	type GetRepositoryResponseDto,
-	type ListRepositoriesResponseDto,
 	listRepositoriesDto,
 	listSnapshotsDto,
-	type ListSnapshotsResponseDto,
+	type DeleteRepositoryDto,
+	type GetRepositoryDto,
+	type ListRepositoriesDto,
+	type ListSnapshotsDto,
 } from "./repositories.dto";
 import { repositoriesService } from "./repositories.service";
 
@@ -17,16 +18,7 @@ export const repositoriesController = new Hono()
 	.get("/", listRepositoriesDto, async (c) => {
 		const repositories = await repositoriesService.listRepositories();
 
-		const response = {
-			repositories: repositories.map((repository) => ({
-				...repository,
-				updatedAt: repository.updatedAt.getTime(),
-				createdAt: repository.createdAt.getTime(),
-				lastChecked: repository.lastChecked?.getTime() ?? null,
-			})),
-		} satisfies ListRepositoriesResponseDto;
-
-		return c.json(response, 200);
+		return c.json<ListRepositoriesDto>(repositories, 200);
 	})
 	.post("/", createRepositoryDto, validator("json", createRepositoryBody), async (c) => {
 		const body = c.req.valid("json");
@@ -38,22 +30,13 @@ export const repositoriesController = new Hono()
 		const { name } = c.req.param();
 		const res = await repositoriesService.getRepository(name);
 
-		const response = {
-			repository: {
-				...res.repository,
-				createdAt: res.repository.createdAt.getTime(),
-				updatedAt: res.repository.updatedAt.getTime(),
-				lastChecked: res.repository.lastChecked?.getTime() ?? null,
-			},
-		} satisfies GetRepositoryResponseDto;
-
-		return c.json(response, 200);
+		return c.json<GetRepositoryDto>(res.repository, 200);
 	})
 	.delete("/:name", deleteRepositoryDto, async (c) => {
 		const { name } = c.req.param();
 		await repositoriesService.deleteRepository(name);
 
-		return c.json({ message: "Repository deleted" }, 200);
+		return c.json<DeleteRepositoryDto>({ message: "Repository deleted" }, 200);
 	})
 	.get("/:name/snapshots", listSnapshotsDto, async (c) => {
 		const { name } = c.req.param();
@@ -77,9 +60,9 @@ export const repositoriesController = new Hono()
 			};
 		});
 
-		const response = { snapshots } satisfies ListSnapshotsResponseDto;
+		const response = { snapshots };
 
 		c.header("Cache-Control", "max-age=30, stale-while-revalidate=300");
 
-		return c.json(response, 200);
+		return c.json<ListSnapshotsDto>(response, 200);
 	});

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

@@ -25,10 +25,8 @@ export type RepositoryDto = typeof repositorySchema.infer;
 /**
  * List all repositories
  */
-export const listRepositoriesResponse = type({
-	repositories: repositorySchema.array(),
-});
-export type ListRepositoriesResponseDto = typeof listRepositoriesResponse.infer;
+export const listRepositoriesResponse = repositorySchema.array();
+export type ListRepositoriesDto = typeof listRepositoriesResponse.infer;
 
 export const listRepositoriesDto = describeRoute({
 	description: "List all repositories",
@@ -65,6 +63,8 @@ export const createRepositoryResponse = type({
 	}),
 });
 
+export type CreateRepositoryDto = typeof createRepositoryResponse.infer;
+
 export const createRepositoryDto = describeRoute({
 	description: "Create a new restic repository",
 	operationId: "createRepository",
@@ -84,10 +84,8 @@ export const createRepositoryDto = describeRoute({
 /**
  * Get a single repository
  */
-export const getRepositoryResponse = type({
-	repository: repositorySchema,
-});
-export type GetRepositoryResponseDto = typeof getRepositoryResponse.infer;
+export const getRepositoryResponse = repositorySchema;
+export type GetRepositoryDto = typeof getRepositoryResponse.infer;
 
 export const getRepositoryDto = describeRoute({
 	description: "Get a single repository by name",
@@ -112,6 +110,8 @@ export const deleteRepositoryResponse = type({
 	message: "string",
 });
 
+export type DeleteRepositoryDto = typeof deleteRepositoryResponse.infer;
+
 export const deleteRepositoryDto = describeRoute({
 	description: "Delete a repository",
 	tags: ["Repositories"],
@@ -143,7 +143,7 @@ const listSnapshotsResponse = type({
 	snapshots: snapshotSchema.array(),
 });
 
-export type ListSnapshotsResponseDto = typeof listSnapshotsResponse.infer;
+export type ListSnapshotsDto = typeof listSnapshotsResponse.infer;
 
 export const listSnapshotsDto = describeRoute({
 	description: "List all snapshots in a repository",

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

@@ -65,7 +65,7 @@ const createRepository = async (name: string, config: RepositoryConfig, compress
 			.update(repositoriesTable)
 			.set({
 				status: "healthy",
-				lastChecked: new Date(),
+				lastChecked: Date.now(),
 				lastError: null,
 			})
 			.where(eq(repositoriesTable.id, id));