From 04fabf115ccea31ac504b06cc51d78423b697f60 Mon Sep 17 00:00:00 2001
From: Martin Kagamino Lehoux <martin@lehoux.net>
Date: Tue, 28 Jul 2026 15:07:57 +0200
Subject: refactor: services layer, valibot validation, shared CSS utilities,
 aria labels, and drizzle migrate

- Extract groceries/categories/references services with db injection
- Add valibot for form validation and safe numeric id parsing
- Fix category delete FK behavior with onDelete: set null + migration
- Replace custom migrate.js with drizzle-orm/libsql/migrator
- Add shared CSS utility classes in app.css (forms, lists, buttons)
- Add aria-pressed and aria-label on interactive elements
- Remove redundant app.css imports and unused /stores import
- Add integration tests for all services using drizzle migrate helper
- Remove smoke test; add db:migrate and db:studio scripts
---
 src/routes/+page.server.ts | 127 +++++++++++----------------------------------
 1 file changed, 31 insertions(+), 96 deletions(-)

(limited to 'src/routes/+page.server.ts')

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 0a8a3f4..9675ad8 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,127 +1,62 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { groceries, categories, references } from '$lib/server/db/schema';
-import { eq, desc } from 'drizzle-orm';
+import { fail, redirect, error } from '@sveltejs/kit';
+import {
+	loadUnchecked,
+	toggle,
+	addOrUncheck,
+} from '$lib/server/services/groceries';
+import {
+	numericId,
+	parseFormString,
+	parseOptionalNumber,
+} from '$lib/server/services/validation';
+import type { EnrichedGrocery } from '$lib/server/services/groceries';
+import type { Category } from '$lib/server/services/types';
 import type { Actions, PageServerLoad } from './$types';
 
-export const load: PageServerLoad = async () => {
-	const [items, cats, refs] = await Promise.all([
-		db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.checked, false))
-			.orderBy(desc(groceries.createdAt)),
-		db.select().from(categories).orderBy(desc(categories.name)),
-		db.select().from(references).orderBy(desc(references.qualityScore)),
-	]);
-
-	const catMap = new Map(cats.map((c) => [c.id, c.name]));
-	const bestRef = new Map<number, (typeof refs)[number]>();
-	for (const ref of refs) {
-		if (!bestRef.has(ref.groceryId)) {
-			bestRef.set(ref.groceryId, ref);
-		}
-	}
+export interface HomeOutput {
+	items: EnrichedGrocery[];
+	categories: Category[];
+}
 
-	return {
-		items: items.map((i) => ({
-			...i,
-			categoryName: i.categoryId ? (catMap.get(i.categoryId) ?? null) : null,
-			bestRef: bestRef.get(i.id) ?? null,
-		})),
-		categories: cats,
-	};
+export const load: PageServerLoad = async () => {
+	return loadUnchecked();
 };
 
 export const actions: Actions = {
 	add: async ({ request }) => {
 		const data = await request.formData();
-		const name = data.get('name')?.toString().trim();
-		const categoryId = data.get('category_id')?.toString() || null;
+		const name = parseFormString(data.get('name'));
+		const categoryId = parseOptionalNumber(data.get('category_id'));
 
 		if (!name) {
 			return fail(400, { error: 'Le nom est requis' });
 		}
 
-		const [existing] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.name, name))
-			.limit(1);
-
-		if (existing) {
-			await db
-				.update(groceries)
-				.set({
-					checked: false,
-					categoryId: categoryId ? Number(categoryId) : existing.categoryId,
-				})
-				.where(eq(groceries.id, existing.id));
-		} else {
-			await db.insert(groceries).values({
-				name,
-				categoryId: categoryId ? Number(categoryId) : null,
-				createdAt: new Date().toISOString(),
-			});
-		}
-
+		await addOrUncheck(name, categoryId);
 		return { success: true };
 	},
 
 	toggle: async ({ request }) => {
 		const data = await request.formData();
-		const id = Number(data.get('id'));
-
-		const [item] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.id, id));
-		if (!item) {
-			return fail(404, { error: 'Article introuvable' });
+		try {
+			const id = numericId(data.get('id'));
+			await toggle(id);
+		} catch {
+			return fail(400, { error: 'ID invalide' });
 		}
-
-		await db
-			.update(groceries)
-			.set({ checked: !item.checked })
-			.where(eq(groceries.id, id));
-
 		return { success: true };
 	},
 
 	addAndEdit: async ({ request }) => {
 		const data = await request.formData();
-		const name = data.get('name')?.toString().trim();
-		const categoryId = data.get('category_id')?.toString() || null;
+		const name = parseFormString(data.get('name'));
+		const categoryId = parseOptionalNumber(data.get('category_id'));
 
 		if (!name) {
 			return fail(400, { error: 'Le nom est requis' });
 		}
 
-		const [existing] = await db
-			.select()
-			.from(groceries)
-			.where(eq(groceries.name, name))
-			.limit(1);
-
-		if (existing) {
-			await db
-				.update(groceries)
-				.set({
-					checked: false,
-					categoryId: categoryId ? Number(categoryId) : existing.categoryId,
-				})
-				.where(eq(groceries.id, existing.id));
-			throw redirect(303, `/grocery/${existing.id}`);
-		} else {
-			const [inserted] = await db
-				.insert(groceries)
-				.values({
-					name,
-					categoryId: categoryId ? Number(categoryId) : null,
-					createdAt: new Date().toISOString(),
-				})
-				.returning();
-			throw redirect(303, `/grocery/${inserted.id}`);
-		}
+		const { item, created } = await addOrUncheck(name, categoryId);
+		throw redirect(303, `/grocery/${item.id}`);
 	},
 };
-- 
cgit v1.3