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

package/src/services/product-projection.test.ts

@@ -1,16 +1,16 @@
 import type {
 	Product,
-	ProductDraft,
 	ProductProjection,
 	ProductProjectionPagedSearchResponse,
 	ProductType,
-	ProductTypeDraft,
 } from "@commercetools/platform-sdk";
-import supertest from "supertest";
 import * as timekeeper from "timekeeper";
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import {
+	productDraftFactory,
+	productTypeDraftFactory,
+} from "#src/testing/index.ts";
 import { CommercetoolsMock } from "../index.ts";
-import type { Writable } from "../types.ts";
 
 const ctMock = new CommercetoolsMock();
 
@@ -19,68 +19,55 @@ let productProjection: ProductProjection;
 let publishedProduct: Product;
 let unpublishedProduct: Product;
 
+const productTypeFactory = productTypeDraftFactory(ctMock);
+const productFactory = productDraftFactory(ctMock);
+
 beforeEach(async () => {
 	timekeeper.freeze(new Date("2022-07-22T13:31:49.840Z"));
 
 	// Create the product type
-	{
-		const draft: ProductTypeDraft = {
-			name: "Default Product Type",
-			description: "Product type for testing",
-		};
-		const response = await supertest(ctMock.app)
-			.post("/dummy/product-types")
-			.send(draft);
-
-		expect(response.ok).toBe(true);
-		productType = response.body;
-	}
+	productType = await productTypeFactory.create({
+		name: "Default Product Type",
+		description: "Product type for testing",
+	});
 
 	// Create an unpublished product
-	{
-		const productDraft: Writable<ProductDraft> = {
-			publish: false,
-			key: "my-unpublished-product",
-			attributes: [{ name: "number", value: 11 as any }],
-			masterVariant: {
-				sku: "my-unpub-sku",
-				prices: [
-					{
-						value: {
-							currencyCode: "EUR",
-							centAmount: 189,
-						},
-					},
-				],
-				attributes: [
-					{
-						name: "number",
-						value: 1 as any,
+	unpublishedProduct = await productFactory.create({
+		publish: false,
+		key: "my-unpublished-product",
+		attributes: [{ name: "number", value: 11 as any }],
+		masterVariant: {
+			sku: "my-unpub-sku",
+			prices: [
+				{
+					value: {
+						currencyCode: "EUR",
+						centAmount: 189,
 					},
-				],
-			},
-			name: {
-				"nl-NL": "test unpublished product",
-			},
-			productType: {
-				typeId: "product-type",
-				id: productType.id,
-			},
-			slug: {
-				"nl-NL": "test-unpublished-product",
-			},
-		};
-
-		const response = await supertest(ctMock.app)
-			.post("/dummy/products")
-			.send(productDraft);
-		expect(response.ok).toBe(true);
-		unpublishedProduct = response.body;
-	}
+				},
+			],
+			attributes: [
+				{
+					name: "number",
+					value: 1 as any,
+				},
+			],
+		},
+		name: {
+			"nl-NL": "test unpublished product",
+		},
+		productType: {
+			typeId: "product-type",
+			id: productType.id,
+		},
+		slug: {
+			"nl-NL": "test-unpublished-product",
+		},
+	});
 
 	// Create a published product
 	{
-		const productDraft: Writable<ProductDraft> = {
+		const productDraft = {
 			publish: true,
 			key: "my-product-key",
 			attributes: [{ name: "number", value: 111 as any }],
@@ -128,7 +115,7 @@ beforeEach(async () => {
 				"nl-NL": "test product",
 			},
 			productType: {
-				typeId: "product-type",
+				typeId: "product-type" as const,
 				id: productType.id,
 			},
 			slug: {
@@ -136,12 +123,8 @@ beforeEach(async () => {
 			},
 		};
 
-		const response = await supertest(ctMock.app)
-			.post("/dummy/products")
-			.send(productDraft);
-		expect(response.ok).toBe(true);
-		const product = response.body;
-		publishedProduct = response.body;
+		const product = await productFactory.create(productDraft);
+		publishedProduct = product;
 
 		// Create the expected ProductProjection object
 		productProjection = {
@@ -158,7 +141,7 @@ beforeEach(async () => {
 				sku: "my-sku",
 				prices: [
 					{
-						id: product.masterData.current.masterVariant.prices[0].id,
+						id: product.masterData.current.masterVariant.prices![0].id,
 						value: {
 							type: "centPrecision",
 							currencyCode: "EUR",
@@ -177,7 +160,7 @@ beforeEach(async () => {
 					sku: "my-other-sku",
 					prices: [
 						{
-							id: product.masterData.current.variants[0].prices[0].id,
+							id: product.masterData.current.variants[0].prices![0].id,
 							value: {
 								type: "centPrecision",
 								currencyCode: "EUR",
@@ -191,8 +174,8 @@ beforeEach(async () => {
 					attributes: productDraft.variants?.[0].attributes,
 				},
 			],
-			name: productDraft.name,
-			slug: productDraft.slug,
+			name: product.masterData.current.name,
+			slug: product.masterData.current.slug,
 			categories: [],
 			productType: {
 				typeId: "product-type",
@@ -204,16 +187,17 @@ beforeEach(async () => {
 
 afterEach(async () => {
 	timekeeper.reset();
-	ctMock.clear();
+	await ctMock.clear();
 });
 // Test the general product projection implementation
 describe("Product Projection Get By ID", () => {
 	test("Get By ID", async () => {
-		const response = await supertest(ctMock.app).get(
-			`/dummy/product-projections/${publishedProduct.id}`,
-		);
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: `/dummy/product-projections/${publishedProduct.id}`,
+		});
 
-		const result: ProductProjection = response.body;
+		const result: ProductProjection = response.json();
 
 		expect(result).toBeDefined();
 		expect(result.id).toBe(publishedProduct.id);
@@ -223,13 +207,15 @@ describe("Product Projection Get By ID", () => {
 // Test the general product projection implementation
 describe("Product Projection Query - Generic", () => {
 	test("Filter out staged", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections")
-			.query({
-				limit: 50,
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections",
+			query: {
+				limit: "50",
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toEqual({
 			count: 1,
 			limit: 50,
@@ -241,15 +227,17 @@ describe("Product Projection Query - Generic", () => {
 
 	test("Filter on valid slug", async () => {
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections")
-				.query({
-					limit: 50,
-					where: ["slug(nl-NL=:slug)"],
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections",
+				query: {
+					limit: "50",
+					where: "slug(nl-NL=:slug)",
 					"var.slug": "test-product",
-				});
+				},
+			});
 
-			const result: ProductProjectionPagedSearchResponse = response.body;
+			const result: ProductProjectionPagedSearchResponse = response.json();
 			expect(result).toEqual({
 				count: 1,
 				limit: 50,
@@ -262,18 +250,19 @@ describe("Product Projection Query - Generic", () => {
 
 	test("Filter on complex query", async () => {
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections")
-				.query({
-					limit: 50,
-					where: [
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections",
+				query: {
+					limit: "50",
+					where:
 						'slug(nl-NL=:slug) and variants(attributes(name="store" and value="test-store"))',
-					],
 					"var.slug": "test-product",
 					"var.store": "test-store",
-				});
+				},
+			});
 
-			const result: ProductProjectionPagedSearchResponse = response.body;
+			const result: ProductProjectionPagedSearchResponse = response.json();
 			expect(result).toEqual({
 				count: 1,
 				limit: 50,
@@ -286,15 +275,17 @@ describe("Product Projection Query - Generic", () => {
 
 	test("Filter on invalid slug", async () => {
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections")
-				.query({
-					limit: 50,
-					where: ["slug(nl-NL=:slug)"],
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections",
+				query: {
+					limit: "50",
+					where: "slug(nl-NL=:slug)",
 					"var.slug": "missing-product",
-				});
+				},
+			});
 
-			const result: ProductProjectionPagedSearchResponse = response.body;
+			const result: ProductProjectionPagedSearchResponse = response.json();
 			expect(result).toEqual({
 				count: 0,
 				limit: 50,
@@ -310,13 +301,15 @@ describe("Product Projection Query - Generic", () => {
 describe("Product Projection Search - Generic", () => {
 	test("Pagination", async () => {
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections/search")
-				.query({
-					limit: 50,
-				});
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections/search",
+				query: {
+					limit: "50",
+				},
+			});
 
-			const result: ProductProjectionPagedSearchResponse = response.body;
+			const result: ProductProjectionPagedSearchResponse = response.json();
 			expect(result).toEqual({
 				count: 1,
 				limit: 50,
@@ -327,19 +320,21 @@ describe("Product Projection Search - Generic", () => {
 			});
 		}
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections/search")
-				.query({
-					limit: 50,
-					offset: 50,
-				});
-
-			const projection: ProductProjection = response.body;
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections/search",
+				query: {
+					limit: "50",
+					offset: "50",
+				},
+			});
+
+			const projection: ProductProjection = response.json();
 			expect(projection).toEqual({
-				count: 1,
+				count: 0,
 				limit: 50,
 				offset: 50,
-				total: 0,
+				total: 1,
 				facets: {},
 				results: [],
 			});
@@ -348,14 +343,16 @@ describe("Product Projection Search - Generic", () => {
 
 	test("Search - unpublished", async () => {
 		{
-			const response = await supertest(ctMock.app)
-				.get("/dummy/product-projections/search")
-				.query({
-					limit: 50,
-					staged: true,
-				});
+			const response = await ctMock.app.inject({
+				method: "GET",
+				url: "/dummy/product-projections/search",
+				query: {
+					limit: "50",
+					staged: "true",
+				},
+			});
 
-			const result: ProductProjectionPagedSearchResponse = response.body;
+			const result: ProductProjectionPagedSearchResponse = response.json();
 
 			expect(result).toMatchObject({
 				count: 2,
@@ -372,25 +369,29 @@ describe("Product Projection Search - Generic", () => {
 	});
 
 	test("Get 404 when not found by key with expand", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/key=DOESNOTEXIST")
-			.query({
-				expand: ["categories[*]"],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/key=DOESNOTEXIST",
+			query: {
+				expand: "categories[*]",
+			},
+		});
 
-		expect(response.status).toBe(404);
+		expect(response.statusCode).toBe(404);
 	});
 });
 
 describe("Product Projection Search - Filters", () => {
 	test("variants.sku", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				filter: ['variants.sku:"my-sku"'],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				filter: 'variants.sku:"my-sku"',
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 1,
 			results: [
@@ -402,13 +403,15 @@ describe("Product Projection Search - Filters", () => {
 	});
 
 	test("variants.attributes.range - match", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				filter: ["variants.attributes.number:range(0 TO 10)"],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				filter: "variants.attributes.number:range(0 TO 10)",
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 1,
 			results: [
@@ -420,13 +423,15 @@ describe("Product Projection Search - Filters", () => {
 	});
 
 	test("variants.attributes.range - mismatch", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				filter: ["variants.attributes.number:range(5 TO 10)"],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				filter: "variants.attributes.number:range(5 TO 10)",
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 0,
 			results: [],
@@ -436,13 +441,15 @@ describe("Product Projection Search - Filters", () => {
 
 describe("Product Projection Search - Facets", () => {
 	test("termExpr - variants.attributes.number", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				facet: ["variants.attributes.number"],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				facet: "variants.attributes.number",
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 1,
 			facets: {
@@ -472,13 +479,15 @@ describe("Product Projection Search - Facets", () => {
 	});
 
 	test("filterExpr - variants.attributes.number", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				facet: ["variants.attributes.number:3,4"],
-			});
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				facet: "variants.attributes.number:3,4",
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 1,
 			facets: {
@@ -496,15 +505,16 @@ describe("Product Projection Search - Facets", () => {
 	});
 
 	test("rangeExpr - variants.attributes.number", async () => {
-		const response = await supertest(ctMock.app)
-			.get("/dummy/product-projections/search")
-			.query({
-				facet: [
+		const response = await ctMock.app.inject({
+			method: "GET",
+			url: "/dummy/product-projections/search",
+			query: {
+				facet:
 					"variants.attributes.number:range(* TO 5), (5 TO 25), (25 TO 100)",
-				],
-			});
+			},
+		});
 
-		const result: ProductProjectionPagedSearchResponse = response.body;
+		const result: ProductProjectionPagedSearchResponse = response.json();
 		expect(result).toMatchObject({
 			count: 1,
 			facets: {

package/src/services/product-projection.ts

@@ -1,4 +1,4 @@
-import type { Request, Response, Router } from "express";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { queryParamsArray, queryParamsValue } from "../helpers.ts";
 import { getRepositoryContext } from "../repositories/helpers.ts";
 import type {
@@ -10,7 +10,10 @@ import AbstractService from "./abstract.ts";
 export class ProductProjectionService extends AbstractService {
 	public repository: ProductProjectionRepository;
 
-	constructor(parent: Router, repository: ProductProjectionRepository) {
+	constructor(
+		parent: FastifyInstance,
+		repository: ProductProjectionRepository,
+	) {
 		super(parent);
 		this.repository = repository;
 	}
@@ -19,25 +22,38 @@ export class ProductProjectionService extends AbstractService {
 		return "product-projections";
 	}
 
-	extraRoutes(router: Router) {
-		router.get("/search", this.search.bind(this));
+	extraRoutes(instance: FastifyInstance) {
+		instance.get("/search", this.search.bind(this));
 	}
 
-	get(request: Request, response: Response) {
-		const limit = this._parseParam(request.query.limit);
-		const offset = this._parseParam(request.query.offset);
+	async get(
+		request: FastifyRequest<{
+			Params: Record<string, string>;
+			Querystring: Record<string, any>;
+		}>,
+		reply: FastifyReply,
+	) {
+		const query = request.query;
+		const limit = this._parseParam(query.limit);
+		const offset = this._parseParam(query.offset);
 
-		const result = this.repository.query(getRepositoryContext(request), {
-			...request.query,
-			expand: this._parseParam(request.query.expand),
-			where: this._parseParam(request.query.where),
+		const result = await this.repository.query(getRepositoryContext(request), {
+			...query,
+			expand: this._parseParam(query.expand),
+			where: this._parseParam(query.where),
 			limit: limit !== undefined ? Number(limit) : undefined,
 			offset: offset !== undefined ? Number(offset) : undefined,
 		});
-		response.status(200).send(result);
+		return reply.status(200).send(result);
 	}
 
-	search(request: Request, response: Response) {
+	async search(
+		request: FastifyRequest<{
+			Params: Record<string, string>;
+			Querystring: Record<string, any>;
+		}>,
+		reply: FastifyReply,
+	) {
 		const query = request.query;
 		const searchParams: ProductProjectionQueryParams = {
 			filter: queryParamsArray(query.filter),
@@ -54,10 +70,10 @@ export class ProductProjectionService extends AbstractService {
 			offset: query.offset ? Number(queryParamsValue(query.offset)) : undefined,
 			limit: query.limit ? Number(queryParamsValue(query.limit)) : undefined,
 		};
-		const resource = this.repository.search(
+		const resource = await this.repository.search(
 			getRepositoryContext(request),
 			searchParams,
 		);
-		response.status(200).send(resource);
+		return reply.status(200).send(resource);
 	}
 }

package/src/services/product-selection.test.ts

@@ -1,28 +1,36 @@
-import type { ProductSelectionDraft } from "@commercetools/platform-sdk";
-import supertest from "supertest";
 import { describe, expect, test } from "vitest";
+import { productSelectionDraftFactory } from "#src/testing/index.ts";
 import { CommercetoolsMock } from "../index.ts";
 
 const ctMock = new CommercetoolsMock();
 
 describe("product-selection", () => {
+	const productSelectionDraft = productSelectionDraftFactory(ctMock);
+
 	test("Create product selection", async () => {
-		const draft: ProductSelectionDraft = {
+		const draft = productSelectionDraft.build({
 			name: {
 				en: "foo",
 			},
 			key: "foo",
-		};
-		const response = await supertest(ctMock.app)
-			.post("/dummy/product-selections")
-			.send(draft);
+		});
+
+		const response = await ctMock.app.inject({
+			method: "POST",
+			url: "/dummy/product-selections",
+			payload: draft,
+		});
+
+		expect(response.statusCode).toBe(201);
 
-		expect(response.status).toBe(201);
+		const productSelection = response.json();
 
-		expect(response.body).toEqual({
+		expect(productSelection).toEqual({
 			createdAt: expect.anything(),
+			createdBy: expect.anything(),
 			id: expect.anything(),
 			lastModifiedAt: expect.anything(),
+			lastModifiedBy: expect.anything(),
 			name: {
 				en: "foo",
 			},

package/src/services/product-selection.ts

@@ -1,11 +1,11 @@
-import type { Router } from "express";
+import type { FastifyInstance } from "fastify";
 import type { ProductSelectionRepository } from "../repositories/product-selection.ts";
 import AbstractService from "./abstract.ts";
 
 export class ProductSelectionService extends AbstractService {
 	public repository: ProductSelectionRepository;
 
-	constructor(parent: Router, repository: ProductSelectionRepository) {
+	constructor(parent: FastifyInstance, repository: ProductSelectionRepository) {
 		super(parent);
 		this.repository = repository;
 	}