@nuskin/ns-product-lib 2.17.0-cx24-5822.6 → 2.17.0-cx24-5822.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.17.0-cx24-5822.6",
+  "version": "2.17.0-cx24-5822.8",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/graph-ql/product.js

@@ -107,7 +107,7 @@ async function getProducts(ids, market, locale, config) {
     variables: {
       ids,
       market,
-      locale,
+      language: locale,
       ...(okta !== null && { okta }),
       quantity: 1 // set default to 1
     }
@@ -115,22 +115,14 @@ async function getProducts(ids, market, locale, config) {
 
   try {
     const { data } = await graphQlHttpRequest(payload, config);
-
-    if (data && data.data &&
-       data.data.productsById && 
-       data.data.productsById.products && 
-       data.data.productsById.products.length) {
-      
-      //use to get default variant based on requested sku
-      productsData.products = data.data.productsById.products.map((product,index)=>{
-        config.sku = ids[index];
-        const newProduct = mapProduct(product, market, locale, config);
-        return new Product(newProduct);
-      })
-
-      productsData.count = productsData.products.length;
-    }
-
+    const mappedProducts = mapSkusToProducts(ids,data);
+    //use to get default variant based on requested sku
+    mappedProducts.forEach(({sku , product})=>{
+      config.sku = sku;
+      const newProduct = mapProduct(product, market, locale, config);
+      productsData.products.push(new Product(newProduct));
+    });
+    productsData.count = productsData.products.length;
   } catch (e) {
     console.log(`Unable to fetch products details for SKUs ${ids}`);
   }
@@ -145,6 +137,40 @@ async function getProducts(ids, market, locale, config) {
 }
 
 
+/**
+ * Map skus array to products array
+ * @param {string[]} skus
+ * @param {any} products
+ */
+
+function mapSkusToProducts(skus , products){
+  const productsData = [];
+  if (products && 
+      products.data && 
+      products.data.productsById && 
+      products.data.productsById.products &&
+      products.data.productsById.products.length) {
+    skus.forEach((sku)=>{
+      const matchedProducts = products.data.productsById.products.filter((product)=>{
+        let matched = false;
+        if(product.id) {matched = product.id === sku;}
+        if(product.variants.length){
+          product.variants.forEach((variant)=>{
+            matched |=  variant.sku === sku; 
+          });
+        }
+        return matched;
+      });
+      if(matchedProducts.length > 0){
+        productsData.push({ sku: sku , product: matchedProducts[0]});
+      }
+    })
+  }
+  return productsData;
+
+}
+
+
 /**
  * Map product prices
  * @param {*} product