@nuskin/ns-product-lib 2.7.0-cx24-337701.1 → 2.7.0-cx24-337705.1

package/CHANGELOG.md

@@ -1,125 +1,60 @@
-# [2.7.0-cx24-337701.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.15...v2.7.0-cx24-337701.1) (2023-03-22)
+# [2.7.0-cx24-337705.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-337703.1...v2.7.0-cx24-337705.1) (2023-03-23)
 
 
 ### Fix
 
-* Lint Errors after merge ([86f07a8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/86f07a8b27e5f772d364ec40c1c0014f534f0312))
+* Added override flag for equinox products ([d098245](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d098245007f453e33cae8fb574dad61fadfc1e5e))
+* Added override flag for equinox products ([2f4af3d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2f4af3d5f7fcfa14f23c9cd18eacfaaa9262e0a0))
 
-### Update
-
-* Merge CX24-3563 changes to CX24-337701 ([9daed9a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9daed9a062d42b0de11fcc0a56d65f37cfd6ec17))
-
-## [2.6.1-cx24-337701.15](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.14...v2.6.1-cx24-337701.15) (2023-03-21)
-
-
-### Fix
-
-* Show dropdown for variants ([8edac62](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8edac62b88fe058fe232e9c8c9da557351c10338))
-
-## [2.6.1-cx24-337701.14](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.13...v2.6.1-cx24-337701.14) (2023-03-21)
-
-
-### Fix
-
-* Show dropdown for variants ([cf5e6a6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/cf5e6a600008465d32b0d77ed46f8518802f4295))
-* Show dropdown for variants ([8c29f14](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8c29f14e20e9f674c8942274607abd1dd4f82964))
-
-## [2.6.1-cx24-337701.13](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.12...v2.6.1-cx24-337701.13) (2023-03-20)
-
-
-### Fix
-
-* multi variant drop down ([4c61780](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c617806a2934b1aca7b5280810107cf0356b29b))
-
-## [2.6.1-cx24-337701.12](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.11...v2.6.1-cx24-337701.12) (2023-03-20)
-
-
-### Fix
-
-* The variant drop down label ([235a252](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/235a252cd59a94704400743e51d043d2ca2b9074))
-* The variant drop down label ([e43614e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e43614ece7f3bb7d8c0d12743ab02b90427cbbb9))
-
-## [2.6.1-cx24-337701.11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.10...v2.6.1-cx24-337701.11) (2023-03-20)
+# [2.7.0-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2-cx24-337703.1...v2.7.0-cx24-337703.1) (2023-03-22)
 
 
-### Fix
-
-* The variant drop down label ([de58922](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/de589221aee054cbfb765117a44cd2fca4575468))
-
-## [2.6.1-cx24-337701.10](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.9...v2.6.1-cx24-337701.10) (2023-03-20)
-
-
-### Fix
-
-* The variant drop down label ([a93900f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a93900f43e880b52383ea22df8d496f97be21535))
-* The variant drop down label ([20bc315](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/20bc315ba14213d5e18101c9016d3d07da14843a))
-* The variant drop down label ([8bb8f1c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8bb8f1c11626645d2cd4ca1a4db29f75b99dff7b))
-
-## [2.6.1-cx24-337701.9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.8...v2.6.1-cx24-337701.9) (2023-03-20)
-
-
-### Fix
-
-* The variant drop down label ([a35121b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a35121b96fb7d0e62119e4bebea9d513cd2e8814))
-
-## [2.6.1-cx24-337701.8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.7...v2.6.1-cx24-337701.8) (2023-03-20)
-
-
-### Fix
-
-* The variant drop down label ([226e964](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/226e96475b26ef4eda94ac63028285f27c9a81ba))
-
-## [2.6.1-cx24-337701.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.6...v2.6.1-cx24-337701.7) (2023-03-20)
-
-
-### Fix
+### Update
 
-* The variant drop down label ([0406e11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0406e11e1fa9aa71313b80fae06c9e8bd8d406d8))
+* Merge CX24-3563 changes to CX24-337703 ([9e6ca40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e6ca40c35252c24394351275a234e9847f70bfc))
 
-## [2.6.1-cx24-337701.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.5...v2.6.1-cx24-337701.6) (2023-03-20)
+## [2.6.2-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2-cx24-337703.1) (2023-03-22)
 
 
 ### Fix
 
