3 files changed, 11 insertions, 17 deletions
diff --git a/src/routes/groceries/+page.server.ts b/src/routes/groceries/+page.server.ts
index 1cae275..d33c6a5 100644
--- a/src/routes/groceries/+page.server.ts
+++ b/src/routes/groceries/+page.server.ts
@@ -1,4 +1,4 @@
-import { loadUnchecked, loadAll } from '$lib/server/services/groceries';
+import { groceriesService } from '$lib/server/services';
 import {
 	addGroceryAction,
 	addGroceryAndEditAction,
@@ -15,8 +15,8 @@ export interface GroceriesOutput {
 }
 
 export const load: PageServerLoad = async () => {
-	const unchecked = await loadUnchecked();
-	const all = await loadAll();
+	const unchecked = await groceriesService.loadUnchecked();
+	const all = await groceriesService.loadAll();
 	return {
 		items: unchecked.items,
 		categories: unchecked.categories,
diff --git a/src/routes/groceries/catalog/+page.server.ts b/src/routes/groceries/catalog/+page.server.ts
index fd71e30..8d94154 100644
--- a/src/routes/groceries/catalog/+page.server.ts
+++ b/src/routes/groceries/catalog/+page.server.ts
@@ -1,8 +1,5 @@
 import { fail } from '@sveltejs/kit';
-import {
-	loadAll,
-	bulkUpdateGroceryCategory,
-} from '$lib/server/services/groceries';
+import { groceriesService } from '$lib/server/services';
 import { toggleGroceryAction } from '$lib/server/services/grocery-actions';
 import {
 	numericId,
@@ -18,7 +15,7 @@ export interface CatalogOutput {
 }
 
 export const load: PageServerLoad = async () => {
-	return loadAll();
+	return groceriesService.loadAll();
 };
 
 export const actions: Actions = {
@@ -34,7 +31,7 @@ export const actions: Actions = {
 			return fail(400, { error: 'Aucun article sélectionné' });
 		}
 
-		await bulkUpdateGroceryCategory(ids, categoryId);
+		await groceriesService.bulkUpdateGroceryCategory(ids, categoryId);
 		return { success: true, type: 'bulkUpdate' as const };
 	},
 };
diff --git a/src/routes/groceries/categories/+page.server.ts b/src/routes/groceries/categories/+page.server.ts
index 6e0e3b7..e8794fa 100644
--- a/src/routes/groceries/categories/+page.server.ts
+++ b/src/routes/groceries/categories/+page.server.ts
@@ -1,9 +1,5 @@
 import { fail } from '@sveltejs/kit';
-import {
-	loadAll,
-	deleteCategory,
-	reorder,
-} from '$lib/server/services/categories';
+import { categoriesService } from '$lib/server/services';
 import {
 	addCategoryAction,
 	idAction,
@@ -17,13 +13,14 @@ export interface CategoriesOutput {
 }
 
 export const load: PageServerLoad = async () => {
-	return { categories: await loadAll() };
+	return { categories: await categoriesService.loadAll() };
 };
 
 export const actions: Actions = {
 	add: ({ request }) => addCategoryAction(request),
 
-	delete: ({ request }) => idAction(request, deleteCategory),
+	delete: ({ request }) =>
+		idAction(request, (id) => categoriesService.deleteCategory(id)),
 
 	reorder: async ({ request }) => {
 		const data = await request.formData();
@@ -31,7 +28,7 @@ export const actions: Actions = {
 		if (ids.length === 0) {
 			return fail(400, { error: 'Aucune catégorie' });
 		}
-		await reorder(ids);
+		await categoriesService.reorder(ids);
 		return { success: true };
 	},
 };