@labdigital/commercetools-mock 2.33.0 → 2.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.33.0",
+  "version": "2.34.0",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",
@@ -23,7 +23,6 @@
     "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 inject(app)
+				const res = await supertest(app)
 					.post(url.pathname + "?" + url.searchParams.toString())
-					.body(body)
-					.headers(headers)
-					.end();
-				return new HttpResponse(res.body, {
+					.send(body)
+					.set(headers);
+
+				return new HttpResponse(JSON.stringify(res.body), {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
 				});
@@ -208,11 +208,10 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await inject(app)
+				const res = await supertest(app)
 					.get(url.pathname + "?" + url.searchParams.toString())
-					.body(body)
-					.headers(headers)
-					.end();
+					.send(body)
+					.set(headers);
 
 				if (res.statusCode === 200) {
 					const parsedBody = JSON.parse(res.body);
@@ -239,12 +238,11 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await inject(app)
+				const res = await supertest(app)
 					.get(url.pathname + "?" + url.searchParams.toString())
-					.body(body)
-					.headers(headers)
-					.end();
-				return new HttpResponse(res.body, {
+					.send(body)
+					.set(headers);
+				return new HttpResponse(JSON.stringify(res.body), {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
 				});
@@ -254,11 +252,10 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await inject(app)
+				const res = await supertest(app)
 					.post(url.pathname + "?" + url.searchParams.toString())
-					.body(body)
-					.headers(headers)
-					.end();
+					.send(body)
+					.set(headers);
 				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),
@@ -269,11 +266,10 @@ export class CommercetoolsMock {
 				const url = new URL(request.url);
 				const headers = copyHeaders(request.headers);
 
-				const res = await inject(app)
+				const res = await supertest(app)
 					.delete(url.pathname + "?" + url.searchParams.toString())
-					.body(body)
-					.headers(headers)
-					.end();
+					.send(body)
+					.set(headers);
 				return new HttpResponse(res.body, {
 					status: res.statusCode,
 					headers: mapHeaderType(res.headers),

package/src/index.test.ts

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

package/src/repositories/cart/actions.ts

@@ -12,6 +12,7 @@ import {
 	type CartRemoveDiscountCodeAction,
 	type CartRemoveLineItemAction,
 	type CartSetBillingAddressAction,
+	type CartSetBillingAddressCustomTypeAction,
 	type CartSetCountryAction,
 	type CartSetCustomFieldAction,
 	type CartSetCustomShippingMethodAction,
@@ -21,6 +22,7 @@ import {
 	type CartSetLineItemShippingDetailsAction,
 	type CartSetLocaleAction,
 	type CartSetShippingAddressAction,
+	type CartSetShippingAddressCustomTypeAction,
 	type CartSetShippingMethodAction,
 	type CustomFields,
 	type GeneralError,
@@ -323,6 +325,38 @@ export class CartUpdateHandler
 		);
 	}
 
+	setBillingAddressCustomType(
+		context: RepositoryContext,
+		resource: Writable<Cart>,
+		custom: CartSetBillingAddressCustomTypeAction,
+	) {
+		if (!resource.billingAddress) {
+			throw new Error("Resource has no billing address");
+		}
+
+		if (!custom.type) {
+			resource.billingAddress.custom = undefined;
+			return;
+		}
+
+		const resolvedType = this._storage.getByResourceIdentifier<"type">(
+			context.projectKey,
+			custom.type,
+		);
+
+		if (!resolvedType) {
+			throw new Error(`Type ${custom.type} not found`);
+		}
+
+		resource.billingAddress.custom = {
+			type: {
+				typeId: "type",
+				id: resolvedType.id,
+			},
+			fields: custom.fields || {},
+		};
+	}
+
 	setCountry(
 		context: RepositoryContext,
 		resource: Writable<Cart>,
@@ -503,6 +537,38 @@ export class CartUpdateHandler
 		};
 	}
 
+	setShippingAddressCustomType(
+		context: RepositoryContext,
+		resource: Writable<Cart>,
+		custom: CartSetShippingAddressCustomTypeAction,
+	) {
+		if (!resource.shippingAddress) {
+			throw new Error("Resource has no shipping address");
+		}
+
+		if (!custom.type) {
+			resource.shippingAddress.custom = undefined;
+			return;
+		}
+
+		const resolvedType = this._storage.getByResourceIdentifier<"type">(
+			context.projectKey,
+			custom.type,
+		);
+
+		if (!resolvedType) {
+			throw new Error(`Type ${custom.type} not found`);
+		}
+
+		resource.shippingAddress.custom = {
+			type: {
+				typeId: "type",
+				id: resolvedType.id,
+			},
+			fields: custom.fields || {},
+		};
+	}
+
 	setShippingMethod(
 		context: RepositoryContext,
 		resource: Writable<Cart>,

package/src/services/cart.test.ts

@@ -605,6 +605,140 @@ describe("Cart Update Actions", () => {
 		expect(response.body.shippingAddress).toEqual(address);
 	});
 
+	test("setBillingAddressCustomType", async () => {
+		assert(cart, "cart not created");
+
+		const address: Address = {
+			streetName: "Street name",
+			city: "Utrecht",
+			country: "NL",
+		};
+
+		const type = await supertest(ctMock.app)
+			.post(`/dummy/types`)
+			.send({
+				key: "my-type",
+				name: {
+					en: "My Type",
+				},
+				description: {
+					en: "My Type Description",
+				},
+				fieldDefinitions: [
+					{
+						name: "foo",
+						label: {
+							en: "foo",
+						},
+						required: false,
+						type: {
+							name: "String",
+						},
+						inputHint: "SingleLine",
+					},
+				],
+			})
+			.then((x) => x.body);
+
+		assert(type, "type not created");
+
+		const response = await supertest(ctMock.app)
+			.post(`/dummy/carts/${cart.id}`)
+			.send({
+				version: 1,
+				actions: [
+					{ action: "setBillingAddress", address },
+					{
+						action: "setBillingAddressCustomType",
+						type: {
+							typeId: "type",
+							type: "my-type",
+							key: "my-type",
+						},
+						fields: {
+							foo: "bar",
+						},
+					},
+				],
+			});
+
+		expect(response.status).toBe(200);
+		expect(response.body.version).toBe(3);
+		expect(response.body.billingAddress).toEqual({
+			...address,
+			custom: {
+				type: { typeId: "type", id: type.id },
+				fields: { foo: "bar" },
+			},
+		});
+	});
+	test("setShippingAddressCustomType", async () => {
+		assert(cart, "cart not created");
+
+		const address: Address = {
+			streetName: "Street name",
+			city: "Utrecht",
+			country: "NL",
+		};
+
+		const type = await supertest(ctMock.app)
+			.post(`/dummy/types`)
+			.send({
+				key: "my-type",
+				name: {
+					en: "My Type",
+				},
+				description: {
+					en: "My Type Description",
+				},
+				fieldDefinitions: [
+					{
+						name: "foo",
+						label: {
+							en: "foo",
+						},
+						required: false,
+						type: {
+							name: "String",
+						},
+						inputHint: "SingleLine",
+					},
+				],
+			})
+			.then((x) => x.body);
+
+		assert(type, "type not created");
+
+		const response = await supertest(ctMock.app)
+			.post(`/dummy/carts/${cart.id}`)
+			.send({
+				version: 1,
+				actions: [
+					{ action: "setShippingAddress", address },
+					{
+						action: "setShippingAddressCustomType",
+						type: {
+							typeId: "type",
+							type: "my-type",
+							key: "my-type",
+						},
+						fields: {
+							foo: "bar",
+						},
+					},
+				],
+			});
+
+		expect(response.status).toBe(200);
+		expect(response.body.version).toBe(3);
+		expect(response.body.shippingAddress).toEqual({
+			...address,
+			custom: {
+				type: { typeId: "type", id: type.id },
+				fields: { foo: "bar" },
+			},
+		});
+	});
 	test("setLineItemShippingDetails", async () => {
 		const product = await supertest(ctMock.app)
 			.post(`/dummy/products`)