-* The variant drop down label ([738b2a4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/738b2a41ab2fc2900529234b3fa860f9102fc36d))
-* The variant drop down label ([58af789](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/58af78921e2eff83beffd6b5665aff6d60bbb21b))
+* Show dropdown for variants ([85cdf69](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/85cdf69cc2bbf6700ec5c9bcacc7222cf2ddf674))
 
-## [2.6.1-cx24-337701.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.4...v2.6.1-cx24-337701.5) (2023-03-19)
+## [2.6.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1) (2023-03-16)
 
 
 ### Fix
 
-* The variant drop down label ([2e175c1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2e175c12f24b789f913e64fff5e26b3257ccd087))
+* (equinox-enabled) skip product mapping when an error occurs in PLP #CX24-3607 ([454eaf3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/454eaf3b899e27f1feaeda383553eb13dcb8b205)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
 
-## [2.6.1-cx24-337701.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.3...v2.6.1-cx24-337701.4) (2023-03-19)
+## [2.6.1-cx24-3607.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.3...v2.6.1-cx24-3607.4) (2023-03-16)
 
 
 ### Fix
 
-* The variant drop down label ([71faac8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/71faac8db3a4a03d1addcda266b21616c5b0f044))
+* The variant drop down label ([3e6b9f5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3e6b9f5e422b71c3e5f73d5a62f0491343ed7afb))
 
-## [2.6.1-cx24-337701.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.2...v2.6.1-cx24-337701.3) (2023-03-19)
+## [2.6.1-cx24-3607.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.2...v2.6.1-cx24-3607.3) (2023-03-16)
 
 
 ### Fix
 
-* The variant drop down label ([707ddb3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/707ddb37391363059c86460e5da575b78409e250))
+* check for imageURL ([5d56bae](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5d56baeb4c148cc667cc3c9321fb72e87216c921))
 
-## [2.6.1-cx24-337701.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.1...v2.6.1-cx24-337701.2) (2023-03-19)
+## [2.6.1-cx24-3607.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.1...v2.6.1-cx24-3607.2) (2023-03-16)
 
 
 ### Fix
 
-* The variant drop down label ([973f145](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/973f1455a91127d575a8fc7d26e7e78d05f1f0a4))
+* (equinox-enabled) skip product mapping when an error occurs in PLP #CX24-3607 ([49fa749](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/49fa7499b390aa84cc887fc631037363421d252a)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
 
-## [2.6.1-cx24-337701.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1-cx24-337701.1) (2023-03-19)
+## [2.6.1-cx24-3607.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1-cx24-3607.1) (2023-03-15)
 
 
 ### Fix
 
-* The variant drop down label ([bd60148](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bd60148d1a50e895d36139932740fe4ee7f9f50a))
-* The variant drop down label ([749b476](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/749b47605995405886460b29f20411a21e45fb68))
-* The variant drop down label ([bc555ab](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bc555abec97bca95fc0ba18a0eb4f0a0c9cd537a))
+* (equinox-enabled) skip product mapping when an error occurs in PLP #CX24-3607 ([950c165](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/950c1650115f92badc5b898b5df722568b034afe)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
+* Cannot read properties of undefined (reading 'qty') in PLP #CX24-3607 ([8cde88f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8cde88f2f61279d20794a0e43696187c4326ca28)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
 
 # [2.6.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.2...v2.6.0) (2023-03-13)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.7.0-cx24-337701.1",
+  "version": "2.7.0-cx24-337705.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "4.2.5",
+    "@nuskin/ns-util": "4.2.7",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/equinox-helpers/childSKU.js

@@ -0,0 +1,31 @@
+/**
+ * childSKU maps a product variant. Used mainly in subscription.
+ *
+ * @param {import('.').KitSKUQuantity[]} kits 
+ * @param {import('.').EquinoxProduct} product 
+ */
+function childSKU(kits, product) {
+  const sku = product.sku.filter(sku => sku.default)[0];
+  if (!sku) {
+    throw Error('Unable to find the default SKU.');
+  }
+
+  const kit = kits.filter(k => k.sku === sku.identifier)[0];
+  if (!kit) {
+    throw Error('SKU kit does not exist in the list of available variants.');
+  }
+
+  return {
+    productId: product.identifier,
+    skuId: sku.identifier,
+    type: 'MANDATORY',
+    skuQuantity: kit.qty,
+    availableChannels: sku.properties.availableChannels,
+    inventory: {
+      atpQty: sku.inventoryProperties.atpQty,
+      backOrdered: sku.inventoryProperties.backOrdered
+    }
+  }
+}
+
+module.exports = childSKU;

