@labdigital/commercetools-mock 2.34.0 → 2.34.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.34.0",
+  "version": "2.34.2",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",
@@ -23,6 +23,7 @@
     "body-parser": "^1.20.2",
     "deep-equal": "^2.2.3",
     "express": "^4.19.2",
+    "light-my-request": "^5.11.1",
     "lodash.isequal": "^4.5.0",
     "morgan": "^1.10.0",
     "msw": "^2.2.1",

package/src/ctMock.ts

@@ -1,8 +1,8 @@
 import express, { NextFunction, Request, Response } from "express";
+import inject from "light-my-request";
 import morgan from "morgan";
 import { http, HttpResponse } from "msw";
 import { setupServer, SetupServer, SetupServerApi } from "msw/node";
-import supertest from "supertest";
 import { DEFAULT_API_HOSTNAME, DEFAULT_AUTH_HOSTNAME } from "./constants";
 import { CommercetoolsError } from "./exceptions";
 import { copyHeaders } from "./lib/proxy";
@@ -193,12 +193,12 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await supertest(app)
+				const res = await inject(app)
 					.post(url.pathname + "?" + url.searchParams.toString())
-					.send(body)
-					.set(headers);
-
-				return new HttpResponse(JSON.stringify(res.body), {
+					.body(body)
+					.headers(headers)
+					.end();
+				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
 				});
@@ -208,10 +208,11 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await supertest(app)
+				const res = await inject(app)
 					.get(url.pathname + "?" + url.searchParams.toString())
-					.send(body)
-					.set(headers);
+					.body(body)
+					.headers(headers)
+					.end();
 
 				if (res.statusCode === 200) {
 					const parsedBody = JSON.parse(res.body);
@@ -238,11 +239,12 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await supertest(app)
+				const res = await inject(app)
 					.get(url.pathname + "?" + url.searchParams.toString())
-					.send(body)
-					.set(headers);
-				return new HttpResponse(JSON.stringify(res.body), {
+					.body(body)
+					.headers(headers)
+					.end();
+				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
 				});
@@ -252,10 +254,11 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await supertest(app)
+				const res = await inject(app)
 					.post(url.pathname + "?" + url.searchParams.toString())
-					.send(body)
-					.set(headers);
+					.body(body)
+					.headers(headers)
+					.end();
 				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
@@ -266,10 +269,11 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await supertest(app)
+				const res = await inject(app)
 					.delete(url.pathname + "?" + url.searchParams.toString())
-					.send(body)
-					.set(headers);
+					.body(body)
+					.headers(headers)
+					.end();
 				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),

package/src/index.test.ts

@@ -1,16 +1,10 @@
 import { type InvalidTokenError } from "@commercetools/platform-sdk";
 import got from "got";
-import { afterEach, expect, test } from "vitest";
+import { expect, test } from "vitest";
 import { CommercetoolsMock } from "./index";
 
-let ctMock: CommercetoolsMock;
-
-afterEach(() => {
-	ctMock.stop();
-});
-
 test("node:fetch client", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: true,
 		validateCredentials: true,
 		apiHost: "https://localhost",
@@ -50,10 +44,11 @@ test("node:fetch client", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });
 
 test("got client", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: true,
 		validateCredentials: true,
 		apiHost: "https://localhost",
@@ -91,10 +86,11 @@ test("got client", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });
 
 test("Options.validateCredentials: true (error)", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: true,
 		validateCredentials: true,
 	});
@@ -112,10 +108,11 @@ test("Options.validateCredentials: true (error)", async () => {
 	);
 	expect(response.statusCode).toBe(401);
 	expect(response.body.message).toBe("invalid_token");
+	ctMock.stop();
 });
 
 test("Options.validateCredentials: false", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: true,
 		validateCredentials: false,
 	});
