Merge pull request #2 from Zenfulcode/fix-category-parentid-update

fix(category): Improve category mappers and API client integration

Author: gustaavik

src/lib/mappers/category.mapper.ts

@@ -1,5 +1,5 @@
 import type { Category } from '$lib/types';
-import type { CategoryDTO, ResponseDTO } from 'commercify-api-client';
+import type { CategoryDTO, ListResponseDTO, ResponseDTO } from 'commercify-api-client';
 
 export const categoryResponseMapper = (
 	dto: ResponseDTO<CategoryDTO>
@@ -8,19 +8,11 @@ export const categoryResponseMapper = (
 	success: boolean;
 	error?: string;
 } => {
-	if (!dto.data) {
+	if (!dto.success || !dto.data) {
 		return {
 			data: null,
 			success: false,
-			error: 'Category data is missing'
-		};
-	}
-
-	if (dto.error) {
-		return {
-			data: null,
-			success: false,
-			error: dto.error
+			error: dto.error || 'Category not found'
 		};
 	}
 
@@ -31,14 +23,14 @@ export const categoryResponseMapper = (
 	};
 };
 
-export const categoryListMapper = (dto: {
-	data: CategoryDTO[];
-}): { data: Category[]; success: boolean; error?: string } => {
-	if (!dto.data || !Array.isArray(dto.data)) {
+export const categoryListMapper = (
+	dto: ListResponseDTO<CategoryDTO>
+): { data: Category[]; success: boolean; error?: string } => {
+	if (!dto.success || !dto.data) {
 		return {
 			data: [],
 			success: false,
-			error: 'Category data is missing or not in the expected format'
+			error: dto.error || 'No categories found'
 		};
 	}
 

src/lib/server/commercify/api.ts

@@ -29,7 +29,8 @@ import type {
 	AdminProductListRequest,
 	UpdateCategoryRequest,
 	OrderListRequest,
-	OrderParameters
+	OrderParameters,
+	CreateCategoryRequest
 } from 'commercify-api-client';
 import { EnvironmentConfig } from '../env';
 import {
@@ -46,8 +47,13 @@ import {
 	orderSummaryResponseMapper
 } from '$lib/mappers';
 import { OrderCache, ProductCache } from '$lib/cache';
-import type { CreateProductInput, UpdateCategoryInput, UpdateProductInput } from '$lib/types';
-import { categoryResponseMapper } from '$lib/mappers/category.mapper';
+import type {
+	CreateCategoryInput,
+	CreateProductInput,
+	UpdateCategoryInput,
+	UpdateProductInput
+} from '$lib/types';
+import { categoryListMapper, categoryResponseMapper } from '$lib/mappers/category.mapper';
 import { paymentResponseMapper } from '$lib/mappers/payments.mapper';
 
 /**
@@ -373,7 +379,7 @@ export class CachedCommercifyApiClient {
 		return {
 			list: CacheHelpers.createSimpleCachedEndpoint(
 				'categories',
-				() => this.client.categories.list(),
+				() => this.client.categories.list(categoryListMapper),
 				CACHE_TTL.CATEGORIES
 			),
 			get: (id: number) => {
@@ -384,8 +390,22 @@ export class CachedCommercifyApiClient {
 					CACHE_TTL.CATEGORY
 				);
 			},
+			create: async (data: CreateCategoryInput) => {
+				const requestData: CreateCategoryRequest = {
+					name: data.name,
+					description: data.description || '',
+					parent_id: data.parentId ? parseInt(data.parentId) : undefined
+				};
+
+				const result = await this.client.categories.create(requestData, categoryResponseMapper);
+
+				// Invalidate category caches after creation
+				await CacheInvalidator.invalidateAllCategoryCaches();
+
+				return result;
+			},
 			update: async (id: number, data: any) => {
-				const requestData = {
+				const requestData: UpdateCategoryRequest = {
 					name: data.name,
 					description: data.description || '',
 					parent_id: data.parentId ? parseInt(data.parentId) : undefined

src/routes/admin/products/categories/[id]/edit/+page.server.ts

@@ -19,7 +19,7 @@ export const load: PageServerLoad = async ({ params, locals }) => {
 	}
 
 	const categories = categoriesResult.data || [];
-	const category = categories.find((c: Category) => String(c.id) === String(categoryId));
+	const category: Category = categories.find((c: Category) => String(c.id) === String(categoryId));
 
 	if (!category) {
 		throw error(404, 'Category not found');
@@ -30,15 +30,16 @@ export const load: PageServerLoad = async ({ params, locals }) => {
 		{
 			name: category.name,
 			description: category.description || '',
-			parentId: category.parentId?.toString()
+			parentId: category.parentId ? String(category.parentId) : undefined
 		},
 		zod(categorySchema)
 	);
 
+	const parentOptions = categories.filter((c: Category) => String(c.id) !== String(categoryId)); // Exclude self from parent options
 	return {
 		form,
 		category,
-		categories: categories.filter((c: Category) => String(c.id) !== String(categoryId)) // Exclude self from parent options
+		categories: parentOptions
 	};
 };
 

src/routes/admin/products/categories/[id]/edit/+page.svelte

@@ -81,9 +81,8 @@
 							<Select.Root type="single" bind:value={$formData.parentId} name={props.name}>
 								<Select.Trigger {...props}>
 									{$formData.parentId
-										? data.categories.find(
-												(c: Category) => String(c.id) === String($formData.parentId)
-											)?.name
+										? data.categories.find((c: Category) => String(c.id) === $formData.parentId)
+												?.name
 										: 'Select a parent category (optional)'}
 								</Select.Trigger>
 								<Select.Content>

src/routes/admin/products/categories/new/+page.svelte

@@ -81,13 +81,14 @@
 							<Select.Root type="single" bind:value={$formData.parentId} name={props.name}>
 								<Select.Trigger {...props}>
 									{$formData.parentId
-										? data.categories.find((c: Category) => c.id === $formData.parentId)?.name
+										? data.categories.find((c: Category) => String(c.id) === $formData.parentId)
+												?.name
 										: 'Select a parent category (optional)'}
 								</Select.Trigger>
 								<Select.Content>
 									<Select.Item value="">No parent (top-level category)</Select.Item>
 									{#each data.categories as category}
-										<Select.Item value={category.id}>
+										<Select.Item value={String(category.id)}>
 											{category.name}
 										</Select.Item>
 									{/each}