package/src/equinox-helpers/index.js

@@ -1,10 +1,11 @@
 /**
+ * @description This model represents the mapped values of a product
  * @typedef Product
  * @type {object}
- * @property {ChildSku[]} childSkus
+ * @property {ProductChildSku[]} childSkus
  * @property {Inventory} [inventoryProperties]
- * 
- * @typedef ChildSku
+ *
+ * @typedef ProductChildSku
  * @type {object}
  * @property {string} productId
  * @property {string} skuId
@@ -12,14 +13,52 @@
  * @property {number} skuQuantity
  * @property {string} availableChannels
  * @property {Inventory} [inventory]
+ *
+ * ---
+ *
+ * @description This model represents a product within an Equinox response.
+ * @typedef EquinoxProduct
+ * @type {object}
+ * @property {string} identifier
+ * @property {EquinoxProductSKU[]} sku
+ * @property {"kit"|"bundle"} [type]
+ *
+ * @typedef EquinoxProductSKU
+ * @type {object}
+ * @property {boolean} default
+ *  For multi-variant products, this indicates that this is the searched SKU
+ *  when using catalogs/search endpoint.
+ * @property {string} identifier
+ * @property {Inventory} inventoryProperties
+ * @property {EquinoxProductProperties} properties
+ *
+ * @typedef EquinoxProductProperties
+ * @type {object}
+ * @property {string} availableChannels
+ *
+ * ---
+ *
+ * Types common to Product model and Equinox Product model
  * 
  * @typedef Inventory
  * @type {object}
  * @property {number} atpQty
  * @property {boolean} backOrdered
+ *
+ * ---
+ *
+ * Standalone types. These are types not related to Product
+ * and Equinox Product models.
+ *
+ * @typedef KitSKUQuantity
+ * @type {object}
+ * @property {string} sku
+ * @property {number} qty
  */
 const availableQuantity = require('./availableQuantity');
+const childSKU = require('./childSKU');
 
 module.exports = {
-  mapAvailableQuantity: availableQuantity
+  mapAvailableQuantity: availableQuantity,
+  mapChildSKU: childSKU
 };

package/src/product.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { isTrue } = require("@nuskin/ns-common-lib");
+const { isTrue }  = require("@nuskin/ns-common-lib");
 
 const ProductUtils = require("./productUtils.js");
 
@@ -8,7 +8,7 @@ const Agelocme = require("./agelocme.js");
 const PriceType = require("./models/priceType.js");
 const ProductStatus = require("./models/productStatus.js");
 
