@nuskin/cs-product-lib 1.4.3 → 1.4.5-pa-893.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.4.3",
+  "version": "1.4.5-pa-893.1",
   "description": "Library for pulling and parsing product content (and applying business logic) retrieved from Contentstack",
   "main": "src/index.js",
   "scripts": {

package/src/csProduct.js

@@ -201,9 +201,9 @@ const csProduct = (props) => {
         }
     }
 
-    const formatProductWithSchema = (products = []) => {
+    const formatProductWithSchema = (products = [], status = {}) => {
         return products?.map((product) => {
-            const formattedProduct = formatProduct(product, homeUrl)
+            const formattedProduct = formatProduct(product, homeUrl, status)
             formattedProduct.variants = formattedProduct?.variants?.map(
                 (variant) => formatVariant(variant)
             )
@@ -431,6 +431,21 @@ const csProduct = (props) => {
         return bundles && bundles[0] ? bundles[0] : null
     }
 
+    const getAllBundleIds = (products) => {
+        const bundleIds = [];
+        
+        products.forEach(product => {
+            if (product.bundle) {
+                product.bundle.forEach(bundle => {
+                    // Bundle ID
+                    if (bundle.id) bundleIds.push(bundle.id);
+                });
+            }
+        });
+        
+        return [...new Set(bundleIds)]; // Remove duplicates
+    };
+
     /**
      * 
      * @deprecated use getProductsByUID instead
@@ -454,7 +469,8 @@ const csProduct = (props) => {
             const translations = await getTranslations(locale)
             await formatKit(products, locale, translations)
             await removeInvalidVariants(products, locale, translations)
-            return formatProductWithSchema(products)
+            const status = await getProductStatus(getAllBundleIds(products), helpers?.reorderLocale(locale), homeUrl, awsBase, clientId)
+            return formatProductWithSchema(products, status)
         }
         const errorResponse = products.response || {}
         const responseData = errorResponse.data || {}

package/src/formatKit.js

@@ -2,7 +2,34 @@ const { isNullOrEmpty, isTrue } = require('@nuskin/ns-common-lib');
 const { formatDiscounts } = require('./helpers/formatDiscounts');
 const moment = require('moment')
 
-const parsePrice = (product = []) => {
+const parsePrice = (product = [], status = {}) => {
+    const first = product[0] || {}
+    if (first?.type === 'kit') {
+        const kitStatus = status[first?.id]
+        if (kitStatus) {
+            return {
+                price: {
+                    retail: kitStatus?.pricing?.retail?.webOrder?.price || kitStatus?.pricing?.retail?.order?.price,
+                    retailSubscription: kitStatus?.pricing?.retail?.webAdr?.price,
+                    wholesale: kitStatus?.pricing?.wholesale?.webOrder?.price || kitStatus?.pricing?.wholesale?.order?.price,
+                    wholesaleSubscription: kitStatus?.pricing?.wholesale?.webAdr?.price
+                },
+                points: {
+                    subscription: {
+                        cv: kitStatus?.pricing?.wholesale?.webAdr?.cv || 0,
+                        pv: kitStatus?.pricing?.wholesale?.webAdr?.pv || 0,
+                        sb: kitStatus?.pricing?.wholesale?.webAdr?.sb || 0
+                    },
+                    wholesale: {
+                        cv: kitStatus?.pricing?.wholesale?.webOrder?.cv || kitStatus?.pricing?.wholesale?.order?.cv || 0,
+                        pv: kitStatus?.pricing?.wholesale?.webOrder?.pv || kitStatus?.pricing?.wholesale?.order?.pv || 0,
+                        sb: kitStatus?.pricing?.wholesale?.webOrder?.sb || kitStatus?.pricing?.wholesale?.order?.sb || 0
+                    }
+                }
+            }
+        }
+    }
+
     const requiredProducts = !isNullOrEmpty(product)
         ? product?.map((p) => p?.requiredProducts).flat()
         : []
@@ -155,7 +182,7 @@ const getKitOrBundleDetails = (bundle) => {
     return {status: bundle?.status?.status, maxQty, backOrderedQty, availableQty, latestBackOrderedDate}
 }
 
-const parseKit = (bundle, market) => {
+const parseKit = (bundle, market, status) => {
     const kits = {}
     const [properties] = !isNullOrEmpty(bundle) ? bundle : []
     kits.id = properties?.id
@@ -172,7 +199,7 @@ const parseKit = (bundle, market) => {
     kits.excludeFromSearch = isTrue(properties?.excludeFromSearch)
     kits.isExclusive = isTrue(properties?.isExclusive)
     kits.marketAttributes = properties?.marketAttributes
-    const priceData = parsePrice(bundle)
+    const priceData = parsePrice(bundle, status)
     kits.points = priceData?.points
     kits.price = priceData?.price
     kits.purchaseTypes = {
@@ -241,14 +268,14 @@ const parseKit = (bundle, market) => {
     return kits
 }
 
-const formatKit = (product, market) => {
+const formatKit = (product, market, status) => {
     if (!product) {
         return {}
     }
 
     let kit = null
     if (['kit', 'bundle'].includes(product?.type)) {
-        kit = parseKit(product?.bundle, market)
+        kit = parseKit(product?.bundle, market, status)
     }
 
     return {

package/src/formatProduct.js

@@ -3,7 +3,7 @@ const entities = require('entities')
 const { formatKit } = require('./formatKit')
 
 /* istanbul ignore next */
-const formatProduct = (parent, homeUrl) => {
+const formatProduct = (parent, homeUrl, status) => {
     const formattedProduct = {
         // Each value is a function with a parameter 'parent' that is the current instance of a Product
         // ContentStack references need to be queried separately (ie: variants)
@@ -80,7 +80,7 @@ const formatProduct = (parent, homeUrl) => {
         crossProductIds: helpers?.mapCrossProductIds(parent)
     }
     if (parent.bundle || (parent.sku_kit && parent.sku_kit.length > 0) || (parent.product_bundle && parent.product_bundle.length > 0)) {
-        return formatKit(formattedProduct)
+        return formatKit(formattedProduct, null, status)
     } else {
         return formattedProduct
     }

package/src/helpers.js

@@ -569,6 +569,25 @@ function mapLink(link) {
     return (link || {}).href ? { url: link.href, text: link.title || '' } : null
 }
 
+function convertDescription(description) {
+    if (description?.uid && !(description?.children && description?.type)) {
+        description = null
+    } else {
+        description = createMarkdown(
+            description && description.type ? description : null,
+            description
+        )
+    }
+    description =
+        description?.type ||
+        description === '' ||
+        description === 'undefined' ||
+        description === null
+            ? null
+            : [description]
+    return description
+}
+
 function mapProductDetails(productOrVariant) {
     const productDetails = (productOrVariant || {}).product_details || {}
     if ((productOrVariant?.long_description_override || []).length > 0) {
@@ -578,24 +597,10 @@ function mapProductDetails(productOrVariant) {
     if ((productOrVariant?.included_items_override || []).length > 0) {
         productDetails.included_items = productOrVariant?.included_items_override
     }
-    let description = productDetails.long_description
-    if (!Array.isArray(description)) {
-        if (description?.uid && !(description?.children && description?.type)) {
-            description = null
-        } else {
-            description = createMarkdown(
-                description && description.type ? description : null,
-                description
-            )
-        }
-        description =
-            description?.type ||
-            description === '' ||
-            description === 'undefined' ||
-            description === null
-                ? []
-                : [description]
-    }
+    let longDescription = productDetails.long_description
+    if (!Array.isArray(longDescription)) { longDescription = convertDescription(longDescription) }
+    let description = convertDescription(productDetails.description)    
+
     const includedItems = productDetails.included_items
     const highlights = (productDetails.highlights || []).map((highlight) => ({
         iconUrl: !isNullOrEmpty(highlight?.icon_bynder)
@@ -607,7 +612,7 @@ function mapProductDetails(productOrVariant) {
     const importer = productDetails.importer
     const warnings = productDetails.warnings
     return {
-        description: decodeHTML(description),
+        description: decodeHTML(description || longDescription || []),
         includedItems: decodeHTML(includedItems),
         highlights,
         originCountry,