feat(payments): Enhance payment handling with response mappers and cache invalidation

Author: gustaavik

bun.lock

@@ -18,7 +18,7 @@
 		"@lucide/svelte": "^0.515.0",
 		"@sveltejs/adapter-auto": "^6.0.1",
 		"@sveltejs/adapter-node": "^5.2.13",
-		"@sveltejs/kit": "^2.22.4",
+		"@sveltejs/kit": "^2.22.5",
 		"@sveltejs/vite-plugin-svelte": "^5.1.0",
 		"@tailwindcss/typography": "^0.5.16",
 		"@tailwindcss/vite": "^4.1.11",
@@ -40,7 +40,7 @@
 		"vite": "^6.3.5"
 	},
 	"dependencies": {
-		"commercify-api-client": "^1.2.10",
+		"commercify-api-client": "^1.2.11",
 		"lucide-svelte": "^0.515.0",
 		"zod": "3.25.67"
 	}

package.json

@@ -37,6 +37,32 @@ export const mapOrderSummary = (dto: OrderSummaryDTO): OrderSummary => {
 	};
 };
 
+export const orderSummaryResponseMapper = (
+	dto: ResponseDTO<OrderSummaryDTO>
+): { data: OrderSummary | null; success: boolean; error?: string } => {
+	if (!dto || !dto.data) {
+		return {
+			data: null,
+			success: false,
+			error: 'No order summary data available'
+		};
+	}
+
+	if (dto.error) {
+		return {
+			data: null,
+			success: false,
+			error: dto.error
+		};
+	}
+
+	return {
+		data: mapOrderSummary(dto.data),
+		success: dto.success,
+		error: dto.error
+	};
+};
+
 export const orderListSummaryResponseMapper = (
 	dto: ListResponseDTO<OrderSummaryDTO>
 ): { data: PaginatedData<OrderSummary>; success: boolean; error?: string } => {
@@ -119,6 +145,8 @@ export const orderMapper = (dto: OrderDTO): Order => {
 	// Extract payment details from transactions
 	const paymentDetails = extractPaymentDetailsFromTransactions(dto.payment_transactions);
 
+	console.log('Payment Details:', paymentDetails);
+
 	return {
 		id: dto.id.toString(),
 		checkoutId: dto.checkout_id?.toString() || 'N/A',

src/lib/mappers/order.mapper.ts

@@ -0,0 +1,27 @@
+import type { ResponseDTO } from 'commercify-api-client';
+
+export const paymentResponseMapper = (
+	dto: ResponseDTO<string>
+): { data: string | null; success: boolean; error?: string } => {
+	if (!dto || !dto.message) {
+		return {
+			data: null,
+			success: false,
+			error: 'No payment data available'
+		};
+	}
+
+	if (dto.error) {
+		return {
+			data: null,
+			success: false,
+			error: dto.error
+		};
+	}
+
+	return {
+		data: dto.message,
+		success: dto.success,
+		error: dto.error
+	};
+};

src/lib/mappers/payments.mapper.ts

@@ -42,11 +42,13 @@ import {
 	currenyListMapper,
 	userResponseMapper,
 	orderListSummaryResponseMapper,
-	loginMapper
+	loginMapper,
+	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 { paymentResponseMapper } from '$lib/mappers/payments.mapper';
 
 /**
  * Cached API client wrapper that adds caching to API operations
@@ -252,20 +254,59 @@ export class CachedCommercifyApiClient {
 			),
 
 			updateOrderStatus: async (id: string, status: UpdateOrderStatusRequest) => {
-				const result = await this.client.orders.updateOrderStatus(id, status, orderResponseMapper);
+				const result = await this.client.orders.updateOrderStatus(
+					id,
+					status,
+					orderSummaryResponseMapper
+				);
+				// Invalidate both specific order and order lists cache
 				CacheInvalidator.invalidateOrder(id);
+				await CacheInvalidator.invalidateOrderLists();
 				return result;
 			}
 		};
 	}
 
 	get payments() {
 		return {
-			capture: (paymentId: string, options: CapturePaymentRequest) =>
-				this.client.admin.capturePayment(paymentId, options),
-			cancel: (paymentId: string) => this.client.admin.cancelPayment(paymentId),
-			refund: (paymentId: string, options: RefundPaymentRequest) =>
-				this.client.admin.refundPayment(paymentId, options)
+			capture: async (paymentId: string, options: CapturePaymentRequest, orderId?: string) => {
+				const result = await this.client.admin.capturePayment(
+					paymentId,
+					options,
+					paymentResponseMapper
+				);
+				// Invalidate order lists cache since payment status affects order listings
+				await CacheInvalidator.invalidateOrderLists();
+				// If order ID is provided, also invalidate specific order cache
+				if (orderId) {
+					CacheInvalidator.invalidateOrder(orderId);
+				}
+				return result;
+			},
+			cancel: async (paymentId: string, orderId?: string) => {
+				const result = await this.client.admin.cancelPayment(paymentId, paymentResponseMapper);
+				// Invalidate order lists cache since payment status affects order listings
+				await CacheInvalidator.invalidateOrderLists();
+				// If order ID is provided, also invalidate specific order cache
+				if (orderId) {
+					CacheInvalidator.invalidateOrder(orderId);
+				}
+				return result;
+			},
+			refund: async (paymentId: string, options: RefundPaymentRequest, orderId?: string) => {
+				const result = await this.client.admin.refundPayment(
+					paymentId,
+					options,
+					paymentResponseMapper
+				);
+				// Invalidate order lists cache since payment status affects order listings
+				await CacheInvalidator.invalidateOrderLists();
+				// If order ID is provided, also invalidate specific order cache
+				if (orderId) {
+					CacheInvalidator.invalidateOrder(orderId);
+				}
+				return result;
+			}
 		};
 	}
 

src/lib/server/commercify/api.ts

@@ -220,7 +220,18 @@ export class CacheInvalidator {
 	 * Invalidates order cache
 	 */
 	static invalidateOrder(id: string): void {
+		// Client-side cache invalidation
 		OrderCache.invalidateOrder(id);
+		// Server-side cache invalidation
+		serverCache.invalidate(`order:${id}`);
+	}
+
+	/**
+	 * Invalidates all order-related caches (lists, etc.)
+	 */
+	static async invalidateOrderLists(): Promise<void> {
+		// Server-side cache invalidation
+		serverCache.invalidatePattern('^orders:');
 	}
 
 	/**
@@ -286,9 +297,7 @@ export class CacheHelpers {
 	/**
 	 * Creates a higher-order function to handle mutations with cache invalidation
 	 */
-	static withCacheInvalidation<T>(
-		invalidationFn: () => void | Promise<void>
-	) {
+	static withCacheInvalidation<T>(invalidationFn: () => void | Promise<void>) {
 		return async (operation: () => Promise<T>): Promise<T> => {
 			const result = await operation();
 			await invalidationFn();

src/lib/server/commercify/cache.ts

@@ -38,19 +38,24 @@ export const load: PageServerLoad = async ({ params, locals, depends }) => {
 };
 
 export const actions: Actions = {
-	capture: async ({ request, locals }) => {
+	capture: async ({ request, locals, params }) => {
 		const { commercify } = locals;
 		const data = await request.formData();
 		const paymentId = data.get('paymentId') as string;
+		const orderId = params.id;
 
 		if (!paymentId) {
 			return fail(400, { error: 'Payment ID is required' });
 		}
 
 		// Note: The API captures payment by orderId, but we validate paymentId from the form
-		const result = await commercify.payments.capture(paymentId, {
-			isFull: true
-		});
+		const result = await commercify.payments.capture(
+			paymentId,
+			{
+				is_full: true
+			},
+			orderId
+		);
 
 		if (!result.success) {
 			return fail(400, {
@@ -64,16 +69,17 @@ export const actions: Actions = {
 		};
 	},
 
-	refund: async ({ locals, request }) => {
+	refund: async ({ locals, request, params }) => {
 		const { commercify } = locals;
 		const data = await request.formData();
 		const paymentId = data.get('paymentId') as string;
+		const orderId = params.id;
 
 		if (!paymentId) {
 			return fail(400, { error: 'Order ID is required' });
 		}
 
-		const result = await commercify.payments.refund(paymentId, { isFull: true });
+		const result = await commercify.payments.refund(paymentId, { is_full: true }, orderId);
 
 		if (!result.success) {
 			return fail(400, {
@@ -87,16 +93,17 @@ export const actions: Actions = {
 		};
 	},
 
-	cancel: async ({ request, locals }) => {
+	cancel: async ({ request, locals, params }) => {
 		const { commercify } = locals;
 		const data = await request.formData();
 		const paymentId = data.get('paymentId') as string;
+		const orderId = params.id;
 
 		if (!paymentId) {
 			return fail(400, { error: 'Order ID is required' });
 		}
 
-		const result = await commercify.payments.cancel(paymentId);
+		const result = await commercify.payments.cancel(paymentId, orderId);
 
 		if (!result.success) {
 			return fail(400, {