@labdigital/commercetools-mock 1.7.0 → 1.8.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@labdigital/commercetools-mock",
   "author": "Michael van Tellingen",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "license": "MIT",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

package/src/helpers.ts

@@ -32,17 +32,30 @@ export const nestedLookup = (obj: any, path: string): any => {
 	return val
 }
 
-export const QueryParamsAsArray = (
+export const queryParamsArray = (
 	input: string | ParsedQs | string[] | ParsedQs[] | undefined
-): string[] => {
+): string[] | undefined => {
 	if (input == undefined) {
-		return []
+		return undefined
 	}
 
-	if (Array.isArray(input)) {
-		return input as string[]
+	const values: string[] = Array.isArray(input)
+		? (input as string[])
+		: ([input] as string[])
+	if (values.length < 1) {
+		return undefined
 	}
-	return [input] as string[]
+	return values
+}
+
+export const queryParamsValue = (
+	value: string | ParsedQs | string[] | ParsedQs[] | undefined
+): string | undefined => {
+	const values = queryParamsArray(value)
+	if (values && values.length > 0) {
+		return values[0]
+	}
+	return undefined
 }
 
 export const cloneObject = <T>(o: T): T => JSON.parse(JSON.stringify(o))

package/src/product-projection-search.ts

@@ -171,15 +171,25 @@ export class ProductProjectionSearch {
 		products: ProductProjection[]
 	): FacetResults {
 		if (!params.facet) return {}
-		const staged = false
 		const result: FacetResults = {}
 
-		for (const facet of params.facet) {
+		const regexp = new RegExp(/ counting products$/)
+		for (let facet of params.facet) {
+			let countProducts = false
+			if (facet.endsWith(' counting products')) {
+				facet = facet.replace(regexp, '')
+				countProducts = true
+			}
+
 			const expression = generateFacetFunc(facet)
 
 			// Term Facet
 			if (expression.type === 'TermExpression') {
-				result[facet] = this.termFacet(expression.source, products)
+				result[facet] = this.termFacet(
+					expression.source,
+					products,
+					countProducts
+				)
 			}
 
 			// Range Facet
@@ -187,7 +197,8 @@ export class ProductProjectionSearch {
 				result[expression.source] = this.rangeFacet(
 					expression.source,
 					expression.children,
-					products
+					products,
+					countProducts
 				)
 			}
 
@@ -196,7 +207,8 @@ export class ProductProjectionSearch {
 				result[expression.source] = this.filterFacet(
 					expression.source,
 					expression.children,
-					products
+					products,
+					countProducts
 				)
 			}
 		}
@@ -209,7 +221,11 @@ export class ProductProjectionSearch {
 	 *  - counting products
 	 *  - correct dataType
 	 */
-	termFacet(facet: string, products: ProductProjection[]): TermFacetResult {
+	termFacet(
+		facet: string,
+		products: ProductProjection[],
+		countProducts: boolean
+	): TermFacetResult {
 		const result: Writable<TermFacetResult> = {
 			type: 'terms',
 			dataType: 'text',
@@ -254,13 +270,15 @@ export class ProductProjectionSearch {
 				count: terms[term],
 			})
 		}
+
 		return result
 	}
 
 	filterFacet(
 		source: string,
 		filters: FilterExpression[] | undefined,
-		products: ProductProjection[]
+		products: ProductProjection[],
+		countProducts: boolean
 	): FilteredFacetResult {
 		let count = 0
 		if (source.startsWith('variants.')) {
@@ -285,7 +303,8 @@ export class ProductProjectionSearch {
 	rangeFacet(
 		source: string,
 		ranges: RangeExpression[] | undefined,
-		products: ProductProjection[]
+		products: ProductProjection[],
+		countProducts: boolean
 	): RangeFacetResult {
 		const counts =
 			ranges?.map((range) => {

package/src/repositories/associate-role.ts

@@ -62,6 +62,13 @@ export class AssociateRoleRepository extends AbstractResourceRepository<'associa
 		) => {
 			resource.buyerAssignable = buyerAssignable
 		},
+		changeBuyerAssignable: (
+			context: RepositoryContext,
+			resource: Writable<AssociateRole>,
+			{ buyerAssignable }: AssociateRoleChangeBuyerAssignableAction
+		) => {
+			resource.buyerAssignable = buyerAssignable
+		},
 		setCustomFields: (
 			context: RepositoryContext,
 			resource: Writable<AssociateRole>,

package/src/repositories/product-projection.ts

@@ -4,9 +4,7 @@ import type {
 	ProductProjection,
 	QueryParam,
 } from '@commercetools/platform-sdk'
-import { ParsedQs } from 'qs'
 import { CommercetoolsError } from '../exceptions.js'
-import { QueryParamsAsArray } from '../helpers.js'
 import { parseQueryExpression } from '../lib/predicateParser.js'
 import { ProductProjectionSearch } from '../product-projection-search.js'
 import { type AbstractStorage } from '../storage/index.js'
@@ -16,13 +14,13 @@ import {
 	RepositoryContext,
 } from './abstract.js'
 
-type ProductProjectionQueryParams = {
+export type ProductProjectionQueryParams = {
 	staged?: boolean
 	priceCurrency?: string
 	priceCountry?: string
 	priceCustomerGroup?: string
 	priceChannel?: string
-	localeProjection?: string | string[]
+	localeProjection?: string
 	storeProjection?: string
 	expand?: string | string[]
 	sort?: string | string[]
@@ -126,18 +124,8 @@ export class ProductProjectionRepository extends AbstractResourceRepository<'pro
 		}
 	}
 
-	search(context: RepositoryContext, query: ParsedQs) {
-		const results = this._searchService.search(context.projectKey, {
-			filter: QueryParamsAsArray(query.filter),
-			'filter.query': QueryParamsAsArray(query['filter.query']),
-			facet: QueryParamsAsArray(query.facet),
-			offset: query.offset ? Number(query.offset) : undefined,
-			limit: query.limit ? Number(query.limit) : undefined,
-			expand: QueryParamsAsArray(query.expand),
-			staged: query.staged === 'true',
-		})
-
-		return results
+	search(context: RepositoryContext, query: ProductProjectionQueryParams) {
+		return this._searchService.search(context.projectKey, query)
 	}
 
 	actions = {}

package/src/services/abstract.ts

@@ -3,6 +3,7 @@ import { type Request, type Response, Router } from 'express'
 import { ParsedQs } from 'qs'
 import { AbstractResourceRepository } from '../repositories/abstract.js'
 import { getRepositoryContext } from '../repositories/helpers.js'
+import { queryParamsArray } from '../helpers.js'
 
 export default abstract class AbstractService {
 	protected abstract getBasePath(): string
@@ -170,12 +171,6 @@ export default abstract class AbstractService {
 	protected _parseParam(
 		value: string | ParsedQs | string[] | ParsedQs[] | undefined
 	): string[] | undefined {
-		if (Array.isArray(value)) {
-			// @ts-ignore
-			return value
-		} else if (value !== undefined) {
-			return [`${value}`]
-		}
-		return undefined
+		return queryParamsArray(value)
 	}
 }

package/src/services/product-projection.ts

@@ -1,7 +1,11 @@
 import { Request, Response, Router } from 'express'
 import { getRepositoryContext } from '../repositories/helpers.js'
-import { ProductProjectionRepository } from './../repositories/product-projection.js'
+import {
+	ProductProjectionQueryParams,
+	ProductProjectionRepository,
+} from './../repositories/product-projection.js'
 import AbstractService from './abstract.js'
+import { queryParamsArray, queryParamsValue } from '../helpers.js'
 
 export class ProductProjectionService extends AbstractService {
 	public repository: ProductProjectionRepository
@@ -34,9 +38,25 @@ export class ProductProjectionService extends AbstractService {
 	}
 
 	search(request: Request, response: Response) {
+		const query = request.query
+		const searchParams: ProductProjectionQueryParams = {
+			filter: queryParamsArray(query.filter),
+			'filter.query': queryParamsArray(query['filter.query']),
+			facet: queryParamsArray(query.facet),
+			expand: queryParamsArray(query.expand),
+			staged: queryParamsValue(query.staged) === 'true',
+			localeProjection: queryParamsValue(query.localeProjection),
+			storeProjection: queryParamsValue(query.storeProjection),
+			priceChannel: queryParamsValue(query.priceChannel),
+			priceCountry: queryParamsValue(query.priceCountry),
+			priceCurrency: queryParamsValue(query.priceCurrency),
+			priceCustomerGroup: queryParamsValue(query.priceCustomerGroup),
+			offset: query.offset ? Number(queryParamsValue(query.offset)) : undefined,
+			limit: query.limit ? Number(queryParamsValue(query.limit)) : undefined,
+		}
 		const resource = this.repository.search(
 			getRepositoryContext(request),
-			request.query
+			searchParams
 		)
 		return response.status(200).send(resource)
 	}