1 files changed, 15 insertions, 39 deletions

diff --git a/src/routes/catalog/+page.server.ts b/src/routes/catalog/+page.server.ts
index a3a611e..69a775a 100644
--- a/src/routes/catalog/+page.server.ts
+++ b/src/routes/catalog/+page.server.ts
@@ -1,52 +1,28 @@
 import { fail } 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 { loadAll, toggle } from '$lib/server/services/groceries';
+import { numericId } 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).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 CatalogOutput {
+	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 loadAll();
 };
 
 export const actions: Actions = {
 	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 };
 	},
 };