@nuskin/ns-product-lib 2.10.2-cx24-5155.1 → 2.11.0-cx24-5092.2

package/CHANGELOG.md

@@ -1,9 +1,18 @@
-## [2.10.2-cx24-5155.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.10.1...v2.10.2-cx24-5155.1) (2023-09-08)
+# [2.11.0-cx24-5092.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.11.0-cx24-5092.1...v2.11.0-cx24-5092.2) (2023-09-08)
 
 
-### Fix
+### New
+
+* Moving from AEM to CS for EQ markets ([53d373c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/53d373c6a7221409e53e053febf4b7bd49f963ae))
+* Moving from AEM to CS for EQ markets ([6d866bf](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6d866bfcd20ce4c2d1385abca29458ae49ab35fd))
+
+# [2.11.0-cx24-5092.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.10.1...v2.11.0-cx24-5092.1) (2023-09-07)
+
+
+### New
 
-* backorder support for product bundle/kit (#CX24-5155) ([0ea8e0d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0ea8e0d96718545890e1590568ba63896fe3ba19)), closes [#CX24-5155](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-5155)
+* Moving from AEM to CS for EQ markets ([678e2ff](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/678e2ff682f99f15fac8dd0d5ed355c98419e4d6))
+* Moving from AEM to CS for EQ markets ([ddfe55d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ddfe55d6a04886dc13faa65b1c75fe1cb04aecca))
 
 ## [2.10.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.10.0...v2.10.1) (2023-08-31)
 

package/package.json

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

package/src/equinox-helpers/childSKU.js

@@ -1,5 +1,3 @@
-const mapBackOrderDate  = require('./backOrderDate');
-
 /**
  * childSKU maps a product variant. Used mainly in subscription.
  *
@@ -26,8 +24,7 @@ function childSKU(kits, product) {
     inventory: {
       atpQty: sku.inventoryProperties.atpQty,
       backOrdered: sku.inventoryProperties.backOrdered,
-      backOrderedQty: sku.inventoryProperties.backOrderedQty,
-      backOrderDate: mapBackOrderDate(sku)
+      backOrderedQty: sku.inventoryProperties.backOrderedQty
     }
   }
 }

package/src/equinox-helpers/childSKUBundles.js

@@ -1,10 +1,8 @@
-const mapBackOrderDate = require('./backOrderDate');
-
 /**
  * childSKU maps a product variant. Used mainly in subscription.
  *
- * @param {import('.').KitSKUQuantity[]} kits
- * @param {import('.').EquinoxNormalProduct} product
+ * @param {import('.').KitSKUQuantity[]} kits 
+ * @param {import('.').EquinoxNormalProduct} product 
  */
 function childSKUBundle(kits, product) {
   const sku = product.sku.filter(sku => sku.default)[0];
@@ -25,8 +23,7 @@ function childSKUBundle(kits, product) {
     availableChannels: sku.properties.availableChannels,
     inventory: {
       atpQty: sku.inventoryProperties.atpQty,
-      backOrdered: sku.inventoryProperties.backOrdered,
-      backOrderDate: mapBackOrderDate(sku)
+      backOrdered: sku.inventoryProperties.backOrdered
     }
   }
 }

package/src/graphQl/query.js

@@ -0,0 +1,527 @@
+"use strict";
+
+const getProductGql = `query getProduct($id: String!, $market: String, $language: String, $useContentSource: String, $okta: String) {
+    productById(
+      id: $id
+      market: $market
+      language: $language
+      useContentSource: $useContentSource
+      okta: $okta
+    ) {
+      ...Product
+      bundle {
+        ...Kit
+        __typename
+      }
+      __typename
+    }
+  }
+  
+  fragment Product on Product {
+    id
+    slug
+    title
+    secondaryTitle
+    productImages {
+      url
+      alt
+      thumbnail
+      __typename
+    }
+    salesLabel
+    salesText
+    description
+    salesDisclaimer
+    variantSelectLabel
+    variants {
+      ...Variant
+      __typename
+    }
+    features {
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      subtitle
+      features
+      backgroundColor
+      textColor
+      __typename
+    }
+    productDetails {
+      description
+      includedItems
+      highlights {
+        iconUrl
+        label
+        __typename
+      }
+      originCountry
+      importer
+      warnings
+      __typename
+    }
+    benefits {
+      benefits
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      __typename
+    }
+    results {
+      summary
+      results {
+        percentage
+        text
+        __typename
+      }
+      report {
+        url
+        text
+        __typename
+      }
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      __typename
+    }
+    sustainability {
+      youTubeVideoId
+      image {
+        url
+        __typename
+      }
+      description
+      highlights {
+        image {
+          url
+          __typename
+        }
+        description
+        __typename
+      }
+      __typename
+    }
+    usage {
+      steps
+      recommendations
+      warnings
+      additionalText
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      markdown
+      __typename
+    }
+    resources {
+      title
+      url
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      __typename
+    }
+    warranty
+    faqs {
+      question
+      answers
+      __typename
+    }
+    ingredients {
+      productName
+      allIngredients
+      otherIngredients
+      activeIngredients
+      inactiveIngredients
+      ingredientDisclaimers
+      markdown
+      keyIngredients {
+        image {
+          url
+          alt
+          thumbnail
+          __typename
+        }
+        name
+        description
+        __typename
+      }
+      nutritionInformationImage {
+        url
+        alt
+        __typename
+      }
+      __typename
+    }
+    disclaimers
+    disclaimerWarnings {
+      icon {
+        url
+        alt
+        __typename
+      }
+      markdown
+      __typename
+    }
+    seoInformation {
+      metaDescription
+      metaTitle
+      canonicalURL
+      ogImage {
+        url
+        alt
+        __typename
+      }
+      __typename
+    }
+    thirdPartyScripts
+    productDataSource {
+      source
+      webBaseUrl
+      apiBaseUrl
+      storeId
+      __typename
+    }
+    error {
+      name
+      errors
+      lines
+      message
+      status
+      __typename
+    }
+    upSellProductIds
+    crossProductIds
+    __typename
+  }
+  
+  fragment Variant on Variant {
+    sku
+    slug
+    variantLabel
+    variantColor
+    availableQuantity
+    maxQuantity
+    title
+    size
+    productImages {
+      url
+      alt
+      thumbnail
+      __typename
+    }
+    salesLabel
+    salesText
+    description
+    salesDisclaimer
+    nettoWeight
+    features {
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      subtitle
+      features
+      backgroundColor
+      textColor
+      __typename
+    }
+    productDetails {
+      description
+      includedItems
+      highlights {
+        iconUrl
+        label
+        __typename
+      }
+      originCountry
+      importer
+      warnings
+      __typename
+    }
+    benefits {
+      benefits
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      __typename
+    }
+    results {
+      summary
+      results {
+        percentage
+        text
+        __typename
+      }
+      report {
+        url
+        text
+        __typename
+      }
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      __typename
+    }
+    usage {
+      steps
+      recommendations
+      warnings
+      additionalText
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      youTubeVideoId
+      markdown
+      __typename
+    }
+    resources {
+      title
+      url
+      image {
+        url
+        alt
+        thumbnail
+        __typename
+      }
+      __typename
+    }
+    faqs {
+      question
+      answers
+      __typename
+    }
+    ingredients {
+      productName
+      allIngredients
+      otherIngredients
+      activeIngredients
+      inactiveIngredients
+      ingredientDisclaimers
+      markdown
+      keyIngredients {
+        image {
+          url
+          alt
+          thumbnail
+          __typename
+        }
+        name
+        description
+        __typename
+      }
+      nutritionInformationImage {
+        url
+        alt
+        __typename
+      }
+      __typename
+    }
+    isExclusive
+    price {
+      retail
+      wholesale
+      retailSales
+      wholesaleSales
+      retailSubscription
+      wholesaleSubscription
+      currencyCode
+      __typename
+    }
+    totalPrice {
+      retail
+      wholesale
+      retailSales
+      wholesaleSales
+      retailSubscription
+      wholesaleSubscription
+      currencyCode
+      __typename
+    }
+    points {
+      wholesale {
+        cv
+        pv
+        __typename
+      }
+      subscription {
+        cv
+        pv
+        __typename
+      }
+      __typename
+    }
+    totalPoints {
+      wholesale {
+        cv
+        pv
+        __typename
+      }
+      subscription {
+        cv
+        pv
+        __typename
+      }
+      __typename
+    }
+    pricingJson
+    availableQuantity
+    maxQuantity
+    status {
+      isBackordered
+      backorderedAvailableDate
+      status
+      __typename
+    }
+    purchaseTypes {
+      buyOnce
+      subscription
+      __typename
+    }
+    marketAttributes {
+      redeem
+      earn
+      __typename
+    }
+    disclaimers
+    disclaimerWarnings {
+      icon {
+        url
+        alt
+        __typename
+      }
+      markdown
+      __typename
+    }
+    restrictedMarkets
+    matchingVariant
+    shadeable
+    productType
+    primaryBrand
+    brandFamily
+    __typename
+  }
+  
+  fragment Kit on Kit {
+    id
+    type
+    price {
+      currencyCode
+      retail
+      wholesale
+      retailSales
+      wholesaleSales
+      retailSubscription
+      wholesaleSubscription
+      __typename
+    }
+    totalPrice {
+      currencyCode
+      retail
+      wholesale
+      retailSales
+      wholesaleSales
+      retailSubscription
+      wholesaleSubscription
+      __typename
+    }
+    points {
+      wholesale {
+        cv
+        pv
+        __typename
+      }
+      subscription {
+        cv
+        pv
+        __typename
+      }
+      __typename
+    }
+    totalPoints {
+      wholesale {
+        cv
+        pv
+        __typename
+      }
+      subscription {
+        cv
+        pv
+        __typename
+      }
+      __typename
+    }
+    retailDiscount
+    wholesaleDiscount
+    pvDiscount
+    cvDiscount
+    sbDiscount
+    grpDiscount
+    availableChannels
+    customerTypes
+    purchaseTypes {
+      buyOnce
+      subscription
+      __typename
+    }
+    status {
+      status
+      isBackordered
+      backorderedAvailableDate
+      __typename
+    }
+    availableQuantity
+    chargeShipping
+    dangerousGoods
+    excludeFromSearch
+    isExclusive
+    marketAttributes {
+      discount
+      redeem
+      earn
+      __typename
+    }
+    restrictedMarkets
+    scanQualifiedCount
+    kitProducts {
+      quantity
+      isMandatory
+      product {
+        ...Product
+        __typename
+      }
+      __typename
+    }
+    __typename
+  }`
+module.exports = getProductGql;

package/src/productData.js

@@ -5,8 +5,9 @@ const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
-const { mapBackOrderDate, mapAvailableQuantity, mapChildSKU, mapChildSKUBundle } = require('./equinox-helpers');
+const { mapAvailableQuantity, mapChildSKU, mapChildSKUBundle } = require('./equinox-helpers');
 const { productNotFoundInterceptor } = require('./equinox-helpers/interceptors');
+const ProductGraphQL = require('./productGraphQL')
 
 const productTypes = {
   kit: 'kit',
@@ -24,13 +25,19 @@ const ProductData = {
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
     const localeMarket = `${locale}_${market}`;
 
-    if (isEquinoxEnabled) {
-      const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
 
-      if (config.country_code === market && config.active) {
-        return await this.getProductFromEquinox(skus, localeMarket, config);
-      }
+    const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
+    skus.forEach((sku) => {
+      const graphQLResponse = ProductGraphQL.getProductFromGraphQL(sku)
+      console.log(graphQLResponse)
+      console.log(isEquinoxEnabled)
+    })
+
+
+    if (config.active) {
+      return await this.getProductFromEquinox(skus, localeMarket, config);
     }
+
     return await this.getProductFromLegacy(skus, localeMarket);
   },
 
@@ -140,11 +147,10 @@ const ProductData = {
    * Get available product quantity
    * If backOrdered === true, use backOrderedQty
    * else use atpQty
-   * @todo deprecate this and try using equinox-helpers/availableQuantity.js
    * @param {obj} inventory
    * @returns {number} qty
    */
-  getAvailableQty: function(inventory) {
+  getAvailableQty: function (inventory) {
     if (!inventory || (!inventory.hasOwnProperty('backOrdered')
       || !inventory.hasOwnProperty('atpQty') || !inventory.hasOwnProperty('backOrderedQty'))) {
       return 0;
@@ -157,24 +163,6 @@ const ProductData = {
     return inventory.atpQty;
   },
 
-  /**
-   * Get backorder date for normal, kit, bundle product
-   * @param {*} product
-   * @returns {number} backOrderDate
-   */
-  getBackOrderDate: function(product) {
-
-    if ((product.type === productTypes.kit || product.type === productTypes.bundle) && product.childSkus) {
-
-      //return max epoch time since childSkus already mapped in fetchChildSkus
-      if (product.childSkus.some(sku => sku.inventory && sku.inventory.backOrderDate)) {
-        return Math.max(...product.childSkus.map(sku => sku.inventory.backOrderDate || 0));
-      }
-    }
-
-    return mapBackOrderDate(product);
-  },
-
   /**
    * Map product variant
    * @todo remove unnecessary fields and do code refactoring
@@ -325,7 +313,7 @@ const ProductData = {
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
       "division": eqVariant.properties.division,
-      "backOrderDate": this.getBackOrderDate(eqVariant),
+      "backOrderDate": null,
       "locallyProduced": false,
       "agelocme": null,
       "count": "",
@@ -510,7 +498,7 @@ const ProductData = {
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),
           "division": productData.properties.division,
-          "backOrderDate": this.getBackOrderDate(product),
+          "backOrderDate": null,
           "locallyProduced": false,
           "agelocme": null,
           "count": "",

package/src/productGraphQL.js

@@ -0,0 +1,43 @@
+"use strict";
+//const { getConfiguration, getCachedConfigurations } = require('@nuskin/configuration-sdk');
+const axios = require("axios");
+//const Product = require("./product");
+const getProductGql = require('./graphQl/query')
+
+
+const ProductGraphQL = {
+  getProductFromGraphQL: async function (sku) {
+
+    let data = JSON.stringify({
+      query: getProductGql,
+      variables: { "market": "us", "language": "en", "id": sku, "useContentSource": null, "quantity": 1, "okta": null }
+    });
+
+    let axiosGqlConfig = {
+      method: 'post',
+      url: 'https://product.api.test.nuskin.com/graphql',
+      headers: {
+        'authority': 'product.api.test.nuskin.com',
+        'accept': '*/*',
+        'accept-language': 'en-US,en;q=0.9',
+        'content-type': 'application/json',
+        'origin': 'https://mysite.test.mynuskin.com',
+        'referer': 'https://mysite.test.mynuskin.com/'
+
+      },
+      data: data
+    };
+
+    axios.request(axiosGqlConfig)
+      .then((response) => {
+        return response.data
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+
+  }
+
+}
+
+module.exports = ProductGraphQL