@nuskin/ns-product-lib 2.17.2-cx24-7003.1 → 2.18.0-brw-4218.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.17.2-cx24-7003.1",
+  "version": "2.18.0-brw-4218.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,8 @@
     "@nuskin/configuration-sdk": "2.3.2",
     "@nuskin/ns-common-lib": "1.4.7",
     "@nuskin/ns-util": "4.5.4",
-    "axios": ">=1.6.5",
+    "@nuskin/product-lib": "2.2.0-brw-4218.1",
+    "axios": "1.6.7",
     "axios-mock-adapter": "1.21.2",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
@@ -38,7 +39,7 @@
     "@nuskin/configuration-sdk": "2.x",
     "@nuskin/ns-common-lib": "1.x",
     "@nuskin/ns-util": "4.x",
-    "axios": ">=1.6.5"
+    "axios": "1.6.7"
   },
   "dependencies": {
     "qs": "6.11.0"

package/src/graph-ql/product.js

@@ -1,34 +1,7 @@
-const axios = require('axios').default;
-const { getProductByIdQuery , getProductsByIdQuery } = require('./query');
 const ProductStatus = require("../models/productStatus");
 const CustomerTypes = require('./customerTypes');
 const Product = require("../product");
-const {
-  mapWholesalePrice,
-  mapRetailPrice,
-  mapRetailSubscriptionPrice,
-  mapWholesaleSubscriptionPrice,
-  mapOriginalPrice
-} = require('./mappers');
-
-const defaultPayload = {
-  operationName: "getProduct"
-};
-
-/**
- * graphQl Http request
- * @param {obj} payload
- * @returns {Promise}
- */
-async function graphQlHttpRequest(payload, config) {
-  const url = config.graphqlUrl
-  return await axios.request({
-    method: 'post',
-    url: url,
-    data: payload,
-    responseType: 'json'
-  });
-}
+const {productLib} = require('@nuskin/product-lib');
 
 /**
  * Get product by ID
@@ -45,28 +18,21 @@ async function getProduct(id, market, locale, config) {
     count: 0
   };
 
-  const okta = parseOktaObject(sessionStorage.oktaTokens);
-
-  const payload = {
-    ...defaultPayload,
-    query: getProductByIdQuery,
-    variables: {
-      id,
-      market,
-      locale,
-      ...(okta !== null && { okta }),
-      quantity: 1 // set default to 1
-    }
-  }
+  const okta = typeof sessionStorage !== 'undefined' ? parseOktaObject(sessionStorage.oktaTokens) : null;
 
   try {
-    const { data } = await graphQlHttpRequest(payload, config);
-
-    if (data && data.data && data.data.productById) {
+    const data = await productLib.getProduct({
+      fromId: id,
+      market: market,
+      language: locale,
+      env: config.graphqlUrl.includes('test') ? 'test' : config.graphqlUrl.includes('dev') ? 'dev' : 'prod',
+      okta
+    });
 
+    if (data && data.data) {
       //use to get default variant based on requested sku
       config.sku = id;
-      const product = mapProduct(data.data.productById, market, locale, config);
+      const product = mapProduct(data.data, market, locale, config);
       productData.products.push(new Product(product));
       productData.count = productData.products.length;
     }
@@ -99,30 +65,24 @@ async function getProducts(ids, market, locale, config) {
     count: 0
   };
 
-  const okta = parseOktaObject(sessionStorage.oktaTokens);
-
-  const payload = {
-    operationName: "getProducts",
-    query: getProductsByIdQuery,
-    variables: {
-      ids,
-      market,
-      language: locale,
-      ...(okta !== null && { okta }),
-      quantity: 1 // set default to 1
-    }
-  }
+  const okta = typeof sessionStorage !== 'undefined' ? parseOktaObject(sessionStorage.oktaTokens) : null;
 
   try {
-    const { data } = await graphQlHttpRequest(payload, config);
-    const mappedProducts = mapSkusToProducts(ids,data);
-    //use to get default variant based on requested sku
-    mappedProducts.forEach(({sku , product})=>{
-      config.sku = sku;
-      const newProduct = mapProduct(product, market, locale, config);
-      productsData.products.push(new Product(newProduct));
-    });
-    productsData.count = productsData.products.length;
+    const data = await productLib.getProductsById(
+      ids, market, locale, 
+      null, 1, okta, 
+      config.graphqlUrl.includes('test') ? 'test' : config.graphqlUrl.includes('dev') ? 'dev' : 'prod'
+    );
+    if (data && data.products) {
+      const mappedProducts = mapSkusToProducts(ids,data.products);
+      //use to get default variant based on requested sku
+      mappedProducts.forEach(({sku , product})=>{
+        config.sku = sku;
+        const newProduct = mapProduct(product, market, locale, config);
+        productsData.products.push(new Product(newProduct));
+      });
+      productsData.count = productsData.products.length;
+    }
   } catch (e) {
     console.log(`Unable to fetch products details for SKUs ${ids}`);
   }
@@ -143,15 +103,11 @@ async function getProducts(ids, market, locale, config) {
  * @param {any} products
  */
 
-function mapSkusToProducts(skus , products){
+function mapSkusToProducts(skus, products){
   const productsData = [];
-  if (products && 
-      products.data && 
-      products.data.productsById && 
-      products.data.productsById.products &&
-      products.data.productsById.products.length) {
+  if (products && products.length) {
     skus.forEach((sku)=>{
-      const matchedProducts = products.data.productsById.products.filter((product)=>{
+      const matchedProducts = products.filter((product)=>{
         let matched = false;
         if(product.id) {matched = product.id === sku;}
         if(product.variants.length){
@@ -170,33 +126,6 @@ function mapSkusToProducts(skus , products){
 
 }
 
-
-/**
- * Map product prices
- * @param {*} product
- * @param {boolean} isKitBundle
- * @return {obj} prices
- */
-function mapPrices(product, isKitBundle = false) {
-  const originalPrice = mapOriginalPrice(product, false, isKitBundle) || 0;
-  const retailPrice = mapRetailPrice(product) || 0;
-  const wholesalePrice = mapWholesalePrice(product) || 0;
-  const originalWholeSalePrice = mapOriginalPrice(product, true, isKitBundle) || 0;
-
-  //map subscription (ADR) prices
-  const retailSubscriptionPrice = mapRetailSubscriptionPrice(product) || 0;
-  const wholesaleSubscriptionPrice = mapWholesaleSubscriptionPrice(product) || 0;
-
-  return {
-    originalPrice,
-    originalWholeSalePrice,
-    retailPrice,
-    wholesalePrice,
-    retailSubscriptionPrice,
-    wholesaleSubscriptionPrice
-  }
-}
-
 /**
  *
  * Map product data to be product card consumable structure *
@@ -209,103 +138,87 @@ function mapPrices(product, isKitBundle = false) {
 // eslint-disable-next-line no-unused-vars
 function mapProduct(product, market, locale, config) {
   const kitBundleProducts = product.bundle;
-  let variants = product.variants || [];
-
-
-  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 = !kitBundleProducts ? product.variants.find(v => v.sku === config.sku) : variants[0];
-  const productImages = mapProductImages(defaultVariant);
-
-  const {
-    originalPrice,
-    retailPrice,
-    wholesalePrice,
-    retailSubscriptionPrice,
-    wholesaleSubscriptionPrice,
-    originalWholeSalePrice
-  } = mapPrices(defaultVariant, !!kitBundleProducts);
+  const defaultVariant = !kitBundleProducts ? product.variants.find(v => v.sku === config.sku) : null
+  const productImages = mapProductImages(product)
+  const kitOrVariant = !kitBundleProducts ? defaultVariant : kitBundleProducts
+  const productOrVariant = !kitBundleProducts ? defaultVariant : product
+  const pricing = kitOrVariant.price
+  const points = kitOrVariant.points
+  const isBackOrdered = kitOrVariant.status.inventory === 'backordered'
+  const promoData = mapPromos(kitOrVariant)
 
   const productDetail = {
-    "sku": defaultVariant.sku || product.id,
-    "globalProductID": product.id,
-    "title": defaultVariant.title,
+    "sku": !kitBundleProducts ? defaultVariant.sku : product.id,
+    "globalProductID": productOrVariant.globalId && productOrVariant.globalId !== productOrVariant.sku ? productOrVariant.globalId : productOrVariant.id,
+    "title": productOrVariant.title,
     "country": market,
     "language": locale,
-    "shortDescr": defaultVariant.description,
-    "longDescr": defaultVariant.productDetails.description,
+    "shortDescr": productOrVariant.description,
+    "longDescr": (productOrVariant.productDetails || {}).description,
     "fullImage": productImages.fullImage,
     "imageAltText": productImages.imageAltText,
     "thumbnail": productImages.thumbnail,
-    "ingredients": defaultVariant.ingredients,
-    "benefits": defaultVariant.benefits,
-    "usage": defaultVariant.usage,
-    "resources": defaultVariant.resoruces,
-    "availableQuantity": defaultVariant.availableQuantity,
-    "maxQuantity": defaultVariant.maxQuantity,
+    "ingredients": productOrVariant.ingredients,
+    "benefits": productOrVariant.benefits,
+    "usage": productOrVariant.usage,
+    "resources": productOrVariant.resources,
+    "availableQuantity": isBackOrdered ? kitOrVariant.backorderQuantity : kitOrVariant.atpQuantity,
+    "maxQuantity": kitOrVariant.maxQuantity,
     "points": "",
-    "cv": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0,
-    "pv": (defaultVariant.points) ? defaultVariant.points.wholesale.pv : 0,
+    "cv": points.wholesale ? points.wholesale.cv : 0,
+    "pv": points.wholesale ? points.wholesale.pv : 0,
     "priceType": "WRTL",
-    "price": originalPrice,
+    "price": pricing.retail,
     "priceMap": {
-      "WRTL": retailPrice,
-      "WADW-WRTL": retailSubscriptionPrice,
-      "WADR": retailSubscriptionPrice,
-      "RTL": originalPrice,
-      "WWHL": wholesalePrice,
-      "WADW": wholesaleSubscriptionPrice,
-      "WHL": originalWholeSalePrice
+      ...promoData.priceMap,
+      "ADR": pricing.retailSubscription,
+      "ADW": pricing.wholesaleSubscription,
+      "WRTL": pricing.retail,
+      "WADW-WRTL": pricing.retailSubscription,
+      "WADR": pricing.retailSubscription,
+      "RTL": pricing.retail,
+      "WWHL": pricing.wholesale,
+      "WADW": pricing.wholesaleSubscription,
+      "WHL": pricing.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
+      ...promoData.cvMap,
+      "WWHL": points.wholesale ? points.wholesale.cv : 0,
+      "WADW": points.subscription ? points.subscription.cv : 0,
+      "WHL": points.wholesale ? 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
+      ...promoData.pvMap,
+      "WWHL": points.wholesale ? points.wholesale.pv : 0,
+      "WADW": points.subscription ? points.subscription.pv : 0,
+      "WHL": points.wholesale ? 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),
+    "orderTypes": mapOrderTypes(kitOrVariant.availableChannels, kitOrVariant.purchaseTypes),
+    "custTypes": mapCustomerTypes(kitOrVariant.customerTypes),
+    "backOrderDate": kitOrVariant.backorderedAvailableDate,
+    "size": productOrVariant.size,
+    "status": mapProductStatus(kitOrVariant.status.status),
     "variantType": "Other",
     "variantDropdownLabel": product.variantSelectLabel || '',
     "variantDropdownPlaceholder": "Select Type",
-    "variantsLabel": defaultVariant.variantLabel || '',
+    "variantsLabel": productOrVariant.variantLabel || '',
     "groupOffer": false,
     "personalOffer": false,
     "savedEventName": '',
-    "salesLabel": mapPromos(defaultVariant, !!kitBundleProducts).message || '',
-    "eventName": mapPromos(defaultVariant, !!kitBundleProducts).offerId || '',
+    "salesLabel": promoData.message || '',
+    "eventName": promoData.offerId || '',
     "sizeWeight": '',
     "nettoWeight": "",
     "searchScore": 0,
-    "isExclusive": defaultVariant.isExclusive || false,
+    "isExclusive": kitOrVariant.isExclusive || false,
     "equinoxProductId": product.id,
-    "inventory": defaultVariant.status.isBackordered ? 'BACKORDER' : 'IN STOCK',
+    "inventory": isBackOrdered ? 'BACKORDER' : 'IN STOCK',
     "properties": {
-      isBackOrdered: defaultVariant.status.isBackordered,
-      inventoryStatus: defaultVariant.status.isBackordered ? 'BACKORDER' : 'IN STOCK',
-      productStatus: mapProductStatus(defaultVariant.status.status)
+      isBackOrdered: isBackOrdered,
+      inventoryStatus: isBackOrdered ? 'BACKORDER' : 'IN STOCK',
+      productStatus: mapProductStatus(kitOrVariant.status.status)
     }
-
   }
 
   //map only if it is normal product
@@ -350,13 +263,10 @@ function mapVariants(product) {
     const sku = variant.sku || variant.id;
 
     const productImages = mapProductImages(variant);
-    const {
-      originalPrice,
-      retailPrice,
-      wholesalePrice,
-      retailSubscriptionPrice,
-      wholesaleSubscriptionPrice
-    } = mapPrices(variant);
+    const pricing = variant.price
+    const points = variant.points
+    const isBackOrdered = variant.status.inventory === 'backordered'
+    const promoData = mapPromos(variant)
 
     variants[sku] = {
       "sku": sku,
@@ -374,28 +284,33 @@ function mapVariants(product) {
       "availableQuantity": variant.availableQuantity,
       "maxQuantity": variant.maxQuantity,
       "points": "",
-      "cv": (variant.points) ? variant.points.wholesale.cv : 0,
-      "pv": (variant.points) ? variant.points.wholesale.pv : 0,
+      "cv": points.wholesale ? points.wholesale.cv : 0,
+      "pv": points.wholesale ? points.wholesale.pv : 0,
       "priceType": "WRTL",
-      "price": originalPrice,
+      "price": pricing.retail,
       "priceMap": {
-        "WRTL": retailPrice,
-        "WADW-WRTL": retailSubscriptionPrice,
-        "WADR": retailSubscriptionPrice,
-        "RTL": retailPrice,
-        "WWHL": wholesalePrice,
-        "WADW": wholesaleSubscriptionPrice,
-        "WHL": wholesalePrice
+        ...promoData.priceMap,
+        "ADR": pricing.retailSubscription,
+        "ADW": pricing.wholesaleSubscription,
+        "WRTL": pricing.retail,
+        "WADW-WRTL": pricing.retailSubscription,
+        "WADR": pricing.retailSubscription,
+        "RTL": pricing.retail,
+        "WWHL": pricing.wholesale,
+        "WADW": pricing.wholesaleSubscription,
+        "WHL": pricing.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
+        ...promoData.cvMap,
+        "WWHL": points.wholesale ? points.wholesale.cv : 0,
+        "WADW": points.subscription ? points.subscription.cv : 0,
+        "WHL": points.wholesale ? 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
+        ...promoData.pvMap,
+        "WWHL": points.wholesale ? points.wholesale.pv : 0,
+        "WADW": points.subscription ? points.subscription.pv : 0,
+        "WHL": points.wholesale ? points.wholesale.pv : 0
       },
       "orderTypes": mapOrderTypes(variant.availableChannels, variant.purchaseTypes),
       "custTypes": mapCustomerTypes(variant.customerTypes),
@@ -417,10 +332,10 @@ function mapVariants(product) {
       "searchScore": 0,
       "isExclusive": variant.isExclusive || false,
       "equinoxProductId": product.id,
-      "inventory": variant.status.isBackordered ? 'BACKORDER' : 'IN STOCK', //@todo deprecate this since we can set properties.isBackOrdered
+      "inventory": isBackOrdered ? 'BACKORDER' : 'IN STOCK',
       "properties": {
-        isBackOrdered: variant.status.isBackordered,
-        inventoryStatus: variant.status.isBackordered ? 'BACKORDER' : 'IN STOCK',
+        isBackOrdered: isBackOrdered,
+        inventoryStatus: isBackOrdered ? 'BACKORDER' : 'IN STOCK',
         productStatus: mapProductStatus(variant.status.status)
       }
     }
@@ -438,44 +353,26 @@ function mapChildSKU(kitBundleProducts) {
   if (!kitBundleProducts || !kitBundleProducts.kitProducts) {
     return [];
   }
-  const personalOffer = sessionStorage.getItem('personalOffer') ? JSON.parse(sessionStorage.getItem('personalOffer')) : false
+
   return kitBundleProducts.kitProducts.map((kitProduct) => {
     const { product } = kitProduct;
-    if (product.variants.length > 1 && !personalOffer) {
-      return product.variants.map((variant) => {
-        return {
-          productId: product.id,
-          skuId: variant.sku,
-          type: 'MANDATORY',
-          skuQuantity: variant.availableQuantity,
-          // eslint-disable-next-line max-len
-          availableChannels: Array.isArray(kitBundleProducts.availableChannels) ? kitBundleProducts.availableChannels.join(',') : kitBundleProducts.availableChannels,
-          inventory: {
-            atpQty: variant.availableQuantity,
-            backOrdered: variant.status.isBackordered,
-            backOrderedQty: variant.availableQuantity
-          }
-        }
-      })
-    } else {
-      const defaultVariant = product.variants[0];
-      return {
-        productId: product.id,
-        skuId: defaultVariant.sku,
-        type: 'MANDATORY',
-        skuQuantity: kitProduct.quantity,
-        availableChannels: Array.isArray(kitBundleProducts.availableChannels) ? kitBundleProducts.availableChannels.join(',') : kitBundleProducts.availableChannels,
-        inventory: {
-          atpQty: defaultVariant.availableQuantity,
-          backOrdered: defaultVariant.status.isBackordered,
-          backOrderedQty: defaultVariant.availableQuantity
-        }
+    const defaultVariant = product.variants[0];
+    return {
+      productId: product.id,
+      skuId: defaultVariant.sku,
+      type: 'MANDATORY',
+      skuQuantity: kitProduct.quantity,
+      availableChannels: Array.isArray(kitBundleProducts.availableChannels) ? kitBundleProducts.availableChannels.join(',') : kitBundleProducts.availableChannels,
+      inventory: {
+        atpQty: defaultVariant.atpQuantity,
+        backOrdered: defaultVariant.status.inventory === 'backordered',
+        backOrderedQty: defaultVariant.backorderQuantity
       }
-  
     }
-  }).flat();
+  });
 }
 
+
 /**
  * map EQ customer types to supported product card customer types
  * @param {Array<string>} eqCustomerTypes
@@ -526,6 +423,12 @@ function mapProductImages(product) {
     productImages.fullImage = product.productImages[0].url || '';
     productImages.imageAltText = product.productImages[0].alt || '';
     productImages.thumbnail = product.productImages[0].thumbnail || '';
+  } else if (product.variants && product.variants.length) {
+    if (product.variants[0].productImages && product.variants[0].productImages.length) {
+      productImages.fullImage = product.variants[0].productImages[0].url || '';
+      productImages.imageAltText = product.variants[0].productImages[0].alt || '';
+      productImages.thumbnail = product.variants[0].productImages[0].thumbnail || '';
+    }
   }
 
   return productImages;
@@ -615,15 +518,56 @@ function mapProductStatus(status) {
   return newStatus;
 }
 
-function mapPromos(product, isKitBundle = false) {
-  if (isKitBundle) {
-    const { pricingJson } = product
-    const parsedPricing = JSON.parse(pricingJson)
-    const promotion = parsedPricing.promotion
-    return (promotion && promotion.length >= 1) ? { message: promotion[0].message, offerId: promotion[0].offerId } : { message: '', offerId: '' }
-  } else {
-    return { message: product.salesLabel || product.salesText, offerId: product.salesLabel || product.salesText }
+function mapPromos(product) {
+  if ((product.price.retailSales !== null && product.price.retailSales >= 0) || (product.price.wholesaleSales !== null && product.price.wholesaleSales >= 0)) {
+    if (product.pricingJson) {
+      const parsedPricing = JSON.parse(product.pricingJson)
+      const promotion = parsedPricing.promotion
+      if (promotion && promotion.length) {
+        const offerId = promotion[0].offerId || 'EQPROMO'
+        return { 
+          priceMap: {[`${offerId}-WRTL`]: product.price.retailSales, [`${offerId}-WWHL`]: product.price.wholesaleSales}, 
+          cvMap: {[`${offerId}-WWHL`]: product.points.wholesale.cv},
+          pvMap: {[`${offerId}-WWHL`]: product.points.wholesale.pv},
+          message: product.salesLabel || promotion[0].message, 
+          offerId
+        }
+      }
+      if (parsedPricing.retail) {
+        const filter = ['adr', 'order', 'webAdr', 'webOrder']
+        const priceMap = {}, cvMap = {}, pvMap = {}
+        const retailActiveEvents = Object.fromEntries(Object.entries(parsedPricing.retail).filter(([k]) => !filter.includes(k)));
+        const wholesaleActiveEvents = Object.fromEntries(Object.entries(parsedPricing.wholesale).filter(([k]) => !filter.includes(k)));
+        let offerId = null
+        for (const key in retailActiveEvents) {
+          if (Object.hasOwnProperty.call(retailActiveEvents, key)) {
+            priceMap[key+'-WRTL'] = retailActiveEvents[key].price;
+            offerId = offerId || key;
+          }
+        }
+        for (const key in wholesaleActiveEvents) {
+          if (Object.hasOwnProperty.call(wholesaleActiveEvents, key)) {
+            priceMap[key+'-WWHL'] = wholesaleActiveEvents[key].price;
+            cvMap[key+'-WWHL'] = wholesaleActiveEvents[key].cv;
+            pvMap[key+'-WWHL'] = wholesaleActiveEvents[key].pv;
+            offerId = offerId || key;
+          }
+        }
+        return { priceMap, cvMap, pvMap, message: product.salesLabel, offerId }
+      }
+
+    }
+    return { message: product.salesLabel, offerId: null, priceMap: {}, cvMap: {}, pvMap: {} }
   }
+  return {message: null, offerId: null}
+  // if (isKitBundle) {
+  //   const { pricingJson } = product
+  //   const parsedPricing = JSON.parse(pricingJson)
+  //   const promotion = parsedPricing.promotion
+  //   return (promotion && promotion.length >= 1) ? { message: promotion[0].message, offerId: promotion[0].offerId } : { message: '', offerId: '' }
+  // } else {
+  //   return { message: product.salesLabel || product.salesText, offerId: product.salesLabel || product.salesText }
+  // }
 
 }
 

package/src/productData.js

@@ -23,17 +23,13 @@ const ProductData = {
   getProductData: async function (skus, locale, market) {
     const localeMarket = `${locale}_${market}`;
 
+    // USE THESE TWO LINES FOR LOCAL TESTING INSTEAD OF const config alone
+    // let runConfig = { country: market, language: locale, environment: 'test', clientId: '66408e5bca6b4a59b2c7fc62b8c00a9f' };
+    // const config = (await getConfiguration(['Equinox_Markets'], runConfig)).Equinox_Markets;
     const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
-    if (config.active) {
-      return (config.MySite_graphql_active_list.includes(market)) ?
-        await getProducts(skus, market, locale, config) :
-        await this.getProductFromEquinox(skus, localeMarket, config)
-    } else {
-      return (config.MySite_graphql_active_list.includes(market)) ?
-        await getProducts(skus, market, locale, config) :
-        await this.getProductFromLegacy(skus, localeMarket);
-    }
-
+    return (config.MySite_graphql_active_list.includes(market)) ?
+      await getProducts(skus, market, locale, config) :
+      await this.getProductFromLegacy(skus, localeMarket);
   },
 
   getProductFromEquinox: async function (skus, locale, config) {

package/src/graph-ql/mappers/index.js

@@ -1,14 +0,0 @@
-
-const wholesalePrice = require('./wholesalePrice');
-const retailPrice = require('./retailPrice');
-const  retailSubscriptionPrice = require('./retailSubscriptionPrice')
-const  wholesaleSubscriptionPrice = require('./wholesaleSubscriptionPrice')
-const originalPrice  = require('./originalPrice');
-
-module.exports = {
-  mapWholesalePrice: wholesalePrice,
-  mapRetailPrice: retailPrice,
-  mapRetailSubscriptionPrice: retailSubscriptionPrice,
-  mapWholesaleSubscriptionPrice: wholesaleSubscriptionPrice,
-  mapOriginalPrice : originalPrice
-}

package/src/graph-ql/mappers/originalPrice.js

@@ -1,24 +0,0 @@
-
-
-/**
- * Map original price (set to retail)
- * use original price if product type is equal to kit/bundle
- * @param {obj} product
- * @param {boolean} isWholesale default === false
- * @param {boolean} isBundleKit default === false
- * @return {number} retailPrice
- */
-function  originalPrice(product, isWholesale = false, isBundleKit = false) {
-  const  { price, totalPrice } = product;
-  const productPrice  = price  ?  price : totalPrice;
-
-  if (isBundleKit) {
-
-    return isWholesale ? productPrice.wholesaleOriginal : productPrice.retailOriginal;
-  }
-
-  return isWholesale ? productPrice.wholesale : productPrice.retail;
-
-}
-
-module.exports  = originalPrice;

package/src/graph-ql/mappers/retailPrice.js

@@ -1,22 +0,0 @@
-
-
-/**
- * Map retail price
- * Map retailSales if it has sales/promotions
- * @param {obj} product
- * @return {number} retailPrice
- */
-function retailPrice(product) {
-  const  { price, totalPrice } = product;
-  const productPrice  = price  ?  price : totalPrice;
-
-  if (productPrice.retailSales) {
-
-    return productPrice.retailSales;
-  }
-
-  return  productPrice.retail;
-
-}
-
-module.exports  = retailPrice;