@labdigital/commercetools-mock 2.65.1 → 3.0.0-beta.0

package/src/repositories/order/index.test.ts

@@ -19,8 +19,8 @@ describe("Order repository", () => {
 	};
 	const repository = new OrderRepository(config);
 
-	beforeEach(() => {
-		storage.clear();
+	beforeEach(async () => {
+		await storage.clear();
 	});
 
 	test("create from cart", async () => {
@@ -143,10 +143,10 @@ describe("Order repository", () => {
 			},
 		};
 
-		storage.add("dummy", "cart", cart);
+		await storage.add("dummy", "cart", cart);
 		const ctx = { projectKey: "dummy" };
 
-		const result = repository.create(ctx, {
+		const result = await repository.create(ctx, {
 			cart: {
 				id: cart.id,
 				typeId: "cart",
@@ -155,7 +155,7 @@ describe("Order repository", () => {
 		});
 		expect(result.cart?.id).toBe(cart.id);
 
-		const items = repository.query(ctx);
+		const items = await repository.query(ctx);
 		expect(items.count).toBe(1);
 
 		expect(result.orderNumber).not.toBeUndefined();
@@ -192,7 +192,7 @@ describe("Order repository", () => {
 		expect(result.shippingInfo).toEqual(cart.shippingInfo);
 	});
 
-	test("should calculate taxed price when creating order from cart", () => {
+	test("should calculate taxed price when creating order from cart", async () => {
 		const cart: Cart = {
 			...getBaseResourceProperties(),
 			id: "cart-with-taxed-items",
@@ -279,9 +279,9 @@ describe("Order repository", () => {
 			inventoryMode: "None",
 		};
 
-		storage.add("dummy", "cart", cart);
+		await storage.add("dummy", "cart", cart);
 		const ctx = { projectKey: "dummy" };
-		const result = repository.create(ctx, {
+		const result = await repository.create(ctx, {
 			cart: { id: cart.id, typeId: "cart" },
 			version: cart.version,
 		});
@@ -293,7 +293,7 @@ describe("Order repository", () => {
 	});
 
 	test("create order in store", async () => {
-		storage.add("dummy", "store", {
+		await storage.add("dummy", "store", {
 			...getBaseResourceProperties(),
 			id: "store-123",
 			key: "testStore",
@@ -305,7 +305,7 @@ describe("Order repository", () => {
 			productSelections: [],
 		});
 
-		storage.add("dummy", "business-unit", {
+		await storage.add("dummy", "business-unit", {
 			...getBaseResourceProperties(),
 			id: "business-unit-123",
 			unitType: "Company",
@@ -321,9 +321,11 @@ describe("Order repository", () => {
 				key: "test-business-unit",
 			},
 			approvalRuleMode: "Explicit",
+			shippingAddressIds: [],
+			billingAddressIds: [],
 		});
 
-		storage.add("dummy", "customer", {
+		await storage.add("dummy", "customer", {
 			...getBaseResourceProperties(),
 			id: "customer-123",
 			email: "test@example.com",
@@ -339,6 +341,9 @@ describe("Order repository", () => {
 			stores: [],
 			isEmailVerified: true,
 			authenticationMode: "Password" as const,
+			shippingAddressIds: [],
+			billingAddressIds: [],
+			customerGroupAssignments: [],
 		});
 
 		const draft: OrderImportDraft = {
@@ -362,7 +367,7 @@ describe("Order repository", () => {
 		};
 
 		const ctx = { projectKey: "dummy", storeKey: "testStore" };
-		const result = repository.import(ctx, draft);
+		const result = await repository.import(ctx, draft);
 
 		expect(result.orderNumber).toBe("100000002");
 		expect(result.store?.key).toBe("testStore");
@@ -374,8 +379,8 @@ describe("Order repository", () => {
 		expect(result.paymentState).toBe("Paid");
 	});
 
-	test("should calculate taxed price when importing order", () => {
-		storage.add("dummy", "product", {
+	test("should calculate taxed price when importing order", async () => {
+		await storage.add("dummy", "product", {
 			...getBaseResourceProperties(),
 			id: "product-import",
 			productType: {
@@ -450,7 +455,7 @@ describe("Order repository", () => {
 			customLineItems: [],
 		};
 
-		const result = repository.import({ projectKey: "dummy" }, draft);
+		const result = await repository.import({ projectKey: "dummy" }, draft);
 		expect(result.taxedPrice).toBeDefined();
 		expect(result.taxedPrice?.totalNet.centAmount).toBe(1000);
 		expect(result.taxedPrice?.totalGross.centAmount).toBe(1210);
@@ -458,7 +463,7 @@ describe("Order repository", () => {
 	});
 
 	test("import exiting product", async () => {
-		storage.add("dummy", "product", {
+		await storage.add("dummy", "product", {
 			id: "15fc56ba-a74e-4cf8-b4b0-bada5c101541",
 			masterData: {
 				// @ts-expect-error
@@ -563,7 +568,7 @@ describe("Order repository", () => {
 			],
 		};
 
-		repository.import({ projectKey: "dummy" }, draft);
+		await repository.import({ projectKey: "dummy" }, draft);
 	});
 	/*
   test('import non exiting product', async () => {
@@ -697,7 +702,7 @@ describe("Order repository", () => {
   */
 
 	describe("shippingInfo functionality", () => {
-		test("createShippingInfo creates basic shipping info", () => {
+		test("createShippingInfo creates basic shipping info", async () => {
 			// Create a zone for Netherlands
 			const zone = {
 				...getBaseResourceProperties(),
@@ -757,9 +762,9 @@ describe("Order repository", () => {
 				],
 			};
 
-			storage.add("dummy", "zone", zone);
-			storage.add("dummy", "shipping-method", shippingMethod);
-			storage.add("dummy", "tax-category", taxCategory);
+			await storage.add("dummy", "zone", zone);
+			await storage.add("dummy", "shipping-method", shippingMethod);
+			await storage.add("dummy", "tax-category", taxCategory);
 
 			const order: Order = {
 				...getBaseResourceProperties(),
@@ -795,7 +800,7 @@ describe("Order repository", () => {
 			};
 
 			const ctx = { projectKey: "dummy" };
-			const result = repository.createShippingInfo(ctx, order, {
+			const result = await repository.createShippingInfo(ctx, order, {
 				typeId: "shipping-method",
 				id: "shipping-method-123",
 			});
@@ -810,7 +815,7 @@ describe("Order repository", () => {
 			expect(result.taxCategory?.id).toBe("tax-category-123");
 		});
 
-		test("import order with shippingInfo", () => {
+		test("import order with shippingInfo", async () => {
 			// Create required resources
 			const zone = {
 				...getBaseResourceProperties(),
@@ -869,9 +874,9 @@ describe("Order repository", () => {
 				],
 			};
 
-			storage.add("dummy", "zone", zone);
-			storage.add("dummy", "shipping-method", shippingMethod);
-			storage.add("dummy", "tax-category", taxCategory);
+			await storage.add("dummy", "zone", zone);
+			await storage.add("dummy", "shipping-method", shippingMethod);
+			await storage.add("dummy", "tax-category", taxCategory);
 
 			const draft: OrderImportDraft = {
 				orderNumber: "imported-order-123",
@@ -938,7 +943,7 @@ describe("Order repository", () => {
 			};
 
 			const ctx = { projectKey: "dummy" };
-			const result = repository.import(ctx, draft);
+			const result = await repository.import(ctx, draft);
 
 			expect(result.shippingInfo).toBeDefined();
 			expect(result.shippingInfo?.shippingMethodName).toBe("Standard Shipping");
@@ -952,7 +957,7 @@ describe("Order repository", () => {
 			expect(result.shippingInfo?.deliveries).toEqual([]);
 		});
 
-		test("createShippingInfo throws error for non-existent shipping method", () => {
+		test("createShippingInfo throws error for non-existent shipping method", async () => {
 			const order: Order = {
 				...getBaseResourceProperties(),
 				orderNumber: "order-456",
@@ -989,12 +994,12 @@ describe("Order repository", () => {
 
 			const ctx = { projectKey: "dummy" };
 
-			expect(() => {
+			await expect(
 				repository.createShippingInfo(ctx, order, {
 					typeId: "shipping-method",
 					id: "non-existent-shipping-method",
-				});
-			}).toThrow(
+				}),
+			).rejects.toThrow(
 				/The shipping method with ID 'non-existent-shipping-method' is not allowed/,
 			);
 		});

package/src/repositories/order/index.ts

@@ -4,6 +4,7 @@ import type {
 	CartReference,
 	CustomLineItem,
 	CustomLineItemImportDraft,
+	DuplicateFieldError,
 	GeneralError,
 	LineItem,
 	LineItemImportDraft,
@@ -13,8 +14,9 @@ import type {
 	OrderPagedSearchResponse,
 	OrderSearchRequest,
 	Product,
-	ProductPagedQueryResponse,
 	ProductVariant,
+	ReferencedResourceNotFoundError,
+	ResourceNotFoundError,
 	ShippingInfo,
 	ShippingMethodDoesNotMatchCartError,
 	ShippingMethodReference,
@@ -30,6 +32,7 @@ import {
 	calculateTaxTotals,
 } from "#src/lib/tax.ts";
 import { OrderSearch } from "#src/orderSearch.ts";
+import { OrderFromCartDraftSchema } from "#src/schemas/generated/order-from-cart.ts";
 import {
 	createShippingInfoFromMethod,
 	getShippingMethodsMatchingCart,
@@ -55,11 +58,15 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		super("order", config);
 		this.actions = new OrderUpdateHandler(config.storage);
 		this._searchService = new OrderSearch(config);
+		this.draftSchema = OrderFromCartDraftSchema;
 	}
 
-	create(context: RepositoryContext, draft: OrderFromCartDraft): Order {
+	async create(
+		context: RepositoryContext,
+		draft: OrderFromCartDraft,
+	): Promise<Order> {
 		assert(draft.cart, "draft.cart is missing");
-		return this.createFromCart(
+		return await this.createFromCart(
 			context,
 			{
 				id: draft.cart.id!,
@@ -69,21 +76,27 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		);
 	}
 
-	createFromCart(
+	async createFromCart(
 		context: RepositoryContext,
 		cartReference: CartReference,
 		orderNumber?: string,
 	) {
-		const cart = this._storage.getByResourceIdentifier(
+		const cart = (await this._storage.getByResourceIdentifier(
 			context.projectKey,
 			cartReference,
-		) as Cart | null;
+		)) as Cart | null;
 		if (!cart) {
-			throw new Error("Cannot find cart");
+			throw new CommercetoolsError<ResourceNotFoundError>(
+				{
+					code: "ResourceNotFound",
+					message: "Cannot find cart",
+				},
+				404,
+			);
 		}
 
 		const resource: Writable<Order> = {
-			...getBaseResourceProperties(),
+			...getBaseResourceProperties(context.clientId),
 			anonymousId: cart.anonymousId,
 			billingAddress: cart.billingAddress,
 			cart: cartReference,
@@ -127,14 +140,28 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		resource.taxedPrice = resource.taxedPrice ?? taxedPrice;
 		resource.taxedShippingPrice =
 			resource.taxedShippingPrice ?? taxedShippingPrice;
-		return this.saveNew(context, resource);
+		return await this.saveNew(context, resource);
 	}
 
-	import(context: RepositoryContext, draft: OrderImportDraft): Order {
+	async import(
+		context: RepositoryContext,
+		draft: OrderImportDraft,
+	): Promise<Order> {
 		// TODO: Check if order with given orderNumber already exists
 		assert(this, "OrderRepository not valid");
+		const lineItems = await Promise.all(
+			draft.lineItems?.map((item) =>
+				this.lineItemFromImportDraft(context, item),
+			) || [],
+		);
+		const customLineItems = await Promise.all(
+			draft.customLineItems?.map((item) =>
+				this.customLineItemFromImportDraft(context, item),
+			) || [],
+		);
+
 		const resource: Writable<Order> = {
-			...getBaseResourceProperties(),
+			...getBaseResourceProperties(context.clientId),
 
 			billingAddress: createAddress(
 				draft.billingAddress,
@@ -147,7 +174,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 				this._storage,
 			),
 
-			custom: createCustomFields(
+			custom: await createCustomFields(
 				draft.custom,
 				context.projectKey,
 				this._storage,
@@ -166,21 +193,15 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 			shippingMode: "Single",
 			shipping: [],
 			shippingInfo: undefined,
-			store: resolveStoreReference(
+			store: await resolveStoreReference(
 				draft.store,
 				context.projectKey,
 				this._storage,
 			),
 			syncInfo: [],
 
-			lineItems:
-				draft.lineItems?.map((item) =>
-					this.lineItemFromImportDraft.bind(this)(context, item),
-				) || [],
-			customLineItems:
-				draft.customLineItems?.map((item) =>
-					this.customLineItemFromImportDraft.bind(this)(context, item),
-				) || [],
+			lineItems,
+			customLineItems,
 
 			totalPrice: createCentPrecisionMoney(draft.totalPrice),
 		};
@@ -192,7 +213,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 			// get id when reference is by key only
 			if (shippingMethodRef.key && !shippingMethodRef.id) {
 				const shippingMethod =
-					this._storage.getByResourceIdentifier<"shipping-method">(
+					await this._storage.getByResourceIdentifier<"shipping-method">(
 						context.projectKey,
 						shippingMethodRef,
 					);
@@ -205,7 +226,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 				shippingMethodRef.id = shippingMethod.id;
 			}
 
-			resource.shippingInfo = this.createShippingInfo(context, resource, {
+			resource.shippingInfo = await this.createShippingInfo(context, resource, {
 				typeId: "shipping-method",
 				id: shippingMethodRef.id as string,
 			});
@@ -221,13 +242,13 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		resource.taxedShippingPrice =
 			resource.taxedShippingPrice ?? taxedShippingPrice;
 
-		return this.saveNew(context, resource);
+		return await this.saveNew(context, resource);
 	}
 
-	private lineItemFromImportDraft(
+	private async lineItemFromImportDraft(
 		context: RepositoryContext,
 		draft: LineItemImportDraft,
-	): LineItem {
+	): Promise<LineItem> {
 		let product: Product;
 		let variant: ProductVariant | undefined;
 
@@ -237,11 +258,11 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 				sku: draft.variant.sku,
 			};
 
-			const items = this._storage.query(context.projectKey, "product", {
+			const items = await this._storage.query(context.projectKey, "product", {
 				where: [
 					`masterData(current(masterVariant(sku="${draft.variant.sku}"))) or masterData(current(variants(sku="${draft.variant.sku}")))`,
 				],
-			}) as ProductPagedQueryResponse;
+			});
 
 			if (items.count !== 1) {
 				throw new CommercetoolsError<GeneralError>({
@@ -262,7 +283,11 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 				throw new Error("Internal state error");
 			}
 		} else {
-			throw new Error("No product found");
+			throw new CommercetoolsError<ReferencedResourceNotFoundError>({
+				code: "ReferencedResourceNotFound",
+				message: "No product found",
+				typeId: "product",
+			});
 		}
 
 		const quantity = draft.quantity ?? 1;
@@ -272,8 +297,8 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		});
 
 		return {
-			...getBaseResourceProperties(),
-			custom: createCustomFields(
+			...getBaseResourceProperties(context.clientId),
+			custom: await createCustomFields(
 				draft.custom,
 				context.projectKey,
 				this._storage,
@@ -305,10 +330,10 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		} satisfies LineItem;
 	}
 
-	private customLineItemFromImportDraft(
+	private async customLineItemFromImportDraft(
 		context: RepositoryContext,
 		draft: CustomLineItemImportDraft,
-	): CustomLineItem {
+	): Promise<CustomLineItem> {
 		const quantity = draft.quantity ?? 1;
 		const totalPrice = createCentPrecisionMoney({
 			currencyCode: draft.money.currencyCode,
@@ -316,8 +341,8 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		});
 
 		return {
-			...getBaseResourceProperties(),
-			custom: createCustomFields(
+			...getBaseResourceProperties(context.clientId),
+			custom: await createCustomFields(
 				draft.custom,
 				context.projectKey,
 				this._storage,
@@ -340,32 +365,41 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		} satisfies CustomLineItem;
 	}
 
-	getWithOrderNumber(
+	async getWithOrderNumber(
 		context: RepositoryContext,
 		orderNumber: string,
 		params: QueryParams = {},
-	): Order | undefined {
-		const result = this._storage.query(context.projectKey, this.getTypeId(), {
-			...params,
-			where: [`orderNumber="${orderNumber}"`],
-		});
+	): Promise<Order | undefined> {
+		const result = await this._storage.query(
+			context.projectKey,
+			this.getTypeId(),
+			{
+				...params,
+				where: [`orderNumber="${orderNumber}"`],
+			},
+		);
 		if (result.count === 1) {
 			return result.results[0] as Order;
 		}
 
 		// Catch this for now, should be checked when creating/updating
 		if (result.count > 1) {
-			throw new Error("Duplicate order numbers");
+			throw new CommercetoolsError<DuplicateFieldError>({
+				code: "DuplicateField",
+				message: "Duplicate order numbers",
+				field: "orderNumber",
+				duplicateValue: orderNumber,
+			});
 		}
 
 		return;
 	}
 
-	createShippingInfo(
+	async createShippingInfo(
 		context: RepositoryContext,
 		resource: Writable<Order>,
 		shippingMethodRef: ShippingMethodReference,
-	): ShippingInfo {
+	): Promise<ShippingInfo> {
 		const cartLikeForMatching: Writable<Cart> = {
 			...resource,
 			cartState: "Active" as const,
@@ -380,7 +414,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 			shippingInfo: undefined,
 		};
 
-		const shippingMethods = getShippingMethodsMatchingCart(
+		const shippingMethods = await getShippingMethodsMatchingCart(
 			context,
 			this._storage,
 			cartLikeForMatching,
@@ -400,7 +434,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 			});
 		}
 
-		const baseShippingInfo = createShippingInfoFromMethod(
+		const baseShippingInfo = await createShippingInfoFromMethod(
 			context,
 			this._storage,
 			resource,
@@ -413,10 +447,10 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		};
 	}
 
-	search(
+	async search(
 		context: RepositoryContext,
 		searchRequest: OrderSearchRequest,
-	): OrderPagedSearchResponse {
-		return this._searchService.search(context.projectKey, searchRequest);
+	): Promise<OrderPagedSearchResponse> {
+		return await this._searchService.search(context.projectKey, searchRequest);
 	}
 }

package/src/repositories/order-edit.ts

@@ -4,6 +4,7 @@ import type {
 	OrderEditResult,
 } from "@commercetools/platform-sdk";
 import type { Config } from "#src/config.ts";
+import { OrderEditDraftSchema } from "#src/schemas/generated/order-edit.ts";
 import { getBaseResourceProperties } from "../helpers.ts";
 import type { RepositoryContext } from "./abstract.ts";
 import { AbstractResourceRepository } from "./abstract.ts";
@@ -11,17 +12,21 @@ import { AbstractResourceRepository } from "./abstract.ts";
 export class OrderEditRepository extends AbstractResourceRepository<"order-edit"> {
 	constructor(config: Config) {
 		super("order-edit", config);
+		this.draftSchema = OrderEditDraftSchema;
 	}
 
-	create(context: RepositoryContext, draft: OrderEditDraft): OrderEdit {
+	async create(
+		context: RepositoryContext,
+		draft: OrderEditDraft,
+	): Promise<OrderEdit> {
 		const resource: OrderEdit = {
-			...getBaseResourceProperties(),
+			...getBaseResourceProperties(context.clientId),
 			stagedActions: draft.stagedActions ?? [],
 			resource: draft.resource,
 			result: {
 				type: "NotProcessed",
 			} as OrderEditResult,
 		};
-		return this.saveNew(context, resource);
+		return await this.saveNew(context, resource);
 	}
 }