@labdigital/commercetools-mock 3.0.0-beta.2 → 3.0.0-beta.4

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

@@ -720,6 +720,82 @@ describe("createShippingInfo", () => {
 		expect(result.taxedPrice!.totalNet.centAmount).toBe(995);
 	});
 
+	test("should use external tax rate when cart taxMode is External", async () => {
+		await storage.add("dummy", "shipping-method", {
+			...getBaseResourceProperties(),
+			id: "external-tax-shipping-id",
+			name: "Standard Shipping",
+			taxCategory: {
+				typeId: "tax-category",
+				id: "shipping-tax-category-id",
+			},
+			zoneRates: [
+				{
+					zone: {
+						typeId: "zone",
+						id: "test-zone-id",
+						obj: {
+							...getBaseResourceProperties(),
+							id: "test-zone-id",
+							name: "Test Zone",
+							locations: [{ country: "NL" }],
+						},
+					},
+					shippingRates: [
+						{
+							price: {
+								currencyCode: "EUR",
+								centAmount: 1000,
+								type: "centPrecision",
+								fractionDigits: 2,
+							},
+							tiers: [],
+						},
+					],
+				},
+			],
+			active: true,
+			isDefault: false,
+		});
+
+		const cart: any = {
+			...getBaseResourceProperties(),
+			id: "external-tax-cart-id",
+			version: 1,
+			cartState: "Active",
+			taxMode: "External",
+			totalPrice: {
+				currencyCode: "EUR",
+				centAmount: 3000,
+				type: "centPrecision",
+				fractionDigits: 2,
+			},
+			shippingAddress: { country: "NL" },
+			taxRoundingMode: "HalfEven",
+		};
+
+		const context = { projectKey: "dummy", storeKey: "testStore" };
+
+		const result = await repository.createShippingInfo(
+			context,
+			cart,
+			{ typeId: "shipping-method", id: "external-tax-shipping-id" },
+			{
+				name: "External VAT",
+				amount: 0.1,
+				includedInPrice: false,
+				country: "NL",
+			},
+		);
+
+		expect(result.price.centAmount).toBe(1000);
+		expect(result.taxRate?.name).toBe("External VAT");
+		expect(result.taxRate?.amount).toBe(0.1);
+		expect(result.taxRate?.country).toBe("NL");
+		expect(result.taxedPrice!.totalNet.centAmount).toBe(1000);
+		expect(result.taxedPrice!.totalGross.centAmount).toBe(1100);
+	});
+
 	test("create cart with discount code", async () => {
 		const code = await storage.add("dummy", "discount-code", {
 			...getBaseResourceProperties(),

package/src/repositories/cart/index.ts

@@ -3,6 +3,7 @@ import type {
 	Cart,
 	CartDraft,
 	DiscountCodeInfo,
+	ExternalTaxRateDraft,
 	GeneralError,
 	InvalidOperationError,
 	LineItem,
@@ -15,7 +16,11 @@ import { v4 as uuidv4 } from "uuid";
 import type { Config } from "#src/config.ts";
 import { CommercetoolsError } from "#src/exceptions.ts";
 import { getBaseResourceProperties } from "#src/helpers.ts";
-import { calculateTaxTotals } from "#src/lib/tax.ts";
+import {
+	calculateTaxedPriceFromRate,
+	calculateTaxTotals,
+	taxRateFromExternalDraft,
+} from "#src/lib/tax.ts";
 import { CartDraftSchema } from "#src/schemas/generated/cart.ts";
 import {
 	createShippingInfoFromMethod,
@@ -76,6 +81,9 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 				);
 		}
 
+		const taxMode = draft.taxMode ?? "Platform";
+		const taxRoundingMode = draft.taxRoundingMode ?? "HalfEven";
+
 		const lineItems = draft.lineItems
 			? await Promise.all(
 					draft.lineItems.map((draftLineItem) =>
@@ -84,6 +92,8 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 							draftLineItem,
 							draft.currency,
 							draft.country,
+							taxMode,
+							taxRoundingMode,
 						),
 					),
 				)
@@ -97,6 +107,8 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 							draftCustomLineItem,
 							this._storage,
 							draft.shippingAddress?.country ?? draft.country,
+							taxMode,
+							taxRoundingMode,
 						),
 					),
 				)
