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

package/CHANGELOG.md

@@ -1,9 +1,10 @@
-# [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)
+# [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)
 
 
-### New
+### Update
 
-* 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.1",
+  "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
    */
@@ -90,26 +92,18 @@ const ProductData = {
 
   eqProductMapper: function (productDataResponse) {
     let prod = [];
-    const 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.push(variant);
-          return variant;
-        });
-      }
-
       prod = {
         "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
@@ -203,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,
@@ -214,7 +209,7 @@ const ProductData = {
         "restrictedMarkets": [],
         "addOns": []
       };
-      let newProduct = new Product(prod);
+      let newProduct = new product(prod);
       return newProduct
     })
 
@@ -250,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)