@nuskin/ns-product-lib 1.6.0-cx24-2382.1 → 2.0.0-CX24.1

package/CHANGELOG.md

@@ -1,3 +1,98 @@
+# [2.0.0-CX24.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.5.0...v2.0.0-CX24.1) (2022-09-16)
+
+
+### Breaking
+
+* replace runConfig and marketConfig parameters of getProductData with locale and market (CX24-2382) ([b7b8ac7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b7b8ac7fa946df0b3690f700d00f5acfb0073bcf))
+
+### Update
+
+* Map new equinox fields to response (CX24-2103) ([6e1800b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6e1800bbf9b1c6fe8f844e011b5326d772a88f5b))
+* removing old contentstack.js file ([3f2df2e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3f2df2e298e6c50aa321720fa0cefa14b4ed025a))
+* removing old contentstack.js file ([87ae17d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/87ae17ded4471199b104daa5dee91a6285973db1))
+* removing old contentstack.js file ([13d4aa2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/13d4aa21d7bdeda38e39d6880f6bc06f4c52fee9))
+
+# [2.0.0-cx24-2382.11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.10...v2.0.0-cx24-2382.11) (2022-09-13)
+
+
+### Update
+
+* updating the product data map (#CX24-2103) ([097dee5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/097dee5567d777e8f8474c3d567cc47c52c2ca30)), closes [#CX24-2103](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2103)
+
+# [2.0.0-cx24-2382.10](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.9...v2.0.0-cx24-2382.10) (2022-09-12)
+
+
+### Update
+
+* updating the product data map (#CX24-2103) ([a13045e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a13045ef18a3ff2c7cfc48ae328e7935528699ae)), closes [#CX24-2103](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2103)
+
+# [2.0.0-cx24-2382.9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.8...v2.0.0-cx24-2382.9) (2022-09-12)
+
+
+### Update
+
+* updating the product data map (#CX24-2103) ([7226709](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7226709e2efa7352069d439e6e93fbc13c8155aa)), closes [#CX24-2103](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2103)
+
+# [2.0.0-cx24-2382.8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.7...v2.0.0-cx24-2382.8) (2022-09-11)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([be85b9d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/be85b9dbacdb59091d72b4905b6c2b7236eb6fff))
+
+# [2.0.0-cx24-2382.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.6...v2.0.0-cx24-2382.7) (2022-09-11)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([cb4683d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/cb4683d82673736c800c19cbe88878001b6e7e56))
+
+# [2.0.0-cx24-2382.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.5...v2.0.0-cx24-2382.6) (2022-09-11)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([5e4e721](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5e4e7210c168ff6fbc35503dba2c8ea77e9480c4))
+
+# [2.0.0-cx24-2382.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.4...v2.0.0-cx24-2382.5) (2022-09-09)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([996aee7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/996aee7b44b59dc19569087f34b6f127933af7e5))
+
+# [2.0.0-cx24-2382.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.3...v2.0.0-cx24-2382.4) (2022-09-08)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([7e29c09](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7e29c09396b44ee9f959e2a461940b5fcc382743))
+
+# [2.0.0-cx24-2382.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.2...v2.0.0-cx24-2382.3) (2022-09-08)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([38deea7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/38deea72a80b2bac07de35f5fa7e45f091f9f0c6))
+
+# [2.0.0-cx24-2382.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-2382.1...v2.0.0-cx24-2382.2) (2022-09-07)
+
+
+### Update
+
+* change the parameters passed to getProductData (CX24-2382) ([ba22522](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ba225229615599f6884a56fc4fd4c172a2e3d83e))
+
+# [2.0.0-cx24-2382.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.6.0-cx24-2382.1...v2.0.0-cx24-2382.1) (2022-09-06)
+
+
+### Breaking
+
+* replace runConfig and marketConfig parameters of getProductData with locale and market (CX24-2382) ([713bbb6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/713bbb6b52e20727ce846d4df5c84d837fb931d5))
+
+### New
+
+* add equinox-enabled market validation (CX24-2382) ([6633eb5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6633eb5824ec621a7316aff401d29876761ffc38))
+
 # [1.6.0-cx24-2382.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.5.0...v1.6.0-cx24-2382.1) (2022-09-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "1.6.0-cx24-2382.1",
+  "version": "2.0.0-CX24.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@nuskin/ns-common-lib": "1.3.0",
-    "@nuskin/ns-util": "3.104.0",
+    "@nuskin/ns-util": "3.105",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/contentstack/contentstack.js

@@ -0,0 +1,181 @@
+// This module can be bundled into a package for better reusability.
+const axios = require('axios');
+const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
+const config = require('./environment');
+
+// contentstack HTTP service
+const env = getEnvironmentFromUrl(window.location.host);
+const envConfig = config.getCredentials(env);
+const baseURL = `${envConfig.url}/stacks/${envConfig.apiKey}?environment=${envConfig.env}`;
+const headers = {
+  'access_token': `${envConfig.accessToken}`,
+  'Content-Type': 'application/json'
+};
+const http = axios.create({ baseURL, headers });
+
+// in-memory caching
+const cacheKeys = { aemConfig: 'aemConfig', equinoxMarkets: 'equinoxMarkets' };
+const cacheTTLInSeconds = 30 * 1000;
+const cache = {
+  [cacheKeys.aemConfig]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
+  [cacheKeys.equinoxMarkets]: { data: null, ttl: Date.now() + cacheTTLInSeconds }
+};
+
+/**
+ * isCacheExpired checks if the cached data is expired.
+ *
+ * @param {string} key
+ * @returns {boolean}
+ */
+function isCacheExpired(key) {
+  return cache[key].data === null || Date.now() > cache[key].ttl;
+}
+
+/**
+ * setCachedData will replace the cached data and update the TTL.
+ *
+ * @param {string} key
+ * @param {MarketConfig|EquinoxEnabledMarkets} data
+ * @returns {void}
+ */
+function setCachedData(key, data) {
+  cache[key].data = data;
+  cache[key].ttl = Date.now() + cacheTTLInSeconds;
+}
+
+/**
+ * getCachedData returns the cached data.
+ *
+ * @param {string} key
+ */
+function getCachedData(key) {
+  return cache[key].data;
+}
+
+/**
+ * getAEMConfig fetches the market config from contentstack.
+ *
+ * @typedef MarketConfig
+ * @property {string} aws_url
+ * @property {string} checkout_client_id
+ * @property {string} checkout_client_secret
+ *
+ * @export
+ * @return {Promise<null|MarketConfig>} 
+ */
+async function getAEMConfig() {
+  try {
+    if (isCacheExpired(cacheKeys.aemConfig)) {
+      const marketConfig = `market_config_${env}`;
+      const variables = { uid: 'blt52b0b83a89763791' };
+      const query = `query AemConfigByUid($uid: String!) {
+        aem_config(uid: $uid) {
+          title
+          ${marketConfig} {
+            checkout_client_secret
+            checkout_client_id
+            aws_url
+          }
+        }
+      }`;
+
+      const { data } = await contentstackService({
+        data: { variables, query }
+      });
+
+      setCachedData(cacheKeys.aemConfig, data.aem_config[marketConfig]);
+    }
+
+    return getCachedData(cacheKeys.aemConfig);
+  } catch (error) {
+    console.error(error);
+    return null;
+  }
+}
+
+/**
+ * getEquinoxMarkets will get the list of Equinox-enabled markets from contentstack
+ *
+ * @typedef EquinoxEnabledMarket
+ * @property {string} market_name
+ * @property {string} country_code
+ * @property {string} store_id
+ * 
+ * @typedef EquinoxEnabledMarkets
+ * @property {EquinoxEnabledMarket[]} [dev_markets]
+ * @property {EquinoxEnabledMarket[]} [test_markets]
+ * @property {EquinoxEnabledMarket[]} [staging_markets]
+ * @property {EquinoxEnabledMarket[]} [prod_markets]
+ *
+ * @export
+ * @return {Promise<EquinoxEnabledMarkets>} 
+ */
+async function getEquinoxMarkets() {
+  try {
+    if (isCacheExpired(cacheKeys.equinoxMarkets)) {
+      const marketConfig = `${env}_markets`;
+      const variables = { uid: 'blt5633ff9e560f14ef' };
+      const query = `query EquinoxMarketsByUid($uid: String!) {
+        equinox_markets(uid: $uid) {
+            ${marketConfig} {
+              market_name
+              country_code
+              store_id
+          }
+        }
+      }`;
+
+      const { data } = await contentstackService({
+        data: { variables, query }
+      });
+
+      setCachedData(cacheKeys.equinoxMarkets, data.equinox_markets[marketConfig]);
+    }
+
+    return getCachedData(cacheKeys.equinoxMarkets);
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
+/**
+ * isMarketEnabled checks is the given market is in the list
+ * of equinox-enabled markets.
+ *
+ * @param {string} market
+ * @returns {EquinoxEnabledMarket|null}
+ */
+async function isMarketEnabled(market) {
+  const markets = await getEquinoxMarkets();
+  const currentMarket = markets.filter(m => m.country_code.toLowerCase() === market.toLowerCase());
+
+  if (currentMarket.length > 0) {
+    return currentMarket[0];
+  }
+
+  return null;
+}
+
+/**
+ * Contentstack HTTP - axios wrapper for contentstack request
+ *
+ * @param {Object} config  - required param
+ * @return {Promise<import('axios').AxiosResponse>}  Promise that resolves to market_list_eq object
+ */
+async function contentstackService(config) {
+  const data = JSON.parse(JSON.stringify(config.data));
+
+  try {
+    const response = await http.post('', data);
+    return response.data
+  } catch (error) {
+    console.error(error.response.data.errors);
+  }
+}
+
+module.exports = {
+  getAEMConfig,
+  getEquinoxMarkets,
+  isMarketEnabled
+}

package/src/contentstack/environment.js

@@ -0,0 +1,41 @@
+// use .env, but how?
+const baseConfig = {
+  apiKey: 'blt7d4c4f4a1bf5a819',
+  url: 'https://graphql.contentstack.com'
+};
+
+const config = {
+  dev: {
+    ...baseConfig,
+    accessToken: 'cs74599c107573ea7f6c7a1413',
+    env: 'public-dev'
+  },
+  prod: {
+    ...baseConfig,
+    accessToken: 'cs7029c5e32f0e99978efc683d',
+    env: 'public-prod'
+  },
+  test: {
+    ...baseConfig,
+    accessToken: 'cs67e9fdd60eb15c301add40ea',
+    env: 'public-test'
+  }
+};
+
+/**
+ * getCredentials returns contentstack config.
+ *
+ * @param {string} env
+ * @return {{accessToken: string; apiKey: string; env: string; url: string;}} 
+ */
+function getCredentials(env) {
+  if (config[env] === undefined) {
+    return {};
+  }
+
+  return config[env];
+}
+
+module.exports = {
+  getCredentials
+}

package/src/index.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const Agelocme = require("./agelocme.js");
+const Contentstack = require('./contentstack/contentstack');
 const PriceType = require("./priceType.js");
 const Product = require("./product.js");
 const ProductContentMapper = require("./productContentMapper.js");
@@ -16,6 +17,7 @@ const ProductData = require("./productData.js");
 
 module.exports = {
   Agelocme,
+  Contentstack,
   PriceType,
   Product,
   ProductContentMapper,

package/src/productData.js

@@ -1,90 +1,119 @@
 "use strict";
-const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const axios = require("axios");
+const contentstack = require('./contentstack/contentstack');
 const product = require("./product");
 
-const CS_BASE_URL  = 'https://graphql.contentstack.com';
-const CS_DELIVERY_TOKEN = 'cs74599c107573ea7f6c7a1413';
-const CS_API_KEY = 'blt7d4c4f4a1bf5a819';
-const CS_DEFAULT_ENV = 'public-dev';
-
 /** @type {*} */
 const ProductData = {
   /**
-   * @param {*} skus 
-   * @param {*} runConfig 
-   * @param {*} marketConfig 
+   * @param {string[]} skus 
+   * @param {string} locale 
+   * @param {string} market 
    * @param {boolean} isEquinoxEnabled 
    */
-  getProductData: async function (skus, runConfig, marketConfig, isEquinoxEnabled = false) {
-    const locale = `${runConfig.language}_${runConfig.country}`;
-    const enabledMarkets = await this.getEquinoxEnabledMarkets();
-    console.log(enabledMarkets);
+  getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
+    const localeMarket = `${locale}_${market}`;
+
+    if (isEquinoxEnabled) {
+      const marketConfig = await contentstack.isMarketEnabled(market);
 
-    if (isEquinoxEnabled === true) {
-      return await this.getProductFromEquinox(skus, locale, marketConfig, 406);
+      if (marketConfig !== null) {
+        return await this.getProductFromEquinox(skus, localeMarket, marketConfig.store_id);
+      }
     }
 
-    return await this.getProductFromLegacy(skus, locale, marketConfig);
+    return await this.getProductFromLegacy(skus, localeMarket);
   },
 
-  getProductFromEquinox: async function (skus, locale, marketConfig, storeID) {
-    const filter = `{
-      "filters": [{
-        "field": "index_key_skuId",
-        "operation": "IN",
-        "value": "${skus.toString()}"
-      }]
-    }`;
+  getProductFromEquinox: async function (skus, locale, storeID) {
+    const filter = '{"filters":[{"field":"index_key_skuId","operation":"IN","value":"' + skus.toString() + '"}]}';
     axios.defaults.withCredentials = true;
-    const productDataResponse = await axios.request({
+    const url = `https://storefront.api.wde.nuskin.io/orchestrationservices/storefront/catalogs/search/`;
+    const href = `${url}?filter=${encodeURI(filter)}`;
+    const response = await axios.request({
       method: 'get',
-      url: `https://storefront.api.wts.nuskin.io/orchestrationservices/storefront/catalogs/search/`,
+      url: href,
       params: {
         locale,
-        storeId: storeID,
-        filter
+        storeId: storeID
       },
-      headers: this.getProductDataRequestHeaders(marketConfig),
-      responseType: "json"
+      headers: this.getEquinoxRequestHeaders(),
+      responseType: 'json'
     });
 
-    return this.eqProductMapper(productDataResponse.data.product);
+    if (response.data.product) {
+      return this.eqProductMapper(response.data.product);
+    }
+
+    return {
+      status: 400,
+      messages: [response.data.message],
+      data: { count: 0, products: [] }
+    }
+  },
+
+  getEquinoxRequestHeaders() {
+    return {
+      'Content-Type': 'application/json'
+    };
   },
 
-  getProductFromLegacy: async function (skus, locale, marketConfig) {
-    const lambdaUrl = `${marketConfig.awsUrl}/productData/v1`;
+  getProductFromLegacy: async function (skus, locale) {
+    const marketConfig = await contentstack.getAEMConfig();
+
+    if (marketConfig === null) {
+      return null;
+    }
+
+    const lambdaUrl = `${marketConfig.aws_url}/productData/v1`;
     const payload = { locale, skus };
 
     return await axios.request({
-      method: "post",
+      method: 'post',
       url: lambdaUrl,
       data: payload,
-      headers: this.getProductDataRequestHeaders(marketConfig),
-      responseType: "json"
+      headers: this.getLegacyRequestHeaders(marketConfig),
+      responseType: 'json'
     });
   },
-
-  /* eqProductMapper: function(productDataResponse) {
-    return productDataResponse;
-  }, */
+  
+  /**
+   * @param {contentstack.MarketConfig} marketConfig
+   */
+  getLegacyRequestHeaders: function(marketConfig) {
+    return {
+      'Content-Type': 'application/json',
+      client_id: marketConfig.checkout_client_id,
+      client_secret: marketConfig.checkout_client_secret
+    };
+  },
 
   eqProductMapper: function (productDataResponse) {
     let prodArr = [];
     let prod = [];
     let count = 0;
-    productDataResponse.forEach((data, index) => {
-      count++
 
+    // we can use Array.map for this one
+    productDataResponse.forEach((data, index) => {
+      
+      let imageURL = data.sku[count].properties.imageURL;
+      const regex = /\d+.\d+/
+      let thumbnailImage = ''
+    
+      if (imageURL.includes('contentstack')) {
+        thumbnailImage = imageURL + '?width=40'
+      } else {
+        thumbnailImage = imageURL.replace(regex,'40.40')
+      }
       prod = {
-        "sku": data.sku[0].identifier,
+        "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
         "title": data.properties.name,
-        "country": data.sku[0].properties.market,
+        "country": data.sku[count].properties.market,
         "language": "en",
         "shortDescr": data.properties.description,
         "longDescr": data.properties.productDetailsDescription,
-        "fullImage": data.properties.imageURL,
+        "fullImage": imageURL,
         "imageAltText": data.properties.name,
         "productCarouselImages": [
           {
@@ -93,11 +122,11 @@ const ProductData = {
             "alt": ""
           }
         ],
-        "thumbnail": "/content/products/24/11/08/24110845/jcr:content/fullImage.img.160.160.png/1490766406581-cache.png",
-        "ingredients": "",
-        "benefits": "",
-        "usage": "",
-        "resources": "",
+        "thumbnail": thumbnailImage,
+        "ingredients": data.properties.ingredients,
+        "benefits": data.properties.benefits,
+        "usage": data.properties.usage,
+        "resources": data.sku[count].properties.resources,
         "videos": "",
         "movie": "",
         "youtube": "",
@@ -111,28 +140,28 @@ const ProductData = {
         "availableQuantity": 999,
         "maxQuantity": 999,
         "points": "",
-        "cv": 99.1,
-        "pv": 99.01,
+        "cv": (data.sku[count].priceFacets.CV) ?  data.sku[count].priceFacets.CV : '',
+        "pv": data.sku[count].priceFacets.PV,
         "priceType": "WRTL",
-        "price": 9999.11,
+        "price": data.sku[count].priceFacets["Regular Price"],
         "priceMap": {
-          "WRTL": 9999.11,
-          "WADW-WRTL": 9999.11,
+          "WRTL": data.sku[count].priceFacets["Regular Price"],
+          "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
           "WADR": 9999.01,
-          "RTL": 9999.11,
+          "RTL": data.sku[count].priceFacets["Regular Price"],
           "WWHL": 9998.01,
           "WADW": 9998.01,
           "WHL": 9998.01
         },
         "cvMap": {
-          "WWHL": 8888,
-          "WADW": 8888,
-          "WHL": 8888
+          "WWHL": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
+          "WADW": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
+          "WHL": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : ''
         },
         "pvMap": {
-          "WWHL": 99,
-          "WADW": 98,
-          "WHL": 90
+          "WWHL": data.sku[count].priceFacets.PV,
+          "WADW": data.sku[count].priceFacets.PV,
+          "WHL": data.sku[count].priceFacets.PV
         },
         "orderTypes": {
           "adr": true,
@@ -148,28 +177,26 @@ const ProductData = {
           "web display": true
         },
         "childSkus": [],
-        "custTypes": [
-          "10"
-        ],
-        "division": "",
+        "custTypes": this.switchCustType(data.properties.customerTypes),
+        "division": data.properties.division,
         "backOrderDate": null,
         "locallyProduced": false,
         "agelocme": null,
         "count": "",
         "flavor": "",
-        "size": "",
+        "size": data.sku[count].properties.size,
         "shade": "",
-        "status": "RELEASED_FOR_SALE",
-        "variantType": "",
-        "variantDropdownLabel": "",
-        "variantDropdownPlaceholder": "",
-        "variantsLabel": "",
+        "status": this.switchStatusFromEquinox(data.sku[count].properties.productStatus),
+        "variantType": "Other",
+        "variantDropdownLabel": "Select Type",
+        "variantDropdownPlaceholder": "Select Type",
+        "variantsLabel": "Select Type",
         "groupOffer": false,
         "personalOffer": false,
         "savedEventName": null,
         "salesLabel": "",
         "eventName": null,
-        "sizeWeight": "120 capsules",
+        "sizeWeight": '',
         "nettoWeight": "",
         "variants": {
         },
@@ -183,6 +210,7 @@ const ProductData = {
         "restrictedMarkets": [],
         "addOns": []
       };
+      count++
       let newProduct = new product(prod);
       prodArr[index] = newProduct;
 
@@ -190,7 +218,7 @@ const ProductData = {
 
     let data = {
       products: prodArr,
-      count: count
+      count: count + 1
     };
     return {
       data: {
@@ -198,87 +226,48 @@ const ProductData = {
         "messages": [],
         "data": data
       }
-    }
-
-  },
-
-  getProductDataRequestHeaders: function (marketConfig) {
-    return {
-      "Content-Type": "application/json",
-      client_id: marketConfig.checkout.clientId,
-      client_secret: marketConfig.checkout.clientSecret
     };
   },
 
-  /**
- * Get equinox enabled market list from contentstack
- *
- * @return {Promise<null|import('@nuskin/ns-util/src/local-storage/equinox').MarketList>}
- * @public
- */
-  getEquinoxEnabledMarkets: async function () {
-    try {
-      const env = getEnvironmentFromUrl(window.location.origin);
-      const variables = { uid: 'blt5633ff9e560f14ef' }
-      const query = `query EquinoxMarketsByUid($uid: String!) {
-          equinox_markets(uid: $uid) {
-              ${env}_markets {
-                  market_name
-                  country_code
-                  store_id
-              }
-          }
-      }`;
-
-      const { data } = await contentStackHttp({
-        method: 'post',
-        data: { variables, query }
-      });
-
-      return data.equinox_markets[`${env}_markets`];
-    } catch (error) {
-      console.error(error);
+  switchStatusFromEquinox: function (status) {
+    let newStatus = '';
+    switch (status) {
+      case 'Sellable':
+        newStatus = 'RELEASED_FOR_SALE';
+        break;
+      case 'Preview product':
+        newStatus = 'NOT_RELEASED_FOR_SALE';
+        break;
+      case 'Discontinued':
+        newStatus = 'DISCONTINUED';
+        break;
+      case 'Stopped':
+        newStatus = 'DISCONTINUED';
+        break;
+      case 'Replacement':
+        newStatus = 'NOT_RELEASED_FOR_SALE';
+        break;
+      default:
+        newStatus = 'RELEASED_FOR_SALE'
+        break;
     }
-  }
-}
-
-/**
- * Contentstack HTTP - axios wrapper for contentstack request
- * 
- * @typedef EquinoxEnabledMarket
- * @property {string} market_name
- * @property {string} country_code
- * @property {string} store_id
- *
- * @typedef EquinoxEnabledMarkets
- * @property {EquinoxEnabledMarket[]} [dev_markets]
- * @property {EquinoxEnabledMarket[]} [test_markets]
- * @property {EquinoxEnabledMarket[]} [staging_markets]
- * @property {EquinoxEnabledMarket[]} [prod_markets]
- *
- * @typedef EquinoxEnvironmentEnabledMarkets
- * @property {EquinoxEnabledMarkets} equinox_markets
- *
- * @typedef EquinoxEnabledMarketsResponse
- * @property {EquinoxEnvironmentEnabledMarkets} data
- *
- * @param {Object} config  - required param
- * @return {Promise<EquinoxEnabledMarketsResponse>}  Promise that resolves to market_list_eq object
- */
-async function contentStackHttp(config) {
-  const defaultUrl = `${CS_BASE_URL}/stacks/${CS_API_KEY}?environment=${CS_DEFAULT_ENV}`;
+    return newStatus;
+  },
 
-  config.method = config.method || 'get'
-  config.url = config.url || defaultUrl
-  config.headers = {
-    'access_token': `${CS_DELIVERY_TOKEN}`,
-    'Content-Type': 'application/json'
-  }
-  try {
-    const response = await axios(config);
-    return response.data
-  } catch (error) {
-    console.error(error.response.data.errors);
+  /**
+   * 
+   * @param {*} custType 
+   * 
+   */
+  switchCustType: function (custType) {
+    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)
+    return newCustType.toString()
   }
 }