-const Product = function (productData) {
+const Product = function(productData) {
   this.priceMap = {};
   this.pvMap = {};
   this.cvMap = {};
@@ -76,15 +76,14 @@ const Product = function (productData) {
   //@example "IN STOCK"
   this.inventory = "";
   this.equinoxProductId = "";
-  this.variantDefault = false;
 
-  this.setMarketAttributes = function (productStatus) {
+  this.setMarketAttributes = function(productStatus) {
     if (productStatus.marketAttributes) {
       this.marketAttributes = productStatus.marketAttributes;
     }
   };
 
-  this.getAgelocmeKeyPart = function () {
+  this.getAgelocmeKeyPart = function() {
     let keyPart = null;
     if (this.agelocme) {
       keyPart =
@@ -98,27 +97,27 @@ const Product = function (productData) {
     return keyPart;
   };
 
-  this.getHighlightedSku = function () {
+  this.getHighlightedSku = function() {
     let rv = this.sku;
     if (this.highlightedSku) rv = this.highlightedSku;
     return rv;
   };
 
-  this.getProductSearchTitle = function () {
+  this.getProductSearchTitle = function() {
     if (this.agelocme && this.agelocme.label) {
       return this.agelocme.label;
     }
     return this.title;
   };
 
-  this.getProductSearchSku = function () {
+  this.getProductSearchSku = function() {
     if (this.agelocme && this.agelocme.code) {
       return this.agelocme.code;
     }
     return this.getHighlightedSku();
   };
 
-  this.getDescription = function () {
+  this.getDescription = function() {
     let description = this.longDescr;
     if (!description || description.length === 0) {
       return this.shortDescr;
@@ -126,7 +125,7 @@ const Product = function (productData) {
     return description;
   };
 
-  this.setFullImage = function (fullImage) {
+  this.setFullImage = function(fullImage) {
     if (fullImage) {
       this.fullImage = fullImage.replace("http:", "https:");
     } else {
@@ -134,19 +133,19 @@ const Product = function (productData) {
     }
   };
 
-  this.getFullImage = function () {
+  this.getFullImage = function() {
     return this.fullImage ? this.fullImage.replace("http:", "https:") : "";
   };
 
-  this.setProductCarouselImages = function (productCarouselImages) {
+  this.setProductCarouselImages = function(productCarouselImages) {
     this.productCarouselImages = productCarouselImages;
   };
 
-  this.getProductCarouselImages = function () {
+  this.getProductCarouselImages = function() {
     return this.productCarouselImages;
   };
 
-  this.setImageAltText = function (altText) {
+  this.setImageAltText = function(altText) {
     if (altText) {
       this.imageAltText = altText;
     } else {
@@ -154,11 +153,11 @@ const Product = function (productData) {
     }
   };
 
-  this.getImageAltText = function () {
+  this.getImageAltText = function() {
     return this.imageAltText || this.title;
   };
 
-  this.setThumbnail = function (thumbnail) {
+  this.setThumbnail = function(thumbnail) {
     if (thumbnail) {
       this.thumbnail = thumbnail.replace("http:", "https:");
     } else {
@@ -166,7 +165,7 @@ const Product = function (productData) {
     }
   };
 
-  this.setThumbnailFromSku = function (sku) {
+  this.setThumbnailFromSku = function(sku) {
     // WARNING: Base URL will need to be handled in the client (call setBaseUrl)
     // eslint-disable-next-line max-len
     // this.thumbnail = `${RunConfigService.getBaseUrl()}/content/products/${ProductUtils.getTokenizedSku(sku)}/jcr:content/fullImage.img.100.100.png`;
@@ -176,43 +175,43 @@ const Product = function (productData) {
     )}/jcr:content/fullImage.img.100.100.png`;
   };
 
-  this.getThumbnail = function () {
+  this.getThumbnail = function() {
     return this.thumbnail ? this.thumbnail.replace("http:", "https:") : "";
   };
 
-  this.hasAvailableQuantity = function (qty = 1) {
+  this.hasAvailableQuantity = function(qty = 1) {
     return Math.min(this.maxQuantity, this.availableQuantity) >= qty;
   };
 
-  this.setPoints = function (points) {
+  this.setPoints = function(points) {
     this.points = ensureFloatVal(points) || "";
   };
 
-  this.getPointsFixed = function () {
+  this.getPointsFixed = function() {
     return parseFloat(this.points).toFixed(2);
   };
 
-  this.setCv = function (cv) {
+  this.setCv = function(cv) {
     this.cv = ensureFloatVal(cv) || "";
   };
 
-  this.getCvFixed = function () {
+  this.getCvFixed = function() {
     return parseFloat(this.cv).toFixed(2);
   };
 
-  this.setPv = function (pv) {
+  this.setPv = function(pv) {
     this.pv = ensureFloatVal(pv) || "";
   };
 
-  this.getPvFixed = function () {
+  this.getPvFixed = function() {
     return parseFloat(this.pv || 0).toFixed(2);
   };
 
-  this.setPrice = function (price) {
+  this.setPrice = function(price) {
     this.price = ensureFloatVal(price, true);
   };
 
-  this.setFormattedPrice = function (formattedPrice) {
+  this.setFormattedPrice = function(formattedPrice) {
     this.formattedPrice = formattedPrice;
   };
 
@@ -221,13 +220,13 @@ const Product = function (productData) {
    * added to the cart the event pricing needs to be remembered if toggling between
    * pricetypes with event pricing and pricetype without event pricing
    */
-  this.lockEventName = function () {
+  this.lockEventName = function() {
     if (!this.savedEventName && this.eventName) {
       this.savedEventName = this.eventName;
     }
   };
 
-  this.setPriceAndPvFromType = function (_priceType, _activeEvents = null, option = {}) {
+  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
     // WARNING: priceType needs to be handled client-side
     // const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
     //     ? PriceType.WWHL
@@ -272,11 +271,11 @@ const Product = function (productData) {
     return changed;
   };
 
-  this.getPrice = function () {
+  this.getPrice = function() {
     return this.price ? this.price : 0;
   };
 
-  this.getPriceFixed = function () {
+  this.getPriceFixed = function() {
     if (typeof this.price === "number") {
       return parseFloat(this.price.toFixed(2));
     } else {
@@ -284,15 +283,15 @@ const Product = function (productData) {
     }
   };
 
-  this.getOriginalPrice = function () {
+  this.getOriginalPrice = function() {
     return this.priceType ? this.priceMap[this.priceType] : null;
   };
 
-  this.addPricing = function (type, price) {
+  this.addPricing = function(type, price) {
     this.priceMap[type] = price;
   };
 
-  this.addPricingFromStatus = function (productStatus, priceType, option = {}) {
+  this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
     let modified = false;
 
     if (!priceType) {
@@ -326,10 +325,15 @@ const Product = function (productData) {
           return this.addCvWithType(csvKey, productStatus.csv[csvKey]);
         }, this);
       }
-      this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
-      if (productStatus.childSkus) {
-        this.childSkus = productStatus.childSkus;
+      
+      //dont override orderTypes and childSkus when product came from equinox
+      if(!this.equinoxProductId) {
+        this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
+        if(productStatus.childSkus) {
+          this.childSkus = productStatus.childSkus;
+        }
       }
+      
       this.setPriceAndPvFromType(priceType, null, option);
       modified = true;
     } else {
@@ -347,15 +351,15 @@ const Product = function (productData) {
     return modified;
   };
 
-  this.addPvWithType = function (type, pv) {
+  this.addPvWithType = function(type, pv) {
     this.pvMap[type] = pv;
   };
 
-  this.addCvWithType = function (type, cv) {
+  this.addCvWithType = function(type, cv) {
     this.cvMap[type] = cv;
   };
 
-  this.getPricing = function (type) {
+  this.getPricing = function(type) {
     let retVal = null;
 
     if (type) {
@@ -382,7 +386,7 @@ const Product = function (productData) {
     return eventPriceTypes;
   };
 
-  this.getPvWithType = function (type) {
+  this.getPvWithType = function(type) {
     let rv = this.pvMap[type];
     if (rv == null) {
       // Assumption: we always have WWHL from the service
@@ -392,7 +396,7 @@ const Product = function (productData) {
     return rv;
   };
 
-  this.getCvWithType = function (type) {
+  this.getCvWithType = function(type) {
     let rv = this.cvMap[type];
     if (rv == null) {
       rv = this.cvMap[PriceType.WWHL];
@@ -400,77 +404,77 @@ const Product = function (productData) {
     return rv;
   };
 
-  this.hasAdrOption = function () {
+  this.hasAdrOption = function() {
     return this.orderTypes["adr"];
   };
 
-  this.isAdrOnly = function () {
+  this.isAdrOnly = function() {
     return this.hasAdrOption() && !this.hasOrderOption();
   };
 
-  this.hasMultipleOrderTypes = function () {
+  this.hasMultipleOrderTypes = function() {
     return this.hasOrderOption() && this.hasAdrOption();
   };
 
-  this.hasOrderOption = function () {
+  this.hasOrderOption = function() {
     return this.orderTypes["order"];
   };
 
-  this.isDistributor = function () {
+  this.isDistributor = function() {
     return this.custTypes.includes("10");
   };
 
-  this.isCustomer = function () {
+  this.isCustomer = function() {
     return this.custTypes.includes("20");
   };
 
-  this.isPreferredCustomer = function () {
+  this.isPreferredCustomer = function() {
     return this.custTypes.includes("30");
   };
 
-  this.isBase = function () {
+  this.isBase = function() {
     return this.sku.substring(2, 4) === "55";
   };
 
-  this.isVariant = function () {
+  this.isVariant = function() {
     return this.baseSku.length > 0 && this.variantSkus().length === 0;
   };
 
-  this.setVariant = function (variantProduct) {
+  this.setVariant = function(variantProduct) {
     if (variantProduct && variantProduct.sku) {
       this.variants[variantProduct.sku] = variantProduct;
     }
   };
 
-  this.getVariant = function (sku) {
+  this.getVariant = function(sku) {
     return this.variants[sku];
   };
 
-  this.variantSkus = function () {
+  this.variantSkus = function() {
     return Object.keys(this.variants);
   };
 
-  this.getVariantsList = function () {
+  this.getVariantsList = function() {
     return Object.values(this.variants);
   };
 
-  this.getMinPrice = function () {
+  this.getMinPrice = function() {
     return this.priceMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPrice = function () {
+  this.getMaxPrice = function() {
     return this.priceMap[`max-${this.priceType}`];
   };
 
-  this.getMinPv = function () {
+  this.getMinPv = function() {
     return this.pvMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPv = function () {
+  this.getMaxPv = function() {
     return this.pvMap[`max-${this.priceType}`];
   };
 
-  this.toJSON = function () {
+  this.toJSON = function() {
     let retData = {};
     retData.sku = this.sku;
     retData.globalProductID = this.globalProductID;
@@ -539,11 +543,11 @@ const Product = function (productData) {
     return retData;
   };
 
-  this.setMeCommerceProductData = function (/*productData*/) {
+  this.setMeCommerceProductData = function(/*productData*/) {
     console.error("setMeCommerceProductData is deprecated!");
   };
 
-  this.setBaseUrl = function (baseUrl) {
+  this.setBaseUrl = function(baseUrl) {
     this.thumbnail = ProductUtils.applyBaseUrl(this.thumbnail, baseUrl);
     this.fullImage = ProductUtils.applyBaseUrl(this.fullImage, baseUrl);
 
@@ -555,7 +559,7 @@ const Product = function (productData) {
     }
   };
 
-  this.setProductData = function (productData) {
+  this.setProductData = function(productData) {
     let data;
 
     if (productData) {
@@ -663,7 +667,7 @@ const Product = function (productData) {
           ? data.pvMap
           : this.pvMap;
       this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, data.orderTypes);
-      if (data.childSkus) {
+      if(data.childSkus) {
         this.childSkus = data.childSkus;
       }
       this.custTypes = data.custTypes || [];
@@ -679,7 +683,7 @@ const Product = function (productData) {
     }
   };
 
-  this.isEmpty = function () {
+  this.isEmpty = function() {
     return (
       isFieldEmpty(this.sku) &&
       isFieldEmpty(this.title) &&

package/src/productData.js

@@ -5,7 +5,7 @@ const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
-const { mapAvailableQuantity } = require('./equinox-helpers');
+const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
 
 const productTypes = {
   kit: 'kit'
@@ -66,7 +66,6 @@ const ProductData = {
     }
 
     const filter = skuFilter.join(" OR ")
-    //axios.defaults.withCredentials = true;
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
@@ -129,15 +128,9 @@ const ProductData = {
    */
   eqProductVariantMapper: function (eqVariant) {
 
-    let imageURL = eqVariant.properties.imageURL;
-    const regex = /\d+\.\d+/
-    let thumbnailImage = ''
+    let imageURL = eqVariant.properties.imageURL ? eqVariant.properties.imageURL : '';
+    let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
-    if (imageURL.includes('contentstack')) {
-      thumbnailImage = imageURL + '?width=40'
-    } else {
-      thumbnailImage = imageURL.replace(regex, '40.40')
-    }
 
     const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
     const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
@@ -304,8 +297,7 @@ const ProductData = {
       },
       "restrictedMarkets": [],
       "addOns": [],
-      "equinoxProductId": eqVariant.identifier,
-      "variantDefault": eqVariant.default
+      "equinoxProductId": eqVariant.identifier
     };
   },
 
@@ -358,146 +350,141 @@ const ProductData = {
     }
   },
 
-
   eqProductMapper: async function (productDataResponse, skus) {
-    // console.log(productDataResponse, skus);
     let count = 0;
     const products = [];
 
     for (const productData of productDataResponse) {
-      let variants = {};
-
-      let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
-      let imageURL = product.properties.imageURL;
-      const regex = /\d+\.\d+/
-      let thumbnailImage = ''
-
-      if (imageURL.includes('contentstack')) {
-        thumbnailImage = imageURL + '?width=40'
-      } else {
-        thumbnailImage = imageURL.replace(regex, '40.40')
-      }
+      try {
+        let variants = {};
+        let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
+        let imageURL = product.properties.imageURL ? product.properties.imageURL : '';
+        let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
+
+
+        if (productData.sku && productData.sku.length > 1) {
+          // exclude base product from variants
+          productData.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
+            variants[variant.identifier] = this.eqProductVariantMapper(variant);
+            return variant;
+          });
+        }
 
-      if (productData.sku && productData.sku.length > 1) {
-        // exclude base product from variants
-        productData.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
-          variants[variant.identifier] = this.eqProductVariantMapper(variant);
-          return variant;
-        });
+        const {
+          eventName,
+          eventLabels,
+          computedPrice,
+          defaultProductPrice,
+          CVPrice,
+          PVPrice
+        } = this.getEqProductPromotions(product);
+        const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
+        const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+        const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
+        const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
+
+        product.childSkus = await this.fetchChildSkus(product);
+        product.availableQuantity = mapAvailableQuantity(product);
+        product = {
+          ...product,
+          "sku": product.identifier,
+          "globalProductID": productData.identifier,
+          "title": productData.properties.name,
+          "country": product.properties.market,
+          "language": "en",
+          "shortDescr": productData.properties.description,
+          "longDescr": productData.properties.productDetailsDescription,
+          "fullImage": imageURL,
+          "imageAltText": productData.properties.name,
+          "productCarouselImages": [
+            {
+              "contentType": "img",
+              "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
+              "alt": ""
+            }
+          ],
+          "thumbnail": thumbnailImage,
+          "ingredients": productData.properties.ingredients,
+          "benefits": productData.properties.benefits,
+          "usage": productData.properties.usage,
+          "resources": product.properties.resources,
+          "videos": "",
+          "movie": "",
+          "youtube": "",
+          "salesEventText": "",
+          "contentSection": [
+            {
+              "sectionContent": "<div class=\"contentSections\"></div>\n"
+            }
+          ],
+          "scanQualified": productData.properties.scanQualifiedCount,
+          "maxQuantity": 999,
+          "points": "",
+          "cv": productCVPrice,
+          "pv": productPVPrice,
+          "priceType": "WRTL",
+          "price": discountedPrice,
+          "priceMap": {
+            "WRTL": productPrice,
+            "WADW-WRTL": product.priceFacets["Regular Price"],
+            "WADR": product.priceFacets["Regular Price"],
+            "RTL": product.priceFacets["Regular Price"],
+            "WADW": product.priceFacets["Wholesale Price"],
+            "WHL": product.priceFacets["Wholesale Price"],
+            "WWHL": product.priceFacets["Wholesale Price"]
+          },
+          "cvMap": {
+            "WWHL": productCVPrice,
+            "WADW": productCVPrice,
+            "WHL": productCVPrice
+          },
+          "pvMap": {
+            "WWHL": productPVPrice,
+            "WADW": productPVPrice,
+            "WHL": productPVPrice
+          },
+          "orderTypes": this._setOrderType(product.properties),
+          "custTypes": this.switchCustType(product.properties.customerTypes),
+          "division": productData.properties.division,
+          "backOrderDate": null,
+          "locallyProduced": false,
+          "agelocme": null,
+          "count": "",
+          "flavor": "",
+          "size": product.properties.size,
+          "shade": "",
+          "status": this.switchStatusFromEquinox(product.properties.productStatus),
+          "variantType": "Other",
+          "variantDropdownLabel": product.properties.variantLabel || "",
+          "variantDropdownPlaceholder": "Select Type",
+          "variantsLabel": product.properties.variantLabel || "",
+          "groupOffer": false,
+          "personalOffer": false,
+          "savedEventName": eventName,
+          "salesLabel": eventLabels,
+          "eventName": eventName,
+          "sizeWeight": '',
+          "nettoWeight": "",
+          "variants": variants,
+          "searchScore": 0,
+          "isExclusive": product.properties.isExclusive || false,
+          "marketAttributes": {
+            "discount": true,
+            "redeem": true,
+            "earn": true
+          },
+          "restrictedMarkets": [],
+          "addOns": [],
+          "inventory": product.inventory || "", //inventory label
+          "equinoxProductId": productData.identifier
+        };
+
+        products.push(new Product(product));
+      } catch (err) {
+        console.error('Unable to map the product', productData.identifier, ':', err);
+        console.error('Product info:', productDataResponse, skus);
+        continue;
       }
-
-
-
-      const {
-        eventName,
-        eventLabels,
-        computedPrice,
-        defaultProductPrice,
-        CVPrice,
-        PVPrice
-      } = this.getEqProductPromotions(product);
-      const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
-      const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
-      const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
-      const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
-
-      product.childSkus = await this.fetchChildSkus(product);
-      product.availableQuantity = mapAvailableQuantity(product);
-      product = {
-        ...product,
-        "sku": product.identifier,
-        "globalProductID": productData.identifier,
-        "title": productData.properties.name,
-        "country": product.properties.market,
-        "language": "en",
-        "shortDescr": productData.properties.description,
-        "longDescr": productData.properties.productDetailsDescription,
-        "fullImage": imageURL,
-        "imageAltText": productData.properties.name,
-        "productCarouselImages": [
-          {
-            "contentType": "img",
-            "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
-            "alt": ""
-          }
-        ],
-        "thumbnail": thumbnailImage,
-        "ingredients": productData.properties.ingredients,
-        "benefits": productData.properties.benefits,
-        "usage": productData.properties.usage,
-        "resources": product.properties.resources,
-        "videos": "",
-        "movie": "",
-        "youtube": "",
-        "salesEventText": "",
-        "contentSection": [
-          {
-            "sectionContent": "<div class=\"contentSections\"></div>\n"
-          }
-        ],
-        "scanQualified": productData.properties.scanQualifiedCount,
-        "maxQuantity": 999,
-        "points": "",
-        "cv": productCVPrice,
-        "pv": productPVPrice,
-        "priceType": "WRTL",
-        "price": discountedPrice,
-        "priceMap": {
-          "WRTL": parseInt(productPrice),
-          "WADW-WRTL": parseInt(product.priceFacets["Regular Price"]),
-          "WADR": parseInt(product.priceFacets["Regular Price"]),
-          "RTL": parseInt(product.priceFacets["Regular Price"]),
-          "WADW": parseInt(product.priceFacets["Wholesale Price"]),
-          "WHL": parseInt(product.priceFacets["Wholesale Price"]),
-          "WWHL": parseInt(product.priceFacets["Wholesale Price"])
-        },
-        "cvMap": {
-          "WWHL": productCVPrice,
-          "WADW": productCVPrice,
-          "WHL": productCVPrice
-        },
-        "pvMap": {
-          "WWHL": productPVPrice,
-          "WADW": productPVPrice,
-          "WHL": productPVPrice
-        },
-        "orderTypes": this._setOrderType(product.properties),
-        "custTypes": this.switchCustType(product.properties.customerTypes),
-        "division": productData.properties.division,
-        "backOrderDate": null,
-        "locallyProduced": false,
-        "agelocme": null,
-        "count": "",
-        "flavor": "",
-        "size": product.properties.size,
-        "shade": "",
-        "status": this.switchStatusFromEquinox(product.properties.productStatus),
-        "variantType": "Other",
-        "variantDropdownLabel": product.properties.variantLabel || "",
-        "variantDropdownPlaceholder": "Select Type",
-        "variantsLabel": product.properties.variantLabel || "",
-        "groupOffer": false,
-        "personalOffer": false,
-        "savedEventName": eventName,
-        "salesLabel": eventLabels,
-        "eventName": eventName,
-        "sizeWeight": '',
-        "nettoWeight": "",
-        "variants": variants,
-        "searchScore": 0,
-        "isExclusive": product.properties.isExclusive || false,
-        "marketAttributes": {
-          "discount": true,
-          "redeem": true,
-          "earn": true
-        },
-        "restrictedMarkets": [],
-        "addOns": [],
-        "inventory": product.inventory || "", //inventory label
-        "equinoxProductId": productData.identifier
-      };
-
-      products.push(new Product(product));
     }
 
     let data = {
@@ -540,7 +527,7 @@ const ProductData = {
           type: 'SKUKIT',
           availableChannels: product.properties.availableChannels
         },
-        ...res.data.product.map(p => this.buildChildSkus(kits, p))
+        ...res.data.product.map(p => mapChildSKU(kits, p))
       ];
 
       return childSkus;
@@ -549,23 +536,6 @@ const ProductData = {
     return [];
   },
 
-  buildChildSkus: function (kits, product) {
-    const sku = product.sku[0];
-    const kit = kits.filter(k => k.sku === sku.identifier)[0];
-
-    return {
-      productId: product.identifier,
-      skuId: sku.identifier,
-      type: 'MANDATORY',
-      skuQuantity: kit.qty,
-      availableChannels: sku.properties.availableChannels,
-      inventory: {
-        atpQty: sku.inventoryProperties.atpQty,
-        backOrdered: sku.inventoryProperties.backOrdered
-      }
-    }
-  },
-
   /**
    *
    * Map status from equinox to  legacy