Adjust catalogPrice calculation and fix integration tests

Author: Mikearaya

packages/core-products/src/module/configureProductPrices.ts

@@ -62,25 +62,21 @@ export const configureProductPricesModule = ({
       quantity = 1,
     }: { countryCode: string; currencyCode?: string; quantity?: number },
   ): Promise<ProductPrice | null> => {
-    const pricing = getPriceLevels({
-      product,
-      currencyCode,
-      countryCode,
-    });
+    const pricing = getPriceLevels({ product, currencyCode, countryCode });
+    if (!pricing.length) return null;
 
-    const foundPrice = pricing.find((level) => !level.minQuantity || level.minQuantity >= quantity);
-    if (!foundPrice) return null;
+    // Filter tiers that match the quantity, take the last because pricing is sorted
+    const matched = pricing.filter((level) => (level.minQuantity ?? 0) <= quantity).pop();
 
-    const normalizedPrice = {
-      isTaxable: false,
-      isNetPrice: false,
-      ...foundPrice,
-    };
+    if (!matched) return null;
 
-    if (normalizedPrice.amount !== null) {
-      return normalizedPrice;
-    }
-    return null;
+    return {
+      isTaxable: !!matched.isTaxable,
+      isNetPrice: !!matched.isNetPrice,
+      amount: matched.amount,
+      currencyCode: matched.currencyCode,
+      countryCode: matched.countryCode,
+    };
   };
 
   return {

tests/cart-products.test.js

@@ -323,7 +323,7 @@ test.describe('Cart: Product Items', () => {
                   product {
                     _id
                     ... on SimpleProduct {
-                      simulatedPrice(quantity: 4) {
+                      simulatedPrice {
                         isTaxable
                         isNetPrice
                         amount
@@ -352,12 +352,11 @@ test.describe('Cart: Product Items', () => {
         `,
         variables: {
           productId: LeveledPricingProduct._id,
-          quantity: 1,
         },
       });
       assert.partialDeepStrictEqual(defaultTierPrice?.order.items[0], {
         quantity: 4,
-        total: { amount: 40000, currencyCode: 'CHF' },
+        total: { amount: 8000, currencyCode: 'CHF' },
         product: {
           _id: 'leveled-pricing-product',
           simulatedPrice: {

tests/product-commerce.test.js

@@ -69,6 +69,13 @@ test.describe('Product: Commerce', async () => {
           productId: SimpleProduct._id,
           commerce: {
             pricing: [
+              {
+                amount: 1000,
+                isTaxable: true,
+                isNetPrice: false,
+                currencyCode: 'CHF',
+                countryCode: 'CH',
+              },
               {
                 amount: 100,
                 minQuantity: 50,
@@ -85,7 +92,7 @@ test.describe('Product: Commerce', async () => {
       assert.partialDeepStrictEqual(updateProductCommerce, {
         _id: SimpleProduct._id,
         catalogPrice: {
-          amount: 100,
+          amount: 1000,
           isTaxable: true,
           isNetPrice: false,
           currencyCode: 'CHF',

tests/products.test.js

@@ -1863,7 +1863,7 @@ test.describe('Products', () => {
         maxPrice: {
           isTaxable: true,
           isNetPrice: false,
-          amount: 2000000,
+          amount: 10000000,
           currencyCode: 'CHF',
         },
       });
@@ -1956,13 +1956,13 @@ test.describe('Products', () => {
         minPrice: {
           isTaxable: true,
           isNetPrice: false,
-          amount: 500000,
+          amount: 2000000,
           currencyCode: 'CHF',
         },
         maxPrice: {
           isTaxable: true,
           isNetPrice: false,
-          amount: 30000000,
+          amount: 2000000,
           currencyCode: 'CHF',
         },
       });
@@ -2010,7 +2010,7 @@ test.describe('Products', () => {
         maxPrice: {
           isTaxable: true,
           isNetPrice: false,
-          amount: 2000000,
+          amount: 10000000,
           currencyCode: 'CHF',
         },
       });

tests/seeds/products.js

@@ -66,7 +66,6 @@ export const LeveledPricingProduct = {
         isNetPrice: false,
         currencyCode: 'CHF',
         countryCode: 'CH',
-        minQuantity: 0,
       },
     ],
   },