@@ -138,6 +135,7 @@ test("Options.validateCredentials: false", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });
 
 test("Options.enableAuthentication: false", async () => {
@@ -161,10 +159,11 @@ test("Options.enableAuthentication: false", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });
 
 test("Options.apiHost: is overridden is set", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: false,
 		validateCredentials: false,
 		apiHost: "http://api.localhost",
@@ -182,10 +181,11 @@ test("Options.apiHost: is overridden is set", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });
 
 test("Options.authHost: is set", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: true,
 		validateCredentials: true,
 		authHost: "http://auth.localhost",
@@ -211,7 +211,7 @@ test("Options.authHost: is set", async () => {
 });
 
 test("apiHost mock proxy: querystring", async () => {
-	ctMock = new CommercetoolsMock({
+	const ctMock = new CommercetoolsMock({
 		enableAuthentication: false,
 		validateCredentials: false,
 		apiHost: "http://api.localhost",
@@ -234,4 +234,5 @@ test("apiHost mock proxy: querystring", async () => {
 		limit: 20,
 		results: [],
 	});
+	ctMock.stop();
 });

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

@@ -1,4 +1,8 @@
-import type { Cart, OrderImportDraft } from "@commercetools/platform-sdk";
+import type {
+	Cart,
+	LineItem,
+	OrderImportDraft,
+} from "@commercetools/platform-sdk";
 import { describe, expect, test } from "vitest";
 import { InMemoryStorage } from "~src/storage";
 import { OrderRepository } from "./index";
@@ -17,7 +21,14 @@ describe("Order repository", () => {
 			directDiscounts: [],
 			inventoryMode: "None",
 			itemShippingAddresses: [],
-			lineItems: [],
+			lineItems: [
+				{
+					id: "15fc56ba-a74e-4cf8-b4b0-bada5c101541",
+					productId: "PRODUCTID",
+					variantId: 1,
+					quantity: 1,
+				} as unknown as LineItem,
+			],
 			customLineItems: [],
 			totalPrice: {
 				type: "centPrecision",
@@ -33,6 +44,90 @@ describe("Order repository", () => {
 			taxCalculationMode: "UnitPriceLevel",
 			refusedGifts: [],
 			origin: "Customer",
+			anonymousId: "1234567890",
+			billingAddress: {
+				id: "1234567890",
+				country: "NL",
+				firstName: "John",
+				lastName: "Doe",
+				streetName: "Main Street",
+				streetNumber: "123",
+				postalCode: "123456",
+			},
+			customerEmail: "john.doe@example.com",
+			customerGroup: {
+				id: "1234567890",
+				typeId: "customer-group",
+			},
+			customerId: "1234567890",
+			custom: {
+				type: {
+					typeId: "type",
+					id: "1234567890",
+				},
+				fields: {
+					description: "example description",
+				},
+			},
+
+			shippingAddress: {
+				id: "1234567890",
+				country: "NL",
+				firstName: "John",
+				lastName: "Doe",
+				streetName: "Main Street",
+				streetNumber: "123",
+				postalCode: "123456",
+			},
+			shippingInfo: {
+				shippingMethodName: "Standard Shipping",
+				price: {
+					type: "centPrecision",
+					currencyCode: "EUR",
+					centAmount: 1000,
+					fractionDigits: 2,
+				},
+				shippingRate: {
+					price: {
+						type: "centPrecision",
+						currencyCode: "EUR",
+						centAmount: 1000,
+						fractionDigits: 2,
+					},
+					tiers: [],
+				},
+				shippingMethodState: "Shipped",
+			},
+			taxedPrice: {
+				totalNet: {
+					type: "centPrecision",
+					currencyCode: "EUR",
+					centAmount: 1000,
+					fractionDigits: 2,
+				},
+				taxPortions: [],
+				totalGross: {
+					type: "centPrecision",
+					currencyCode: "EUR",
+					centAmount: 1210,
+					fractionDigits: 2,
+				},
+			},
+			taxedShippingPrice: {
+				totalNet: {
+					type: "centPrecision",
+					currencyCode: "EUR",
+					centAmount: 100,
+					fractionDigits: 2,
+				},
+				taxPortions: [],
+				totalGross: {
+					type: "centPrecision",
+					currencyCode: "EUR",
+					centAmount: 121,
+					fractionDigits: 2,
+				},
+			},
 		};
 
 		storage.add("dummy", "cart", cart);
@@ -49,50 +144,37 @@ describe("Order repository", () => {
 
 		const items = repository.query(ctx);
 		expect(items.count).toBe(1);
-	});
-
-	test("create from cart - in store", async () => {
-		const cart: Cart = {
-			id: "b3875a58-4ab2-4aaa-b399-184ce7561c27",
-			version: 1,
-			createdAt: "2021-09-02T12:23:30.036Z",
-			lastModifiedAt: "2021-09-02T12:23:30.546Z",
-			discountCodes: [],
-			directDiscounts: [],
-			inventoryMode: "None",
-			itemShippingAddresses: [],
-			lineItems: [],
-			customLineItems: [],
-			totalPrice: {
-				type: "centPrecision",
-				currencyCode: "EUR",
-				centAmount: 10000,
-				fractionDigits: 2,
-			},
-			cartState: "Active",
-			shippingMode: "Single",
-			shipping: [],
-			taxMode: "Platform",
-			taxRoundingMode: "HalfEven",
-			taxCalculationMode: "UnitPriceLevel",
-			refusedGifts: [],
-			origin: "Customer",
-		};
-
-		storage.add("dummy", "cart", cart);
 
-		const result = repository.create(
-			{ projectKey: "dummy", storeKey: "some-store" },
-			{
-				cart: {
-					id: cart.id,
-					typeId: "cart",
-				},
-				version: cart.version,
-			},
-		);
-		expect(result.cart?.id).toBe(cart.id);
-		expect(result.store?.key).toBe("some-store");
+		expect(result.orderNumber).not.toBeUndefined();
+		expect(result.anonymousId).toEqual(cart.anonymousId);
+		expect(result.billingAddress).toEqual(cart.billingAddress);
+		expect(result.cart?.id).toEqual(cart.id);
+		expect(result.country).toEqual(cart.country);
+		expect(result.custom).toEqual(cart.custom);
+		expect(result.customerEmail).toEqual(cart.customerEmail);
+		expect(result.customerGroup).toEqual(cart.customerGroup);
+		expect(result.customerId).toEqual(cart.customerId);
+		expect(result.customLineItems).toEqual(cart.customLineItems);
+		expect(result.directDiscounts).toEqual(cart.directDiscounts);
+		expect(result.discountCodes).toEqual(cart.discountCodes);
+		expect(result.discountOnTotalPrice).toEqual(cart.discountOnTotalPrice);
+		expect(result.lineItems).toEqual(cart.lineItems);
+		expect(result.locale).toEqual(cart.locale);
+		expect(result.orderState).toEqual("Open");
+		expect(result.origin).toEqual(cart.origin);
+		expect(result.paymentInfo).toEqual(cart.paymentInfo);
+		expect(result.refusedGifts).toEqual(cart.refusedGifts);
+		expect(result.shipping).toEqual(cart.shipping);
+		expect(result.shippingAddress).toEqual(cart.shippingAddress);
+		expect(result.shippingMode).toEqual(cart.shippingMode);
+		expect(result.syncInfo).toEqual([]);
+		expect(result.taxCalculationMode).toEqual(cart.taxCalculationMode);
+		expect(result.taxedPrice).toEqual(cart.taxedPrice);
+		expect(result.taxedShippingPrice).toEqual(cart.taxedShippingPrice);
+		expect(result.taxMode).toEqual(cart.taxMode);
+		expect(result.taxRoundingMode).toEqual(cart.taxRoundingMode);
+		expect(result.totalPrice).toEqual(cart.totalPrice);
+		expect(result.store).toEqual(cart.store);
 	});
 
 	test("import exiting product", async () => {

package/src/repositories/order/index.ts

@@ -15,7 +15,7 @@ import type {
 } from "@commercetools/platform-sdk";
 import assert from "assert";
 import { CommercetoolsError } from "~src/exceptions";
-import { getBaseResourceProperties } from "~src/helpers";
+import { generateRandomString, getBaseResourceProperties } from "~src/helpers";
 import { AbstractStorage } from "~src/storage/abstract";
 import {
 	AbstractResourceRepository,
@@ -65,25 +65,37 @@ export class OrderRepository extends AbstractResourceRepository<"order"> {
 
 		const resource: Order = {
 			...getBaseResourceProperties(),
-			orderNumber,
+			anonymousId: cart.anonymousId,
+			billingAddress: cart.billingAddress,
 			cart: cartReference,
-			orderState: "Open",
-			lineItems: [],
+			country: cart.country,
+			custom: cart.custom,
+			customerEmail: cart.customerEmail,
+			customerGroup: cart.customerGroup,
+			customerId: cart.customerId,
 			customLineItems: [],
-			totalPrice: cart.totalPrice,
-			refusedGifts: [],
+			directDiscounts: cart.directDiscounts,
+			discountCodes: cart.discountCodes,
+			discountOnTotalPrice: cart.discountOnTotalPrice,
+			lastMessageSequenceNumber: 0,
+			lineItems: cart.lineItems,
+			locale: cart.locale,
+			orderNumber: orderNumber ?? generateRandomString(10),
+			orderState: "Open",
 			origin: "Customer",
-			syncInfo: [],
-			shippingMode: cart.shippingMode,
+			paymentInfo: cart.paymentInfo,
+			refusedGifts: [],
 			shipping: cart.shipping,
-			store: context.storeKey
-				? {
-						key: context.storeKey,
-						typeId: "store",
-					}
-				: undefined,
-			custom: cart.custom,
-			lastMessageSequenceNumber: 0,
+			shippingAddress: cart.shippingAddress,
+			shippingMode: cart.shippingMode,
+			syncInfo: [],
+			taxCalculationMode: cart.taxCalculationMode,
+			taxedPrice: cart.taxedPrice,
+			taxedShippingPrice: cart.taxedShippingPrice,
+			taxMode: cart.taxMode,
+			taxRoundingMode: cart.taxRoundingMode,
+			totalPrice: cart.totalPrice,
+			store: cart.store,
 		};
 		return this.saveNew(context, resource);
 	}