@@ -145,8 +157,8 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 			locale: draft.locale,
 			priceRoundingMode: draft.priceRoundingMode ?? "HalfEven",
 			taxCalculationMode: draft.taxCalculationMode ?? "LineItemLevel",
-			taxMode: draft.taxMode ?? "Platform",
-			taxRoundingMode: draft.taxRoundingMode ?? "HalfEven",
+			taxMode,
+			taxRoundingMode,
 			totalPrice: {
 				type: "centPrecision",
 				centAmount: 0,
@@ -184,6 +196,7 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 				context,
 				resource,
 				draft.shippingMethod,
+				draft.externalTaxRateForShippingMethod ?? undefined,
 			);
 		}
 
@@ -211,6 +224,8 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 		draftLineItem: LineItemDraft,
 		currency: string,
 		country: string | undefined,
+		taxMode: Cart["taxMode"] = "Platform",
+		roundingMode: Cart["taxRoundingMode"] = "HalfEven",
 	): Promise<LineItem> => {
 		const { productId, quantity, variantId, sku } = draftLineItem;
 
@@ -277,6 +292,19 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 			centAmount: calculateMoneyTotalCentAmount(price.value, quant),
 		});
 
+		const taxRate =
+			taxMode === "External" && draftLineItem.externalTaxRate
+				? taxRateFromExternalDraft(draftLineItem.externalTaxRate)
+				: undefined;
+		const taxedPrice = taxRate
+			? calculateTaxedPriceFromRate(
+					totalPrice.centAmount,
+					totalPrice.currencyCode,
+					taxRate,
+					roundingMode,
+				)
+			: undefined;
+
 		return {
 			id: uuidv4(),
 			productId: product.id,
@@ -287,6 +315,8 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 			variant,
 			price: price,
 			totalPrice,
+			taxRate,
+			taxedPrice,
 			taxedPricePortions: [],
 			perMethodTaxRate: [],
 			quantity: quant,
@@ -306,11 +336,13 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 		context: RepositoryContext,
 		resource: Writable<Cart>,
 		shippingMethodRef: NonNullable<CartDraft["shippingMethod"]>,
+		externalTaxRate?: ExternalTaxRateDraft,
 	): Promise<NonNullable<Cart["shippingInfo"]>> {
-		if (resource.taxMode === "External") {
+		if (resource.taxMode === "External" && !externalTaxRate) {
 			throw new CommercetoolsError<InvalidOperationError>({
 				code: "InvalidOperation",
-				message: "External tax rate is not supported",
+				message:
+					"An external tax rate is required for a cart with External tax mode.",
 			});
 		}
 
@@ -355,6 +387,7 @@ export class CartRepository extends AbstractResourceRepository<"cart"> {
 			this._storage,
 			resource,
 			method,
+			resource.taxMode === "External" ? externalTaxRate : undefined,
 		);
 	}
 }

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

