@nuskin/ns-product-lib 2.12.0 → 2.13.0-cx24-5107.2

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [2.13.0-cx24-5107.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.13.0-cx24-5107.1...v2.13.0-cx24-5107.2) (2023-09-28)
+
+
+### Fix
+
+* empty productById ([e4e455c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e4e455c34bae3558a429e4cce7c3226517ed6631))
+
+# [2.13.0-cx24-5107.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.12.0...v2.13.0-cx24-5107.1) (2023-09-28)
+
+
+### Fix
+
+* directory issue on jest ([41f8afa](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/41f8afa725923b472e33da741874e7ae9feeea73))
+* file directory issue ([568d935](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/568d935f7575dfe18a33cd430d01e17ed3020080))
+* kit and bundle ([5a4f13d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5a4f13d10ab87fa5ebfbe549ecb3df0c803f2296))
+* linter ([1bf15af](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1bf15afee64c0db411e794c5c3181ecbcbf64893))
+* linter error (#CX24-5107) ([03f5abc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/03f5abcd4940a91c2c04665b24e460813894eeba)), closes [#CX24-5107](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-5107)
+* multi variants ([33ccfdd](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/33ccfdd979e4c229e82814e8b3a0aa93c7a1e14a))
+* odd space in require ([f242b4d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f242b4dc696de968607b3c14340c60c3e7baa898))
+* remove old code ([461e70e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/461e70e1a4d5b1507c940a32bd6c645d5e3f8fef))
+* sonar qube issue ([461a4b9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/461a4b9007390608ba99b182ef698cc0cd1922cc))
+* unit testing ([cda18ce](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/cda18ce61a0e411df889a2d2939898c54aba6c36))
+* unitest issue in pipeline ([48b99f3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/48b99f375d1f357f6c5e906a00a09f3ad31042e4))
+
+### Update
+
+* use graphql for product data (#CX24-5092) ([9e13973](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e139736e08eea59707164dec78ee4dc9542d4ec)), closes [#CX24-5092](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-5092)
+
 # [2.12.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.11.0...v2.12.0) (2023-09-22)
 
 

package/package.json

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

package/src/graph-ql/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/graph-ql/graphQlUrl.js

@@ -0,0 +1,32 @@
+const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
+
+const config = {
+  dev: {
+    url: 'https://test.nuskin.com/product-api/graphql',
+    env: 'dev'
+  },
+  test: {
+    url: 'https://test.nuskin.com/product-api/graphql',
+    env: 'test'
+  },
+  prod: {
+    url: 'https://nuskin.com/product-api/graphql',
+    env: 'public'
+  }
+};
+
+/**
+ * Get product-api graphQL base URL based on web URL
+ * @returns {string} baseUrl (default: prod env url )
+ */
+function graphQlUrl () {
+  const env = getEnvironmentFromUrl(window.location.host);
+
+  if (!config[env]) {
+    return config['prod'].url;
+  }
+
+  return config[env].url;
+}
+
+module.exports = graphQlUrl;

package/src/graph-ql/index.js

@@ -0,0 +1,7 @@
+const getProduct = require('./product');
+const graphQlUrl = require('./graphQlUrl');
+
+module.exports = {
+  getProduct,
+  getGraphQlUrl: graphQlUrl
+}

package/src/graph-ql/product.js

@@ -0,0 +1,418 @@
+const axios = require('axios');
+const { getProductByIdQuery } = require('./query');
+const getGraphQlUrl  = require('./graphQlUrl')
+const ProductStatus = require("../models/productStatus");
+const  CustomerTypes  = require('./customerTypes');
+const Product = require("../product");
+
+const defaultPayload = {
+  operationName: "getProduct",
+  useContentSource: "CS"
+};
+
+/**
+ * graphQl Http request
+ * @param {obj} payload
+ * @returns {Promise}
+ */
+const graphQlHttpRequest = (payload) => {
+  const url = getGraphQlUrl();
+  return  axios.request({
+    method: 'post',
+    url: url,
+    data: payload,
+    responseType: 'json'
+  });
+
+}
+
+/**
+ * Get product by ID
+ * @todo map promotions coming from promotions API
+ * @param {string} id
+ * @param {string} market
+ * @param {string} locale
+ * @param {obj} config
+ */
+async function getProduct(id, market, locale, config) {
+
+  const productData = {
+    products: [],
+    count: 0
+  };
+
+  const payload = {
+    ...defaultPayload,
+    query: getProductByIdQuery,
+    variables: { id, market, locale }
+  }
+
+  try {
+    const { data } =  await graphQlHttpRequest(payload);
+    if (data.productById) {
+      const  product = mapProduct(data.productById, market, locale, config);
+      productData.products.push(new Product(product));
+    }
+  } catch (e) {
+    console.log(e);
+  }
+
+  return {
+    data: {
+      "status": 200,
+      "messages": [],
+      "data": productData
+    }
+  };
+}
+
+/**
+ *
+ * Map product data to be product card consumable structure *
+ * @param {object} product
+ * @param {string} market
+ * @param {string} locale
+ * @param {object} config
+ * @returns {object} Product
+ */
+function mapProduct(product, market, locale, config) {
+  const kitBundleProducts = product.bundle;
+  let variants =  product.variants || [];
+
+  const promotions = getPromotions(config);
+
+  if (kitBundleProducts) {
+
+    //merge kitBundleProducts and bundle attribute level
+    //since bundle level has totalPrice,availableChannels, etc
+    variants.push({
+      ...product,
+      ...kitBundleProducts,
+      productDetails: {
+        description: product.description
+      }
+    });
+  }
+
+  //serves as parent
+  const defaultVariant = variants[0];
+  const productDetail = {
+    "sku": defaultVariant.sku  || product.id,
+    "globalProductID":product.id,
+    "title": defaultVariant.title,
+    "country": market,
+    "language": locale,
+    "shortDescr": defaultVariant.description,
+    "longDescr": defaultVariant.productDetails.description,
+    "fullImage": defaultVariant.productImages[0].url,
+    "imageAltText": defaultVariant.productImages[0].alt,
+    "thumbnail": defaultVariant.productImages[0].thumbnail,
+    "ingredients": defaultVariant.ingredients,
+    "benefits": defaultVariant.benefits,
+    "usage": defaultVariant.usage,
+    "resources": defaultVariant.resoruces,
+    "availableQuantity": defaultVariant.availableQuantity,
+    "maxQuantity": defaultVariant.maxQuantity,
+    "points": "",
+    "cv": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0,
+    "pv": (defaultVariant.points) ? defaultVariant.points.wholesale.pv : 0,
+    "priceType": "WRTL",
+    "price": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.retail : defaultVariant.price.retail,
+    "priceMap": {
+      "WRTL": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.retail : defaultVariant.price.retail,
+      "WADW-WRTL": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.retailSubscription : defaultVariant.price.retail,
+      "WADR": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.retailSubscription : defaultVariant.price.retailSubscription, //retail ADR (subscription) price
+      "RTL": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.retail : defaultVariant.price.retail,
+      "WWHL": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.wholesale : defaultVariant.price.wholesale,
+      "WADW": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.wholesaleSubscription : defaultVariant.price.wholesaleSubscription,//wholesale ADR (subscription price)
+      "WHL": (defaultVariant.totalPrice) ? defaultVariant.totalPrice.wholesale : defaultVariant.price.wholesale
+    },
+    "cvMap": {
+      "WWHL": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0,
+      "WADW": (defaultVariant.points) ? defaultVariant.points.subscription.cv : 0,
+      "WHL": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0
+    },
+    "pvMap": {
+      "WWHL": (defaultVariant.points) ? defaultVariant.points.wholesale.pv : 0,
+      "WADW": (defaultVariant.points) ? defaultVariant.points.subscription.pv : 0,
+      "WHL": (defaultVariant.points) ? defaultVariant.points.wholesale.pv : 0
+    },
+    "orderTypes": mapOrderTypes(defaultVariant.availableChannels, defaultVariant.purchaseTypes),
+    "custTypes": mapCustomerTypes(defaultVariant.customerTypes),
+    "backOrderDate": defaultVariant.status.backorderedAvailableDate,
+    "size": defaultVariant.size,
+    "status": mapProductStatus(defaultVariant.status.status),
+    "variantType": "Other",
+    "variantDropdownLabel": product.variantSelectLabel || '',
+    "variantDropdownPlaceholder": "Select Type",
+    "variantsLabel": defaultVariant.variantLabel || '',
+    "groupOffer": false,
+    "personalOffer": false,
+    "savedEventName": '',
+    "salesLabel": '',
+    "eventName": promotions,
+    "sizeWeight": '',
+    "nettoWeight": "",
+    "searchScore": 0,
+    "isExclusive": defaultVariant.isExclusive || false,
+    "equinoxProductId": product.id,
+    "properties": {}
+
+  }
+
+  if (variants) {
+    productDetail.variants = mapVariants(product);
+  }
+
+  if (kitBundleProducts) {
+
+    //assemble childSku
+    //1st elememt should be parent product
+    productDetail.childSkus = [
+      {
+        availableChannels: kitBundleProducts.availableChannels,
+        productId: product.id,
+        skuId: product.id,
+        type: kitBundleProducts.type
+      },
+      ...mapChildSKU(kitBundleProducts)
+    ];
+  }
+
+  return productDetail;
+}
+
+/**
+ * Map product variants
+ * @param {*} product
+ * @returns {Array<object>}  productVariants
+ */
+function mapVariants(product) {
+
+  //return if it  is not multi variant
+  if (!product.variants || (product.variants && product.variants.length === 1)) {
+    return [];
+  }
+
+  const variants = [];
+
+  product.variants.forEach(variant => {
+    const sku = variant.sku || variant.id;
+    variants[sku] =   {
+      "sku": sku,
+      "globalProductID": product.id || variant.globalId,
+      "title": variant.title,
+      "shortDescr": variant.description,
+      "longDescr": variant.productDetails.description,
+      "fullImage": variant.productImages[0].url,
+      "imageAltText": variant.productImages[0].alt,
+      "thumbnail": variant.productImages[0].thumbnail,
+      "ingredients": variant.ingredients,
+      "benefits": variant.benefits,
+      "usage": variant.usage,
+      "resources": variant.resoruces,
+      "availableQuantity": variant.availableQuantity,
+      "maxQuantity": variant.maxQuantity,
+      "points": "",
+      "cv": (variant.points) ? variant.points.wholesale.cv : 0,
+      "pv": (variant.points) ? variant.points.wholesale.pv : 0,
+      "priceType": "WRTL",
+      "price": (variant.totalPrice) ? variant.totalPrice.retail : variant.price.retail,
+      "priceMap": {
+        "WRTL": (variant.totalPrice) ? variant.totalPrice.retail : variant.price.retail,
+        "WADW-WRTL": (variant.totalPrice) ? variant.totalPrice.retailSubscription : variant.price.retail,
+        "WADR": (variant.totalPrice) ? variant.totalPrice.retailSubscription : variant.price.retailSubscription, //retail ADR (subscription) price
+        "RTL": (variant.totalPrice) ? variant.totalPrice.retail : variant.price.retail,
+        "WWHL": (variant.totalPrice) ? variant.totalPrice.wholesale : variant.price.wholesale,
+        "WADW": (variant.totalPrice) ? variant.totalPrice.wholesaleSubscription : variant.price.wholesaleSubscription,//wholesale ADR (subscription price)
+        "WHL": (variant.totalPrice) ? variant.totalPrice.wholesale : variant.price.wholesale
+      },
+      "cvMap": {
+        "WWHL": (variant.points) ? variant.points.wholesale.cv : 0,
+        "WADW": (variant.points) ? variant.points.subscription.cv : 0,
+        "WHL": (variant.points) ? variant.points.wholesale.cv : 0
+      },
+      "pvMap": {
+        "WWHL": (variant.points) ? variant.points.wholesale.pv : 0,
+        "WADW": (variant.points) ? variant.points.subscription.pv : 0,
+        "WHL": (variant.points) ? variant.points.wholesale.pv : 0
+      },
+      "orderTypes": mapOrderTypes(variant.availableChannels, variant.purchaseTypes),
+      "custTypes": mapCustomerTypes(variant.customerTypes),
+      "backOrderDate": variant.status.backorderedAvailableDate,
+      "size": variant.size,
+      "status": mapProductStatus(variant.status.status),
+      "variantType": "Other",
+      "variantDropdownLabel": product.variantSelectLabel || '',
+      "variantDropdownPlaceholder": "Select Type",
+      "variantsLabel": variant.variantLabel || '',
+      "variants": [],
+      "groupOffer": false,
+      "personalOffer": false,
+      "savedEventName": '',
+      "salesLabel": '',
+      "eventName": '',
+      "sizeWeight": '',
+      "nettoWeight": "",
+      "searchScore": 0,
+      "isExclusive": variant.isExclusive || false,
+      "equinoxProductId": product.id,
+      "properties": {}
+    }
+  });
+
+  return variants;
+}
+
+/**
+ * Get promotions
+ * @todo use promotions API
+ * @param {*} config
+ * @returns {object} promotion
+ */
+function getPromotions(config) {
+  console.log(`config `, config);
+  return 'event-name';
+}
+
+/**
+ * map product kit bundle child SKUs
+ * @param {*} kitBundleProducts
+ * @returns {array} kitBundleProducts
+ */
+function mapChildSKU(kitBundleProducts) {
+  if (!kitBundleProducts || !kitBundleProducts.kitProducts) {
+    return [];
+  }
+
+  return kitBundleProducts.kitProducts.map((kitProduct) => {
+    const { product } = kitProduct;
+    const defaultVariant  = product.variants[0];
+    return {
+      productId: product.id,
+      skuId: defaultVariant.sku,
+      type: 'MANDATORY',
+      skuQuantity: kitProduct.quantity,
+      availableChannels: kitBundleProducts.availableChannels,
+      inventory: {
+        atpQty: defaultVariant.availableQuantity,
+        backOrdered: defaultVariant.status.isBackordered,
+        backOrderedQty: defaultVariant.availableQuantity
+      }
+    }
+  });
+}
+
+/**
+ * map EQ customer types to supported product card customer types
+ * @param {Array<string>} eqCustomerTypes
+ * @returns{string} customer types
+ */
+function mapCustomerTypes(eqCustomerTypes) {
+  if (!eqCustomerTypes) {
+    return "";
+  }
+
+  const custTypes = eqCustomerTypes;
+
+  let newCustType = [];
+  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()
+}
+
+/**
+ * Map Order Types
+ * @param {Array<string>} availableChannels
+ * @param {object} purchaseTypes
+ * @returns {object} orderTypes
+ */
+function mapOrderTypes(availableChannels, purchaseTypes) {
+
+  let orderTypes = {
+    "adr": false,
+    "order": false,
+    "zpfc": false,
+    "zadp": false,
+    "ars": false,
+    "kiosk": false,
+    "mobile": false,
+    "preferred customer": false,
+    "retail": false,
+    "web": false,
+    "web display": false
+  };
+
+  if (availableChannels) {
+    let availableChannelsArr = Array.isArray(availableChannels) ? availableChannels : availableChannels.split(',');
+
+    availableChannelsArr.forEach(channel => {
+      if (channel == 'arsPhone')
+        orderTypes.ars = true
+      if (channel == 'web') {
+        orderTypes.order = true
+        orderTypes.web = true
+      }
+      if (channel == 'kiosk')
+        orderTypes.kiosk = true
+      if (channel == 'mobile')
+        orderTypes.mobile = true
+      if (channel == 'subscription')
+        orderTypes.adr = true
+    });
+  }
+
+  if (purchaseTypes && purchaseTypes.buyOnce) {
+    orderTypes.web = true
+    orderTypes.order = true
+  }
+  if (purchaseTypes && purchaseTypes.subscription) {
+    orderTypes.adr = true
+  }
+
+  return orderTypes;
+}
+
+/**
+ * Map product status from Equinox format to Product card format
+ * @param {string} status
+ * @returns {string} status
+ */
+function mapProductStatus (status) {
+  const { equinoxStatus } = ProductStatus;
+  let newStatus = '';
+  switch (status.toLowerCase()) {
+    case equinoxStatus.SELLABLE:
+      newStatus = ProductStatus.ReleasedForSale;
+      break;
+    case equinoxStatus.PREVIEW_PRODUCT:
+      newStatus = ProductStatus.NotReleasedForSale;
+      break;
+    case equinoxStatus.DISCONTINUED:
+      newStatus = ProductStatus.Discontinued;
+      break;
+    case equinoxStatus.STOPPED:
+      newStatus = ProductStatus.Discontinued;
+      break;
+    case equinoxStatus.REPLACEMENT:
+      newStatus = ProductStatus.NotReleasedForSale;
+      break;
+    default:
+      newStatus = ProductStatus.NotReleasedForSale;
+      break;
+  }
+
+  return newStatus;
+}
+
+module.exports = getProduct;

package/src/graph-ql/query.js

@@ -0,0 +1,535 @@
+"use strict";
+
+// eslint-disable-next-line max-len
+const getProductByIdQuery = `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
+    globalId
+    slug
+    variantLabel
+    variantColor
+    availableChannels
+    availableQuantity
+    customerTypes
+    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 = {
+  getProductByIdQuery
+};

package/src/productData.js

@@ -7,7 +7,7 @@ const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
 const { mapBackOrderDate, mapAvailableQuantity, mapChildSKU, mapChildSKUBundle } = require('./equinox-helpers');
 const { productNotFoundInterceptor } = require('./equinox-helpers/interceptors');
-
+const { getProduct } = require('./graph-ql');
 const productTypes = {
   kit: 'kit',
   bundle: 'bundle'
@@ -19,19 +19,16 @@ const ProductData = {
    * @param {string[]} skus
    * @param {string} locale
    * @param {string} market
-   * @param {boolean} isEquinoxEnabled
    */
-  getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
+  getProductData: async function (skus, locale, market) {
     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;
+    if (config.active) {
+      return await getProduct(skus[0], market, locale, config);
+    } else {
+      return await this.getProductFromLegacy(skus, localeMarket);
     }
-    return await this.getProductFromLegacy(skus, localeMarket);
   },
 
   getProductFromEquinox: async function (skus, locale, config) {
@@ -60,7 +57,8 @@ const ProductData = {
 
     const shoppingContext = window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext();
 
-    if ((shoppingContext && shoppingContext.context === 'storefront') || window.location.hostname.includes(".mynuskin.com")) {
+    if ((shoppingContext && shoppingContext.context === 'storefront')
+    || window.location.hostname.includes(".mynuskin.com")) {
       config.API_Base_URLs = config.MySite_API_Base_URLs
     }