@labdigital/commercetools-mock 0.6.0 → 0.6.1

package/dist/repositories/cart.d.ts

@@ -17,5 +17,5 @@ export declare class CartRepository extends AbstractResourceRepository {
         setLocale: (projectKey: string, resource: Writable<Cart>, { locale }: CartSetLocaleAction) => void;
         setShippingAddress: (projectKey: string, resource: Writable<Cart>, { address }: CartSetShippingAddressAction) => void;
     };
-    draftLineItemtoLineItem: (projectKey: string, draftLineItem: LineItemDraft) => LineItem;
+    draftLineItemtoLineItem: (projectKey: string, draftLineItem: LineItemDraft, currency: string, country: string | undefined) => LineItem;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/repositories/cart.ts

@@ -14,6 +14,7 @@ import {
   GeneralError,
   LineItem,
   LineItemDraft,
+  Price,
   Product,
   ProductPagedQueryResponse,
   ProductVariant,
@@ -32,14 +33,20 @@ export class CartRepository extends AbstractResourceRepository {
   }
 
   create(projectKey: string, draft: CartDraft): Cart {
-    const lineItems = draft.lineItems?.map(draftLineItem =>
-      this.draftLineItemtoLineItem(projectKey, draftLineItem)
-    )
+    const lineItems =
+      draft.lineItems?.map(draftLineItem =>
+        this.draftLineItemtoLineItem(
+          projectKey,
+          draftLineItem,
+          draft.currency,
+          draft.country
+        )
+      ) ?? []
 
     const resource: Cart = {
       ...getBaseResourceProperties(),
       cartState: 'Active',
-      lineItems: lineItems ?? [],
+      lineItems,
       customLineItems: [],
       totalPrice: {
         type: 'centPrecision',
@@ -47,11 +54,13 @@ export class CartRepository extends AbstractResourceRepository {
         currencyCode: draft.currency,
         fractionDigits: 0,
       },
-      taxMode: 'Platform',
-      taxRoundingMode: 'HalfEven',
-      taxCalculationMode: 'LineItemLevel',
+      taxMode: draft.taxMode ?? 'Platform',
+      taxRoundingMode: draft.taxRoundingMode ?? 'HalfEven',
+      taxCalculationMode: draft.taxCalculationMode ?? 'LineItemLevel',
       refusedGifts: [],
-      origin: 'Customer',
+      locale: draft.locale,
+      country: draft.country,
+      origin: draft.origin ?? 'Customer',
       custom: createCustomFields(draft.custom, projectKey, this._storage),
     }
 
@@ -150,7 +159,18 @@ export class CartRepository extends AbstractResourceRepository {
           })
         }
 
-        const price = variant.prices[0]
+        const currency = resource.totalPrice.currencyCode
+
+        const price = selectPrice({
+          prices: variant.prices,
+          currency,
+          country: resource.country,
+        })
+        if (!price) {
+          throw new Error(
+            `No valid price found for ${productId} for country ${resource.country} and currency ${currency}`
+          )
+        }
         resource.lineItems.push({
           id: uuidv4(),
           productId: product.id,
@@ -302,13 +322,12 @@ export class CartRepository extends AbstractResourceRepository {
   }
   draftLineItemtoLineItem = (
     projectKey: string,
-    draftLineItem: LineItemDraft
+    draftLineItem: LineItemDraft,
+    currency: string,
+    country: string | undefined
   ): LineItem => {
-    const { productId, quantity } = draftLineItem
-    // @ts-ignore
-    let variantId = draftLineItem.variant.id
-    // @ts-ignore
-    let sku = draftLineItem.variant.sku
+    const { productId, quantity, variantId, sku } = draftLineItem
+
     let product: Product | null = null
     let variant: ProductVariant | undefined
 
@@ -357,12 +376,13 @@ export class CartRepository extends AbstractResourceRepository {
       )
     }
 
-    const price = variant.prices?.[0]
-
     const quant = quantity ?? 1
 
+    const price = selectPrice({ prices: variant.prices, currency, country })
     if (!price) {
-      throw new Error(`Price not set on ${productId}`)
+      throw new Error(
+        `No valid price found for ${productId} for country ${country} and currency ${currency}`
+      )
     }
 
     return {
@@ -387,6 +407,29 @@ export class CartRepository extends AbstractResourceRepository {
   }
 }
 
+const selectPrice = ({
+  prices,
+  currency,
+  country,
+}: {
+  prices: Price[] | undefined
+  currency: string
+  country: string | undefined
+}) => {
+  if (!prices) {
+    return undefined
+  }
+
+  // Quick-and-dirty way of selecting price based on the given currency and country.
+  // Can be improved later to give more priority to exact matches over
+  // 'all country' matches, and include customer groups in the mix as well
+  return prices.find(price => {
+    const countryMatch = !price.country || price.country === country
+    const currencyMatch = price.value.currencyCode === currency
+    return countryMatch && currencyMatch
+  })
+}
+
 const calculateLineItemTotalPrice = (lineItem: LineItem): number =>
   lineItem.price!.value.centAmount * lineItem.quantity
 

package/src/services/cart.test.ts

@@ -76,9 +76,20 @@ describe('Carts Query', () => {
   })
 })
 
-describe('Order Update Actions', () => {
+describe('Cart Update Actions', () => {
   const ctMock = new CommercetoolsMock()
   let cart: Cart | undefined
+
+  const createCart = async (currency: string) => {
+    let response = await supertest(ctMock.app)
+      .post('/dummy/carts')
+      .send({
+        currency,
+      })
+    expect(response.status).toBe(201)
+    cart = response.body
+  }
+
   const productDraft: ProductDraft = {
     name: {
       'nl-NL': 'test product',
@@ -98,6 +109,14 @@ describe('Order Update Actions', () => {
             fractionDigits: 2,
           } as CentPrecisionMoney,
         },
+        {
+          value: {
+            type: 'centPrecision',
+            currencyCode: 'GBP',
+            centAmount: 18900,
+            fractionDigits: 2,
+          } as CentPrecisionMoney,
+        },
       ],
 
       attributes: [
@@ -135,13 +154,7 @@ describe('Order Update Actions', () => {
   }
 
   beforeEach(async () => {
-    let response = await supertest(ctMock.app)
-      .post('/dummy/carts')
-      .send({
-        currency: 'EUR',
-      })
-    expect(response.status).toBe(201)
-    cart = response.body
+    await createCart('EUR')
   })
 
   afterEach(() => {
@@ -220,6 +233,33 @@ describe('Order Update Actions', () => {
     expect(response.body.totalPrice.centAmount).toEqual(29800)
   })
 
+  test.each([
+    ['EUR', 29800],
+    ['GBP', 37800],
+  ])('addLineItem with price selection', async (currency, total) => {
+    await createCart(currency)
+
+    const product = await supertest(ctMock.app)
+      .post(`/dummy/products`)
+      .send(productDraft)
+      .then(x => x.body)
+
+    assert(cart, 'cart not created')
+    assert(product, 'product not created')
+
+    const response = await supertest(ctMock.app)
+      .post(`/dummy/carts/${cart.id}`)
+      .send({
+        version: 1,
+        actions: [{ action: 'addLineItem', sku: '1337', quantity: 2 }],
+      })
+    expect(response.status).toBe(200)
+    expect(response.body.version).toBe(2)
+    expect(response.body.lineItems).toHaveLength(1)
+    expect(response.body.lineItems[0].price.value.currencyCode).toBe(currency)
+    expect(response.body.totalPrice.centAmount).toEqual(total)
+  })
+
   test('addLineItem unknown product', async () => {
     assert(cart, 'cart not created')
 

package/src/services/cart.ts

@@ -2,7 +2,7 @@ import AbstractService from './abstract'
 import { Router } from 'express'
 import { CartRepository } from '../repositories/cart'
 import { AbstractStorage } from '../storage'
-import { Cart, Order } from '@commercetools/platform-sdk'
+import { Cart, CartDraft, Order } from '@commercetools/platform-sdk'
 import { OrderRepository } from '../repositories/order'
 
 export class CartService extends AbstractService {
@@ -37,11 +37,23 @@ export class CartService extends AbstractService {
         return response.status(400).send()
       }
 
-      const newCart = this.repository.create(request.params.projectKey, {
+      const cartDraft: CartDraft = {
         ...cartOrOrder,
         currency: cartOrOrder.totalPrice.currencyCode,
         discountCodes: [],
-      })
+        lineItems: cartOrOrder.lineItems.map(lineItem => {
+          return {
+            ...lineItem,
+            variantId: lineItem.variant.id,
+            sku: lineItem.variant.sku,
+          }
+        }),
+      }
+
+      const newCart = this.repository.create(
+        request.params.projectKey,
+        cartDraft
+      )
 
       return response.status(200).send(newCart)
     })