@@ -953,8 +953,12 @@ describe("Order repository", () => {
 			);
 			expect(result.shippingInfo?.taxCategory?.id).toBe("tax-category-456");
 			expect(result.shippingInfo?.taxRate?.amount).toBe(0.19);
-			// Note: deliveries from import drafts are not currently supported in native implementation
-			expect(result.shippingInfo?.deliveries).toEqual([]);
+			expect(result.shippingInfo?.deliveries).toHaveLength(1);
+			expect(result.shippingInfo?.deliveries?.[0].key).toBe("delivery-1");
+			expect(result.shippingInfo?.deliveries?.[0].parcels).toHaveLength(1);
+			expect(result.shippingInfo?.deliveries?.[0].parcels[0].key).toBe(
+				"parcel-1",
+			);
 		});
 
 		test("createShippingInfo throws error for non-existent shipping method", async () => {

package/src/repositories/order/index.ts

@@ -4,6 +4,7 @@ import type {
 	CartReference,
 	CustomLineItem,
 	CustomLineItemImportDraft,
+	Delivery,
 	DuplicateFieldError,
 	GeneralError,
 	LineItem,
@@ -18,6 +19,7 @@ import type {
 	ReferencedResourceNotFoundError,
 	ResourceNotFoundError,
 	ShippingInfo,
+	ShippingInfoImportDraft,
 	ShippingMethodDoesNotMatchCartError,
 	ShippingMethodReference,
 } from "@commercetools/platform-sdk";
@@ -206,30 +208,12 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 			totalPrice: createCentPrecisionMoney(draft.totalPrice),
 		};
 
-		// Set shipping info after resource is created
-		if (draft.shippingInfo?.shippingMethod) {
-			const { ...shippingMethodRef } = draft.shippingInfo.shippingMethod;
-
-			// get id when reference is by key only
-			if (shippingMethodRef.key && !shippingMethodRef.id) {
-				const shippingMethod =
-					await this._storage.getByResourceIdentifier<"shipping-method">(
-						context.projectKey,
-						shippingMethodRef,
-					);
-				if (!shippingMethod) {
-					throw new CommercetoolsError<GeneralError>({
-						code: "General",
-						message: `A shipping method with key '${shippingMethodRef.key}' does not exist.`,
-					});
-				}
-				shippingMethodRef.id = shippingMethod.id;
-			}
-
-			resource.shippingInfo = await this.createShippingInfo(context, resource, {
-				typeId: "shipping-method",
-				id: shippingMethodRef.id as string,
-			});
+		if (draft.shippingInfo) {
+			resource.shippingInfo = await this.shippingInfoFromImportDraft(
+				context,
+				resource,
+				draft.shippingInfo,
+			);
 		}
 
 		const { taxedPrice, taxedShippingPrice } = calculateTaxTotals({
@@ -399,7 +383,7 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		context: RepositoryContext,
 		resource: Writable<Order>,
 		shippingMethodRef: ShippingMethodReference,
-	): Promise<ShippingInfo> {
+	): Promise<Writable<ShippingInfo>> {
 		const cartLikeForMatching: Writable<Cart> = {
 			...resource,
 			cartState: "Active" as const,
@@ -447,6 +431,79 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 		};
 	}
 
+	private async shippingInfoFromImportDraft(
+		context: RepositoryContext,
+		resource: Writable<Order>,
+		draft: ShippingInfoImportDraft,
+	): Promise<ShippingInfo | undefined> {
+		if (!draft.shippingMethod) {
+			return undefined;
+		}
+
+		const { ...shippingMethodRef } = draft.shippingMethod;
+		if (shippingMethodRef.key && !shippingMethodRef.id) {
+			const shippingMethod =
+				await this._storage.getByResourceIdentifier<"shipping-method">(
+					context.projectKey,
+					shippingMethodRef,
+				);
+			if (!shippingMethod) {
+				throw new CommercetoolsError<GeneralError>({
+					code: "General",
+					message: `A shipping method with key '${shippingMethodRef.key}' does not exist.`,
+				});
+			}
+			shippingMethodRef.id = shippingMethod.id;
+		}
+
+		const shippingInfo = await this.createShippingInfo(context, resource, {
+			typeId: "shipping-method",
+			id: shippingMethodRef.id as string,
+		});
+
+		shippingInfo.deliveries = await this.deliveriesFromImportDraft(
+			context,
+			draft,
+		);
+		return shippingInfo;
+	}
+
+	private async deliveriesFromImportDraft(
+		context: RepositoryContext,
+		draft: ShippingInfoImportDraft,
+	): Promise<Delivery[]> {
+		if (!draft.deliveries) return [];
+
+		return Promise.all(
+			draft.deliveries.map(async (deliveryDraft) => ({
+				...getBaseResourceProperties(),
+				key: deliveryDraft.key,
+				items: deliveryDraft.items ?? [],
+				parcels: await Promise.all(
+					deliveryDraft.parcels?.map(async (parcel) => ({
+						...getBaseResourceProperties(),
+						...parcel,
+						custom: await createCustomFields(
+							parcel.custom,
+							context.projectKey,
+							this._storage,
+						),
+					})) ?? [],
+				),
+				address: createAddress(
+					deliveryDraft.address,
+					context.projectKey,
+					this._storage,
+				),
+				custom: await createCustomFields(
+					deliveryDraft.custom,
+					context.projectKey,
+					this._storage,
+				),
+			})),
+		);
+	}
+
 	async search(
 		context: RepositoryContext,
 		searchRequest: OrderSearchRequest,