feat: Add generated TypeScript contracts and DTOs for Commercify API

- Introduced `contracts.ts` containing interfaces for various API requests and responses.
- Added `dtos.ts` with data transfer objects for categories, checkouts, orders, products, and users.
- Updated API index to export new DTOs and contracts.
- Refactored attribute handling in product variants to use key-value pairs instead of arrays.
- Enhanced utility functions for SKU generation and attribute transformation.
- Implemented tests for attribute transformation and product creation request formatting.
- Cleaned up health check and environment configuration code for better readability.

Author: gustaavik

docker-compose.yml

@@ -1,14 +1,15 @@
 services:
   # Commercify API Backend
   commercify-api:
-    image: ghcr.io/zenfulcode/commercifygo:dev
+    image: ghcr.io/zenfulcode/commercifygo:v2-dev
     ports:
       - '6091:6091'
     environment:
       # Server Configuration
       - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-http://localhost:3000}
 
       # Database Configuration
+      - DB_DRIVER=postgres
       - DB_HOST=postgres
       - DB_PORT=5432
       - DB_NAME=commercify
@@ -44,10 +45,10 @@ services:
       - MOBILEPAY_CLIENT_SECRET=${MOBILEPAY_CLIENT_SECRET:-}
       - MOBILEPAY_WEBHOOK_URL=${MOBILEPAY_WEBHOOK_URL:-}
       - MOBILEPAY_PAYMENT_DESCRIPTION=${MOBILEPAY_PAYMENT_DESCRIPTION:-Commercify Store Purchase}
-      - MOBILEPAY_MARKET=${MOBILEPAY_MARKET:-NOK}
 
       # Return URL
       - RETURN_URL=${RETURN_URL:-http://localhost:3000/payment/complete}
+      - DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}
     depends_on:
       - postgres
     restart: unless-stopped
@@ -92,7 +93,7 @@ services:
       - NODE_ENV=production
       - PORT=3000
       - HOST=0.0.0.0
-      - ORIGIN=https://ffc1-2a05-f6c6-5509-0-f946-cd78-df73-103c.ngrok-free.app
+      - ORIGIN=https://e070-2a05-f6c6-5509-0-9848-7eb2-e94f-832f.ngrok-free.app
       - API_BASE_URL_DEV=http://commercify-api:6091/api
       - API_BASE_URL_PROD=http://commercify-api:6091/api
     depends_on:

src/lib/schemas/product.schema.ts

@@ -6,14 +6,7 @@ export const productVariantSchema = z.object({
 	price: z.number().min(1, 'Price must be 0 or greater'),
 	stock: z.number().int().min(0, 'Stock must be 0 or greater'),
 	weight: z.number().min(0, 'Weight must be 0 or greater').optional(),
-	attributes: z
-		.array(
-			z.object({
-				name: z.string().min(1, 'Attribute name is required'),
-				value: z.string().min(1, 'Attribute value is required')
-			})
-		)
-		.default([]),
+	attributes: z.record(z.string(), z.string()).default({}),
 	images: z.array(z.string().url('Invalid image URL')).default([]),
 	isDefault: z.boolean().default(false)
 });

src/lib/server/api/commercify.ts

@@ -52,7 +52,7 @@ import {
 	type CompleteCheckoutRequest,
 	type CheckoutCompleteResponse,
 	type OrderSummaryDTO
-} from './types';
+} from './index';
 import type {
 	Address,
 	Checkout,
@@ -128,11 +128,11 @@ export class CommercifyClient {
 				headers['Cookie'] = this.cookies;
 			}
 
-			// console.log('Making request to:', url, {
-			// 	headers: Object.keys(headers),
-			// 	hasAuthHeader: !!headers['Authorization'],
-			// 	origin: headers['Origin']
-			// });
+			console.log('Making request to:', url, {
+				headers: Object.keys(headers),
+				hasAuthHeader: !!headers['Authorization'],
+				origin: headers['Origin']
+			});
 
 			const response = await fetch(url, {
 				headers,
@@ -591,8 +591,11 @@ export class CommercifyClient {
 					sku: variant.sku,
 					price: variant.price,
 					stock: variant.stock,
-					attributes: variant.attributes || [],
-					images: variant.images,
+					weight: variant.weight || 0,
+					attributes: variant.attributes
+						? Object.entries(variant.attributes).map(([name, value]) => ({ name, value }))
+						: [],
+					images: variant.images || [],
 					is_default: variant.isDefault
 				})) || []
 		};
