@nuskin/ns-product-lib 2.5.0-cx24-2179.2.15 → 2.5.0-cx24-2179.2.17

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.5.0-cx24-2179.2.17](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.16...v2.5.0-cx24-2179.2.17) (2023-01-24)
+
+
+### Fix
+
+* undefined value of the URL (CX24-3122,CX24-3234) ([e6a9a9d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e6a9a9de118d2bdfa921a48d1c15f7b2a413e32b))
+
+# [2.5.0-cx24-2179.2.16](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.15...v2.5.0-cx24-2179.2.16) (2023-01-24)
+
+
+### Update
+
+* Re-map changed Equinox properties after data migration (#CX24-3175) ([f20cbc4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f20cbc4bd63a3e0f810fbd6d0b2c5ad1aa236a8f)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
+
 # [2.5.0-cx24-2179.2.15](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.14...v2.5.0-cx24-2179.2.15) (2023-01-23)
 
 

package/package.json

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

package/src/contentstack/contentstack.js

@@ -98,7 +98,7 @@ function getCachedData(key) {
  * @property {string} checkout_client_secret
  *
  * @export
- * @return {Promise<null|MarketConfig>} 
+ * @return {Promise<null|MarketConfig>}
  */
 async function getAEMConfig() {
   try {
@@ -137,7 +137,7 @@ async function getAEMConfig() {
  * @property {string} market_name
  * @property {string} country_code
  * @property {string} store_id
- * 
+ *
  * @typedef EquinoxEnabledMarkets
  * @property {EquinoxEnabledMarket[]} [dev_markets]
  * @property {EquinoxEnabledMarket[]} [test_markets]
@@ -145,7 +145,7 @@ async function getAEMConfig() {
  * @property {EquinoxEnabledMarket[]} [prod_markets]
  *
  * @export
- * @return {Promise<EquinoxEnabledMarkets>} 
+ * @return {Promise<EquinoxEnabledMarkets>}
  */
 async function getEquinoxMarkets() {
   try {
@@ -176,8 +176,8 @@ async function getEquinoxMarkets() {
   }
 }
 
-/**getKongUrl gets the URL for Kong in contentstack 
- * 
+/**getKongUrl gets the URL for Kong in contentstack
+ *
  * @returns {string}
 */
 async function getKongUrl() {

package/src/index.js

@@ -7,10 +7,10 @@
 
 const Agelocme = require("./agelocme.js");
 const Contentstack = require('./contentstack/contentstack');
-const PriceType = require("./priceType.js");
+const PriceType = require("./models/priceType.js");
 const Product = require("./product.js");
 const ProductContentMapper = require("./productContentMapper.js");
-const ProductStatus = require("./productStatus.js");
+const ProductStatus = require("./models/productStatus.js");
 const ProductStatusMapper = require("./productStatusMapper.js");
 const ProductUtils = require("./productUtils.js");
 const ProductData = require("./productData.js");

package/src/models/customerTypes.js

@@ -0,0 +1,16 @@
+"use strict";
+
+const CustomerTypes = {
+  BrandAffiliate: "brandaffiliate",
+  Preferred: "preferred",
+  PreferredCustomer: "preferred customer",
+  Retail: "retail",
+  properties: {
+    BRAND_AFFILIATE: { stringKey: "DIST", code: 10 },
+    RETAIL: { stringKey: "CUST", code: 20 },
+    PREFERRED: { stringKey: "preferred", code: 30 },
+    PREFERRED_CUSTOMER: { stringKey: "PREF", code: 30 }
+  }
+};
+
+module.exports = CustomerTypes;

package/src/{productStatus.js → models/productStatus.js}

@@ -17,6 +17,13 @@ const ProductStatus = {
     STOP_STATUS: { stringKey: "stopStatus", code: 5 },
     NOT_FOUND: { stringKey: "", code: 0 },
     NOT_SOLD_SEPERATELY: {stringKey: "notSoldSeperately", code: 4 }
+  },
+  equinoxStatus: {
+    SELLABLE: 'sellable',
+    PREVIEW_PRODUCT: 'preview product',
+    DISCONTINUED: 'discontinued',
+    STOPPED: 'stopped',
+    REPLACEMENT: 'Replacement'
   }
 };
 

package/src/product.js

@@ -5,8 +5,8 @@ const { isTrue }  = require("@nuskin/ns-common-lib");
 const ProductUtils = require("./productUtils.js");
 
 const Agelocme = require("./agelocme.js");
-const PriceType = require("./priceType.js");
-const ProductStatus = require("./productStatus.js");
+const PriceType = require("./models/priceType.js");
+const ProductStatus = require("./models/productStatus.js");
 
 const Product = function(productData) {
   this.priceMap = {};

package/src/productData.js

@@ -4,7 +4,8 @@ const { getConfiguration } = require('@nuskin/configuration-sdk');
 const axios = require("axios");
 const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
-
+const CustomerTypes = require('./models/customerTypes');
+const ProductStatus = require("./models/productStatus");
 /** @type {*} */
 const ProductData = {
   /**
@@ -15,7 +16,7 @@ const ProductData = {
    */
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
     const localeMarket = `${locale}_${market}`;
-    
+
     if (isEquinoxEnabled) {
       let config = (await getConfiguration({
         configMapNames: ['Equinox_Markets'],
@@ -24,13 +25,13 @@ const ProductData = {
         clientId: '735b1eb810304bba966af0891ab54053'
       }));
 
-      if (config.country_code != '') {
+      if (config.Equinox_Markets.country_code != '') {
         return await this.getProductFromEquinox(skus, localeMarket, config);
       }
     }
     return await this.getProductFromLegacy(skus, localeMarket);
   },
-  
+
   getProductFromEquinox: async function (skus, locale, config) {
     const filter = `{"filters": [{"field": "index_key_skuId","operation": "IN", "value": "${skus.toString()}"}]}`;
     axios.defaults.withCredentials = true;
@@ -176,6 +177,7 @@ const ProductData = {
         "WHL": eqVariant.priceFacets.PV
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
+      "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
       "division": eqVariant.properties.division,
       "backOrderDate": null,
       "locallyProduced": false,
@@ -186,9 +188,9 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": eqVariant.properties.variantLabel  ||  "",
+      "variantDropdownLabel": eqVariant.properties.variantSelectLabel  ||  "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": eqVariant.properties.variantLabel  ||  "",
+      "variantsLabel": eqVariant.properties.variantSelectLabel  ||  "",
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": eventName,
@@ -197,7 +199,7 @@ const ProductData = {
       "sizeWeight": '',
       "nettoWeight": "",
       "searchScore": 0,
-      "isExclusive": false,
+      "isExclusive": eqVariant.properties.isExclusive || false,
       "marketAttributes": {
         "discount": true,
         "redeem": true,
@@ -355,7 +357,7 @@ const ProductData = {
         "nettoWeight": "",
         "variants": variants,
         "searchScore": 0,
-        "isExclusive": data.sku[count].properties.isExclusive,
+        "isExclusive": data.sku[count].properties.isExclusive || false,
         "marketAttributes": {
           "discount": true,
           "redeem": true,
@@ -384,27 +386,29 @@ const ProductData = {
   },
 
   switchStatusFromEquinox: function (status) {
+    const { equinoxStatus } = ProductStatus;
     let newStatus = '';
-    switch (status) {
-      case 'Sellable':
-        newStatus = 'RELEASED_FOR_SALE';
+    switch (status.toLowerCase()) {
+      case equinoxStatus.SELLABLE:
+        newStatus = ProductStatus.ReleasedForSale;
         break;
-      case 'Preview product':
-        newStatus = 'NOT_RELEASED_FOR_SALE';
+      case equinoxStatus.PREVIEW_PRODUCT:
+        newStatus = ProductStatus.NotReleasedForSale;
         break;
-      case 'Discontinued':
-        newStatus = 'DISCONTINUED';
+      case equinoxStatus.DISCONTINUED:
+        newStatus = ProductStatus.Discontinued;
         break;
-      case 'Stopped':
-        newStatus = 'DISCONTINUED';
+      case equinoxStatus.STOPPED:
+        newStatus =  ProductStatus.Discontinued;
         break;
-      case 'Replacement':
-        newStatus = 'NOT_RELEASED_FOR_SALE';
+      case equinoxStatus.REPLACEMENT:
+        newStatus = ProductStatus.NotReleasedForSale;
         break;
       default:
-        newStatus = 'NOT_RELEASED_FOR_SALE'
+        newStatus = ProductStatus.NotReleasedForSale;
         break;
     }
+
     return newStatus;
   },
 
@@ -413,14 +417,32 @@ const ProductData = {
    * @param {*} custType
    *
    */
-  switchCustType: function (custType) {
+
+  /**
+   * map customer types from string to code
+   * @param {*} eqCustomerTypes
+   * @returns
+   */
+  switchCustType: function (eqCustomerTypes) {
+    if (!eqCustomerTypes) {
+      return "";
+    }
+
+    const custTypes = eqCustomerTypes.split(',').map(customerType => customerType.trim().toLowerCase());
+
     let newCustType = [];
-    if (custType.includes('Brand Affiliate - Business Entity') || custType.includes('Brand Affiliate - Individual'))
-      newCustType.push(10)
-    if (custType.includes('Retail Customer'))
-      newCustType.push(20)
-    if (custType.includes('Preferred Customer/Member'))
-      newCustType.push(30)
+    if (custTypes.includes(CustomerTypes.BrandAffiliate)) {
+      newCustType.push(CustomerTypes.properties.BRAND_AFFILIATE.code);
+    }
+
+    if (custTypes.includes(CustomerTypes.Retail)) {
+      newCustType.push(CustomerTypes.properties.RETAIL.code);
+    }
+
+    if (custTypes.includes(CustomerTypes.Preferred) || custTypes.includes(CustomerTypes.PreferredCustomer)) {
+      newCustType.push(CustomerTypes.properties.PREFERRED.code);
+    }
+
     return newCustType.toString()
   },