@nuskin/ns-product-lib 2.20.0-td-1000.2 → 2.20.1-pa-163.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.20.0-td-1000.2",
+  "version": "2.20.1-pa-163.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -19,11 +19,11 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/blob/master/README.md",
   "devDependencies": {
-    "@nuskin/configuration-sdk": "3.0.0",
+    "@nuskin/configuration-sdk": "3.0.1",
     "@nuskin/ns-common-lib": "1.4.8",
     "@nuskin/ns-util": "4.7.2",
-    "@nuskin/product-lib": "2.4.0-td-1000.2",
-    "axios": "1.8.3",
+    "@nuskin/product-lib": "2.4.1",
+    "axios": "1.11.0",
     "axios-mock-adapter": "1.21.2",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
@@ -39,7 +39,7 @@
     "@nuskin/configuration-sdk": "3.x",
     "@nuskin/ns-common-lib": "1.x",
     "@nuskin/ns-util": "4.x",
-    "axios": "1.8.3"
+    "axios": "1.11.0"
   },
   "dependencies": {
     "qs": "6.11.0"

package/src/graph-ql/product.js

@@ -2,6 +2,7 @@ const ProductStatus = require("../models/productStatus");
 const CustomerTypes = require('./customerTypes');
 const Product = require("../product");
 const {productLib} = require('@nuskin/product-lib');
+const {getConfiguration} = require('@nuskin/configuration-sdk')
 
 /**
  * Get product by ID
@@ -31,7 +32,7 @@ async function getProduct(id, market, locale, config) {
     if (data && data.data) {
       //use to get default variant based on requested sku
       config.sku = id;
-      const product = mapProduct(data.data, market, locale, config);
+      const product = await mapProduct(data.data, market, locale, config);
       productData.products.push(new Product(product));
       productData.count = productData.products.length;
     }
@@ -72,18 +73,18 @@ async function getProducts(ids, market, locale, config) {
 
   try {
     const data = await productLib.getProductsById(
-      ids, market, locale, 
-      null, 1, okta, 
+      ids, market, locale,
+      null, 1, okta,
       config.graphqlUrl.includes('test') ? 'test' : config.graphqlUrl.includes('dev') ? 'dev' : 'prod'
     );
     if (data && data.products) {
       const mappedProducts = mapSkusToProducts(ids,data.products);
       //use to get default variant based on requested sku
-      mappedProducts.forEach(({sku , product})=>{
+      for (const {sku, product} of mappedProducts) {
         config.sku = sku;
-        const newProduct = mapProduct(product, market, locale, config);
+        const newProduct = await mapProduct(product, market, locale, config);
         productsData.products.push(new Product(newProduct));
-      });
+      }
       productsData.count = productsData.products.length;
     }
   } catch (e) {
@@ -236,6 +237,33 @@ function mapPricingJson(productDetail, kitOrVariant, isContentStack) {
   }
 }
 
+async function getSkuMaxQuantity(sku, defMaxQuantity, availableQuantity) {
+  const {Basic: basicCfg} = await getConfiguration(['Basic'])
+  let configMaxes
+  let maxQuantity = defMaxQuantity;
+
+  try {
+    configMaxes = basicCfg.skuMaxQty
+      .map((cm) => JSON.parse(cm))
+      .reduce((map, cmItem) => {
+        map[cmItem.sku] = cmItem.maxQty;
+        return map;
+      }, {});
+  } catch (err) {
+    console.log('Error parsing skuMaxQty from config', err);
+    configMaxes = {};
+  }
+  if (configMaxes && Object.keys(configMaxes).length > 0) {
+    if (Object.hasOwn(configMaxes, sku)) {
+      if (configMaxes[sku] < availableQuantity) {
+        maxQuantity = configMaxes[sku];
+      }
+    }
+  }
+  return maxQuantity;
+}
+
+
 /**
  *
  * Map product data to be product card consumable structure *
@@ -246,9 +274,9 @@ function mapPricingJson(productDetail, kitOrVariant, isContentStack) {
  * @returns {object} Product
  */
 // eslint-disable-next-line no-unused-vars
-function mapProduct(product, market, locale, config) {
+async function mapProduct(product, market, locale, config) {
   const kitBundleProducts = product.bundle;
-  
+
   //serves as parent
   const defaultVariant = !kitBundleProducts ? product.variants.find(v => v.sku === config.sku) : null
   const kitOrVariant = !kitBundleProducts ? defaultVariant : kitBundleProducts
@@ -258,9 +286,11 @@ function mapProduct(product, market, locale, config) {
   const points = kitOrVariant.points
   const isBackOrdered = kitOrVariant.status.inventory === 'backordered'
   const promoData = mapPromos(kitOrVariant)
+  const availableQuantity = isBackOrdered ? kitOrVariant.backorderQuantity : kitOrVariant.atpQuantity
+  const sku = !kitBundleProducts ? defaultVariant.sku : product.id
 
   const productDetail = {
-    "sku": !kitBundleProducts ? defaultVariant.sku : product.id,
+    "sku": sku,
     "globalProductID": productOrVariant.globalId && productOrVariant.globalId !== productOrVariant.sku ? productOrVariant.globalId : productOrVariant.id,
     "title": productOrVariant.title,
     "country": market,
@@ -274,8 +304,8 @@ function mapProduct(product, market, locale, config) {
     "benefits": productOrVariant.benefits,
     "usage": productOrVariant.usage,
     "resources": productOrVariant.resources,
-    "availableQuantity": isBackOrdered ? kitOrVariant.backorderQuantity : kitOrVariant.atpQuantity,
-    "maxQuantity": kitOrVariant.maxQuantity,
+    "availableQuantity": availableQuantity,
+    "maxQuantity": await getSkuMaxQuantity(sku, kitOrVariant.maxQuantity, availableQuantity),
     "points": "",
     "cv": points && points.wholesale ? points.wholesale.cv : 0,
     "pv": points && points.wholesale ? points.wholesale.pv : 0,
@@ -337,7 +367,7 @@ function mapProduct(product, market, locale, config) {
 
   //map only if it is normal product
   if (product.variants && !kitBundleProducts) {
-    productDetail.variants = mapVariants(product, isContentStack);
+    productDetail.variants = await mapVariants(product, isContentStack);
   }
 
   if (kitBundleProducts) {
@@ -365,7 +395,7 @@ function mapProduct(product, market, locale, config) {
  * @param {boolean} isContentStack
  * @returns {Array<object>}  productVariants
  */
-function mapVariants(product, isContentStack) {
+async function mapVariants(product, isContentStack) {
 
   //return if it  has no variant
   if (!product.variants || (product.variants && product.variants.length === 1)) {
@@ -374,7 +404,7 @@ function mapVariants(product, isContentStack) {
 
   const variants = [];
 
-  product.variants.forEach(variant => {
+  for (const variant of product.variants) {
     const sku = variant.sku || variant.id;
 
     const productImages = mapProductImages(variant);
@@ -397,7 +427,7 @@ function mapVariants(product, isContentStack) {
       "usage": variant.usage,
       "resources": variant.resoruces,
       "availableQuantity": variant.availableQuantity,
-      "maxQuantity": variant.maxQuantity,
+      "maxQuantity": await getSkuMaxQuantity(sku, variant.maxQuantity, variant.availableQuantity),
       "points": "",
       "cv": points && points.wholesale ? points.wholesale.cv : 0,
       "pv": points && points.wholesale ? points.wholesale.pv : 0,
@@ -455,7 +485,7 @@ function mapVariants(product, isContentStack) {
       }
     }
     mapPricingJson(variants[sku], variant, isContentStack)
-  });
+  }
 
   return variants;
 }

package/src/productData.js

@@ -75,7 +75,7 @@ const ProductData = {
     const filter = skuFilter.join(" OR ")
 
     let url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    if (config.API_Base_URLs && config.API_Base_URLs.indexOf('apis') > -1) {
+    if (config.API_Base_URLs && config.API_Base_URLs.endsWith('/storefront')) {
       url = `${config.API_Base_URLs}/catalogs/search/`;
     }
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;