MWPW-164094 Fix algorithm for calculation of PUF optical

adobecom · Dec 12, 2024 · b9758cf · b9758cf
1 parent 28dc5d2
commit b9758cf
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 177 deletions.
diff --git a/libs/deps/mas/commerce.js b/libs/deps/mas/commerce.js
diff --git a/libs/deps/mas/mas.js b/libs/deps/mas/mas.js
diff --git a/libs/features/mas/dist/mas.js b/libs/features/mas/dist/mas.js
diff --git a/libs/features/mas/src/price/utilities.js b/libs/features/mas/src/price/utilities.js
@@ -29,14 +29,6 @@ const opticalPriceDivisors = {
     [Term.TWO_YEARS]: 24,
 };
 
-/**
- * Special per-currency handling rules for optical prices.
- * @type { { [currencyCode: string]: (opticalPrice: number) => number } }
- */
-const opticalPriceCurrencyRules = {
-    CHF: (opticalPrice) => Math.round(opticalPrice * 20) / 20,
-};
-
 /**
  * Creates and returns a rule for rounding optical prices based on price characteristics.
  * @param { ({ price: number, divisor: number, usePrecision: boolean }) => boolean } accept
@@ -59,8 +51,7 @@ const opticalPriceRoundingRules = [
     opticalPriceRoundingRule(
         // round optical price up to 2 decimals
         ({ usePrecision }) => usePrecision,
-        ({ divisor, price }) =>
-            Math.ceil(Math.floor((price * 10000) / divisor) / 100) / 100
+      ({ divisor, price }) => Math.round((price / divisor) * 100.0) / 100.0
     ),
     opticalPriceRoundingRule(
         // round optical price up to integer
@@ -235,7 +226,7 @@ const formatOpticalPrice = (data) => {
         divisor > 1
             ? RecurrenceTerm.MONTH
             : recurrenceTerms[commitment]?.[term],
-        (price, { currencySymbol }) => {
+        (price) => {
             const priceData = {
                 divisor,
                 price,
@@ -248,9 +239,7 @@ const formatOpticalPrice = (data) => {
                 throw new Error(
                     `Missing rounding rule for: ${JSON.stringify(priceData)}`
                 );
-            const adapt =
-                opticalPriceCurrencyRules[currencySymbol] ?? ((value) => value);
-            return adapt(round(priceData));
+            return round(priceData);
         }
     );
 };

diff --git a/libs/features/mas/test/price/__snapshots__/index.test.js.snap b/libs/features/mas/test/price/__snapshots__/index.test.js.snap
diff --git a/libs/features/mas/test/price/utilities.test.js b/libs/features/mas/test/price/utilities.test.js
@@ -31,12 +31,12 @@ const OPTICAL_TEST_CASES = [
             usePrecision: true,
         },
         [
-            [23.7, 'CHF2.00'],
-            [24.991, 'CHF2.10'],
-            [24.77, 'CHF2.05'],
-            [24.8899, 'CHF2.10'],
-            [12000.24321, 'CHF1000.05'],
-            [12000.489, 'CHF1000.05'],
+            [23.7, 'CHF1.98'],
+            [24.991, 'CHF2.08'],
+            [24.77, 'CHF2.06'],
+            [24.8899, 'CHF2.07'],
+            [12000.24321, 'CHF1000.02'],
+            [12000.489, 'CHF1000.04'],
         ],
     ],
     [
@@ -48,9 +48,9 @@ const OPTICAL_TEST_CASES = [
         },
         [
             [23.7, 'EUR1.98'],
-            [24.99, 'EUR2.09'],
-            [24.77, 'EUR2.07'],
-            [24.88, 'EUR2.08'],
+            [24.99, 'EUR2.08'],
+            [24.77, 'EUR2.06'],
+            [24.88, 'EUR2.07'],
             [12000.24, 'EUR1000.02'],
             [12000.48, 'EUR1000.04'],
         ],
@@ -64,9 +64,9 @@ const OPTICAL_TEST_CASES = [
         },
         [
             [23.7, 'US$1.98'],
-            [24.99, 'US$2.09'],
-            [24.77, 'US$2.07'],
-            [24.88, 'US$2.08'],
+            [24.99, 'US$2.08'],
+            [24.77, 'US$2.06'],
+            [24.88, 'US$2.07'],
             [820.2, 'US$68.35'],
             [12000.24, 'US$1000.02'],
             [12000.48, 'US$1000.04'],
@@ -81,11 +81,11 @@ const OPTICAL_TEST_CASES = [
         },
         [
             [23.7, 'CHF 23.70'],
-            [24.99, 'CHF 25.00'],
-            [24.77, 'CHF 24.75'],
-            [24.88, 'CHF 24.90'],
-            [1200.24, 'CHF 1,200.25'],
-            [1200.48, 'CHF 1,200.50'],
+            [24.99, 'CHF 24.99'],
+            [24.77, 'CHF 24.77'],
+            [24.88, 'CHF 24.88'],
+            [1200.24, 'CHF 1,200.24'],
+            [1200.48, 'CHF 1,200.48'],
         ],
     ],
     [
@@ -190,7 +190,7 @@ const OPTICAL_TEST_CASES = [
             usePrecision: true,
             isIndianPrice: true,
         },
-        [[40600000, '&#8377;33,83,333.34']],
+        [[40600000, '&#8377;33,83,333.33']],
     ],
 ];