@@ -776,12 +779,21 @@ export class CommercifyClient {
 				error: 'No product ID provided'
 			};
 		}
+
+		// Transform attributes to match API expectations
+		const apiVariantData = {
+			...variantData,
+			attributes: variantData.attributes
+				? Object.entries(variantData.attributes).map(([name, value]) => ({ name, value }))
+				: []
+		};
+
 		try {
 			const response = await this.request<ResponseDTO<VariantDTO>>(
 				`/admin/products/${productId}/variants`,
 				{
 					method: 'POST',
-					body: JSON.stringify(variantData)
+					body: JSON.stringify(apiVariantData)
 				}
 			);
 			if (response.success && response.data) {
@@ -856,7 +868,9 @@ export class CommercifyClient {
 			sku: variantData.sku,
 			price: variantData.price,
 			stock: variantData.stock,
-			attributes: variantData.attributes,
+			attributes: variantData.attributes
+				? Object.entries(variantData.attributes).map(([name, value]) => ({ name, value }))
+				: undefined,
 			images: variantData.images,
 			is_default: variantData.isDefault
 		};
@@ -982,8 +996,8 @@ export class CommercifyClient {
 				amount: apiProduct.price,
 				currency: apiProduct.currency
 			},
-			stock: apiProduct.stock,
-			categoryId: apiProduct.category_id.toString(),
+			stock: apiProduct.total_stock,
+			categoryId: apiProduct.category_id?.toString() || null,
 			images: apiProduct.images,
 			hasVariants: apiProduct.has_variants,
 			variants: apiProduct.variants?.map(this.mapApiVariantToVariant) || [],
@@ -997,6 +1011,16 @@ export class CommercifyClient {
 	 * Map API variant response to our ProductVariant interface
 	 */
 	private mapApiVariantToVariant(apiVariant: VariantDTO): ProductVariant {
+		// Convert attributes array back to key-value object
+		const attributes: { [key: string]: string } = {};
+		if (apiVariant.attributes && Array.isArray(apiVariant.attributes)) {
+			apiVariant.attributes.forEach((attr: any) => {
+				if (attr.name && attr.value) {
+					attributes[attr.name] = attr.value;
+				}
+			});
+		}
+
 		return {
 			id: apiVariant.id,
 			sku: apiVariant.sku,
@@ -1005,7 +1029,7 @@ export class CommercifyClient {
 				currency: apiVariant.currency
 			},
 			stock: apiVariant.stock ?? apiVariant.stock ?? 0,
-			attributes: apiVariant.attributes,
+			attributes,
 			images: apiVariant.images || [],
 			isDefault: apiVariant.is_default
 		};
@@ -1085,9 +1109,7 @@ export class CommercifyClient {
 				: undefined,
 			discountDetails: this.mapDiscountDetails(dto.applied_discount),
 			paymentProvider: dto.payment_provider,
-			status: dto.status,
-			createdAt: dto.created_at,
-			updatedAt: dto.updated_at
+			status: dto.status
 		};
 	}
 
@@ -1630,9 +1652,7 @@ export class CommercifyClient {
 				? this.mapShippingDetails(dto.shipping_details)
 				: undefined,
 			discountDetails: this.mapDiscountDetails(dto.discount_details),
-			paymentProvider: dto.payment_details.provider,
-			createdAt: dto.created_at,
-			updatedAt: dto.updated_at
+			paymentProvider: dto.payment_details?.provider
 		};
 	}