@nuskin/ns-product-lib 2.2.0-cx24-2467.2 → 2.2.0

package/CHANGELOG.md

@@ -1,16 +1,10 @@
-# [2.2.0-cx24-2467.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.2.0-cx24-2467.1...v2.2.0-cx24-2467.2) (2022-10-11)
+# [2.2.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.1.0...v2.2.0) (2022-10-13)
 
 
 ### Update
 
-* map product variant  based on Product (#CX24-2467) ([7de46cc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7de46cc1595244504d44d4e2049f07e8697b4f20)), closes [#CX24-2467](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2467)
-
-# [2.2.0-cx24-2467.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.1.0...v2.2.0-cx24-2467.1) (2022-10-11)
-
-
-### New
-
-* add variants (#CX24-2467) ([04b0632](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/04b0632d3f10758852f815cf2d06dd1f04aa7188)), closes [#CX24-2467](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2467)
+* Get Kong URL from contentstack (CX24-2447) ([272b35a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/272b35a63908267e3c004ef43cbc2ecf0452a907))
+* redirect to equinox sign-in if the market is equinox-enabled (CX24-2092) ([ffff6e2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ffff6e21c0c6e72e0e3e42583dd443d7a0227bea))
 
 # [2.1.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.1...v2.1.0) (2022-10-04)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.2.0-cx24-2467.2",
+  "version": "2.2.0",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "prettier": "1.19.1"
   },
   "dependencies": {
-    "@nuskin/ns-common-lib": "1.3.0",
+    "@nuskin/ns-common-lib": "1.4.5",
     "@nuskin/ns-util": "3.107.0",
     "axios": "0.27.2",
     "qs": "6.11.0"

package/src/contentstack/contentstack.js

@@ -14,11 +14,12 @@ const headers = {
 const http = axios.create({ baseURL, headers });
 
 // in-memory caching
-const cacheKeys = { aemConfig: 'aemConfig', equinoxMarkets: 'equinoxMarkets' };
+const cacheKeys = { aemConfig: 'aemConfig', equinoxMarkets: 'equinoxMarkets', kongUrl: 'kongUrl' };
 const cacheTTLInSeconds = 30 * 1000;
 const cache = {
   [cacheKeys.aemConfig]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
-  [cacheKeys.equinoxMarkets]: { data: null, ttl: Date.now() + cacheTTLInSeconds }
+  [cacheKeys.equinoxMarkets]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
+  [cacheKeys.kongUrl]: { data: null, ttl: Date.now() + cacheTTLInSeconds}
 };
 
 /**
@@ -139,6 +140,36 @@ async function getEquinoxMarkets() {
   }
 }
 
+/**getKongUrl gets the URL for Kong in contentstack 
+ * 
+ * @returns {string}
+*/
+async function getKongUrl() {
+  try {
+    if (isCacheExpired(cacheKeys.kongUrl)) {
+      const variables = { uid: 'blt5633ff9e560f14ef' };
+      const query = `query KongUrlByUid($uid: String!) {
+          equinox_markets(uid: $uid) {
+              kong_urls {
+                ${env}
+            }
+          }
+        }`;
+
+      const { data } = await contentstackService({
+        data: { variables, query }
+      });
+
+      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[env]);
+    }
+    
+    return getCachedData(cacheKeys.kongUrl);
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
 /**
  * isMarketEnabled checks is the given market is in the list
  * of equinox-enabled markets.
@@ -177,5 +208,6 @@ async function contentstackService(config) {
 module.exports = {
   getAEMConfig,
   getEquinoxMarkets,
-  isMarketEnabled
+  isMarketEnabled,
+  getKongUrl
 }

package/src/productData.js

@@ -1,15 +1,15 @@
 "use strict";
 const axios = require("axios");
 const contentstack = require('./contentstack/contentstack');
-const Product = require("./product");
+const product = require("./product");
 
 /** @type {*} */
 const ProductData = {
   /**
-   * @param {string[]} skus
-   * @param {string} locale
-   * @param {string} market
-   * @param {boolean} isEquinoxEnabled
+   * @param {string[]} skus 
+   * @param {string} locale 
+   * @param {string} market 
+   * @param {boolean} isEquinoxEnabled 
    */
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
     const localeMarket = `${locale}_${market}`;
@@ -28,7 +28,9 @@ const ProductData = {
   getProductFromEquinox: async function (skus, locale, storeID) {
     const filter = '{"filters":[{"field":"index_key_skuId","operation":"IN","value":"' + skus.toString() + '"}]}';
     axios.defaults.withCredentials = true;
-    const url = `https://storefront.api.wde.nuskin.io/orchestrationservices/storefront/catalogs/search/`;
+    
+    const url = await contentstack.getKongUrl() + `/orchestrationservices/storefront/catalogs/search/`;
+    console.log("Dynamic URL", url)
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
@@ -76,7 +78,7 @@ const ProductData = {
       responseType: 'json'
     });
   },
-
+  
   /**
    * @param {contentstack.MarketConfig} marketConfig
    */
@@ -88,149 +90,20 @@ const ProductData = {
     };
   },
 
-  /**
-   * Map product variant
-   * @todo remove unnecessary fields
-   * @param {*} eqVariant
-   * @returns Array<Product>
-   */
-  eqProductVariantMapper : function (eqVariant) {
-
-    let imageURL = eqVariant.properties.imageURL;
-    const regex = /\d+.\d+/
-    let thumbnailImage = ''
-
-    if (imageURL.includes('contentstack')) {
-      thumbnailImage = imageURL + '?width=40'
-    } else {
-      thumbnailImage = imageURL.replace(regex,'40.40')
-    }
-
-    return {
-      "sku": eqVariant.identifier,
-      "globalProductID": eqVariant.identifier,
-      "title": eqVariant.properties.name,
-      "country": eqVariant.properties.market,
-      "language": "en",
-      "shortDescr": eqVariant.properties.description,
-      "longDescr": eqVariant.properties.productDetailsDescription,
-      "fullImage": imageURL,
-      "imageAltText": eqVariant.properties.name,
-      "productCarouselImages": [
-        {
-          "contentType": "img",
-          "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
-          "alt": ""
-        }
-      ],
-      "thumbnail": thumbnailImage,
-      "ingredients": eqVariant.properties.ingredients,
-      "benefits": eqVariant.properties.benefits,
-      "usage": eqVariant.properties.usage,
-      "resources": eqVariant.properties.resources,
-      "videos": "",
-      "movie": "",
-      "youtube": "",
-      "salesEventText": "",
-      "contentSection": [
-        {
-          "sectionContent": "<div class=\"contentSections\"><div class=\"contentSection section\"><div>\n<h3>BENEFITS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>Green tea has been used in China for thousands of years for its health-preserving and revitalizing power. Modern science has identified powerful antioxidants in green tea called polyphenols. One group of polyphenols called catechins is particularly potent and is highly effective at neutralizing free radicals at the cellular level. Catechins support healthy cell function while providing antioxidant protection to critical cell structures such as DNA. Clinical studies show catechins interfere with the production of certain enzymes involved in cell damage. Additionally, catechins have been demonstrated to cause a thermogenic effect that enhances the body s metabolic rate. Tegreen 97<sup>®</sup> from Pharmanex is a proprietary, highly concentrated extract of the catechins found in green tea. Tegreen 97<sup>®</sup> is one of the most potent antioxidant supplements on the market with a 97 percent polyphenol content, 65% catechins. Each Tegreen 97<sup>®</sup> capsule contains the catechin equivalent of approximately seven cups of green tea and is 99.5 percent caffeine free.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>USAGE</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>As a dietary supplement, take one (1) to four (4) capsules daily; preferably one (1) to two (2) each morning and evening with food. Store in a cool, dry place.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>INGREDIENTS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<table border=\"1\" cellspacing=\"1\" cellpadding=\"0\" width=\"360\"><tbody>\r\n<tr>\r\n<td><b>Nutritional Facts</b></td>\r\n<td><b>Amount</b></td>\r\n<td><b>% Daily Value</b></td>\r\n</tr>\r\n<tr>\r\n<td colspan=\"3\"><b>Serving Size: 1 Capsule<br>\r\nServings Per Container: 120</b></td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\">Green tea leaf (20:1) Extract (<i>Camellia sinensis</i></td>\r\n<td width=\"20%\">250 mg</td>\r\n<td width=\"25%\">&nbsp;</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\">* Daily Value not established</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\"><b>Other Ingredients: Gelatin, Silicon Dioxide, Microcrystalline Cellulose, Magnesium Stearate.</b></td>\r\n</tr>\r\n</tbody>\r\n</table>\r\n<p>&nbsp;</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n</div>\n"
-        }
-      ],
-      "scanQualified": eqVariant.properties.scanQualifiedCount,
-      "availableQuantity": 999,
-      "maxQuantity": 999,
-      "points": "",
-      "cv": (eqVariant.priceFacets.CV) ?  eqVariant.priceFacets.CV : '',
-      "pv":eqVariant.priceFacets.PV,
-      "priceType": "WRTL",
-      "price": eqVariant.priceFacets["Regular Price"],
-      "priceMap": {
-        "WRTL": eqVariant.priceFacets["Regular Price"],
-        "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
-        "WADR": 9999.01,
-        "RTL": eqVariant.priceFacets["Regular Price"],
-        "WWHL": 9998.01,
-        "WADW": 9998.01,
-        "WHL": 9998.01
-      },
-      "cvMap": {
-        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
-      },
-      "pvMap": {
-        "WWHL": eqVariant.priceFacets.PV,
-        "WADW": eqVariant.priceFacets.PV,
-        "WHL": eqVariant.priceFacets.PV
-      },
-      "orderTypes": {
-        "adr": true,
-        "order": true,
-        "zpfc": false,
-        "zadp": true,
-        "ars": true,
-        "kiosk": true,
-        "mobile": true,
-        "preferred customer": true,
-        "retail": true,
-        "web": true,
-        "web display": true
-      },
-      "division": eqVariant.properties.division,
-      "backOrderDate": null,
-      "locallyProduced": false,
-      "agelocme": null,
-      "count": "",
-      "flavor": "",
-      "size": eqVariant.properties.size,
-      "shade": "",
-      "status": this.switchStatusFromEquinox(eqVariant.properties.status),
-      "variantType": "Other",
-      "variantDropdownLabel": "Select Type",
-      "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": "Select Type",
-      "groupOffer": false,
-      "personalOffer": false,
-      "savedEventName": null,
-      "salesLabel": "",
-      "eventName": null,
-      "sizeWeight": '',
-      "nettoWeight": "",
-      "searchScore": 0,
-      "isExclusive": false,
-      "marketAttributes": {
-        "discount": true,
-        "redeem": true,
-        "earn": true
-      },
-      "restrictedMarkets": [],
-      "addOns": []
-    };
-  },
-
   eqProductMapper: function (productDataResponse) {
     let prod = [];
-    let variants = [];
+    let count = 0;
 
-    let prodArr = productDataResponse.map((data, count) => {
+    let prodArr = productDataResponse.map((data) => {
       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')
       }
-
-      if (data.sku && data.sku.length > 1) {
-        data.sku.map(variant => {
-          variants[variant.identifier] = this.eqProductVariantMapper(variant);
-          return variant;
-        });
-      }
-
       prod = {
         "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
@@ -324,9 +197,10 @@ const ProductData = {
         "eventName": null,
         "sizeWeight": '',
         "nettoWeight": "",
-        "variants": variants,
+        "variants": {
+        },
         "searchScore": 0,
-        "isExclusive": false,
+        "isExclusive": data.sku[count].properties.isExclusive,
         "marketAttributes": {
           "discount": true,
           "redeem": true,
@@ -335,7 +209,7 @@ const ProductData = {
         "restrictedMarkets": [],
         "addOns": []
       };
-      let newProduct = new Product(prod);
+      let newProduct = new product(prod);
       return newProduct
     })
 
@@ -371,20 +245,20 @@ const ProductData = {
         newStatus = 'NOT_RELEASED_FOR_SALE';
         break;
       default:
-        newStatus = 'RELEASED_FOR_SALE'
+        newStatus = 'NOT_RELEASED_FOR_SALE'
         break;
     }
     return newStatus;
   },
 
   /**
-   *
-   * @param {*} custType
-   *
+   * 
+   * @param {*} custType 
+   * 
    */
   switchCustType: function (custType) {
     let newCustType = [];
-    if (custType.includes('Brand Affiliate - Business Entity') || custType.includes('Brand Affiliate - Individual'))
+    if (custType.includes('Brand Affiliate - Business Entity') || custType.includes('Brand Affiliate - Individual')) 
       newCustType.push(10)
     if (custType.includes('Retail Customer'))
       newCustType.push(20)