@labdigital/commercetools-mock 2.22.1 → 2.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.22.1",
+  "version": "2.23.0",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",
@@ -22,7 +22,7 @@
     "basic-auth": "^2.0.1",
     "body-parser": "^1.20.2",
     "deep-equal": "^2.2.3",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "light-my-request": "^5.11.1",
     "lodash.isequal": "^4.5.0",
     "morgan": "^1.10.0",

package/src/lib/predicateParser.test.ts

@@ -127,6 +127,7 @@ describe("Predicate filter", () => {
 		expect(match(`numberProperty >= 1234`)).toBeTruthy();
 		expect(match(`numberProperty >= 1235`)).toBeFalsy();
 	});
+
 	test("numberProperty < ...", async () => {
 		expect(match(`numberProperty < 1235`)).toBeTruthy();
 		expect(match(`numberProperty < 1234`)).toBeFalsy();
@@ -180,6 +181,16 @@ describe("Predicate filter", () => {
 		expect(match(`nested(array(stringProperty="bar"))`)).toBeTruthy();
 		expect(match(`nested(array(stringProperty="foobar"))`)).toBeFalsy();
 
+		// Different comparison operators
+		expect(match(`nested(array(numberProperty>=2345))`)).toBeTruthy();
+		expect(match(`nested(array(numberProperty>=2346))`)).toBeFalsy();
+		expect(match(`nested(array(numberProperty>2344))`)).toBeTruthy();
+		expect(match(`nested(array(numberProperty>2345))`)).toBeFalsy();
+		expect(match(`nested(array(numberProperty<=1234))`)).toBeTruthy();
+		expect(match(`nested(array(numberProperty<=1233))`)).toBeFalsy();
+		expect(match(`nested(array(numberProperty<1235))`)).toBeTruthy();
+		expect(match(`nested(array(numberProperty<1234))`)).toBeFalsy();
+
 		// One level deeper
 		expect(
 			match(`nested(array(objectProperty(stringProperty="foo")))`),
@@ -192,6 +203,35 @@ describe("Predicate filter", () => {
 		).toBeFalsy();
 	});
 
+	test("nested array multiple filters on property", async () => {
+		expect(
+			match(
+				`nested(array(stringProperty="foo" and numberProperty=2345 and objectProperty(stringProperty="foo")))`,
+			),
+		).toBeFalsy();
+		expect(
+			match(`nested(array(stringProperty="foo" or numberProperty=2345))`),
+		).toBeTruthy();
+		expect(
+			match(
+				`nested(array(stringProperty="foo" and numberProperty > 1233 and numberProperty < 1235))`,
+			),
+		).toBeTruthy();
+		expect(
+			match(
+				`nested(array(stringProperty="foo" and numberProperty >= 1234 and numberProperty <= 1234))`,
+			),
+		).toBeTruthy();
+		expect(
+			match(`nested(array(stringProperty="foo" and numberProperty != 1233))`),
+		).toBeTruthy();
+		expect(
+			match(
+				`nested(array(stringProperty="foobar" and numberProperty > 1234 and numberProperty < 1237))`,
+			),
+		).toBeFalsy();
+	});
+
 	test("array filters on property", async () => {
 		expect(match(`array(nestedArray(stringProperty="foo")))`)).toBeTruthy();
 		expect(

package/src/lib/predicateParser.ts

@@ -259,6 +259,10 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
 				} else {
 					const value = resolveValue(obj, left);
 					if (value) {
+						if (Array.isArray(value)) {
+							return value.some((item) => expr(item, vars));
+						}
+
 						return expr(value, vars);
 					}
 					return false;

package/src/repositories/customer/index.ts

@@ -98,10 +98,13 @@ export class CustomerRepository extends AbstractResourceRepository<"customer"> {
 		}
 		const expiresAt = new Date(Date.now() + 30 * 60);
 		const customer = results.results[0] as Customer;
-		const { version: _, ...rest } = getBaseResourceProperties();
+		const rest = getBaseResourceProperties();
+
 		const token = createPasswordResetToken(customer);
 		return {
-			...rest,
+			id: rest.id,
+			createdAt: rest.createdAt,
+			lastModifiedAt: rest.lastModifiedAt,
 			customerId: customer.id,
 			expiresAt: expiresAt.toISOString(),
 			value: token,