@nuskin/cs-product-lib 1.0.25-cx12-8656.3 → 1.0.25

package/package.json

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

package/src/csProduct.js

@@ -132,9 +132,6 @@ const csProduct = (props) => {
                         validVariants.push({
                             ...variant,
                             status: varStatus,
-                            backorderQuantity: varStatus?.backordered ? varStatus?.availableQuantity : 0,
-                            availableQuantity: varStatus?.backordered ? 0 : varStatus?.availableQuantity,
-                            backorderedAvailableDate: varStatus?.backorderedAvailableDate || null,
                             marketData
                         })
                     }
@@ -294,12 +291,14 @@ const csProduct = (props) => {
                             .length;
                         i++
                     ) {
-                        await removeInvalidVariants(
-                            products[p].product_bundle[b].required_products[i]
-                                .product,
-                            locale,
-                            translations
-                        )
+                        if (!noFormat) {
+                            await removeInvalidVariants(
+                                products[p].product_bundle[b].required_products[i]
+                                    .product,
+                                locale,
+                                translations
+                            )
+                        }
                     }
                     for (
                         let i = 0;

package/src/formatKit.js

@@ -16,40 +16,52 @@ const parseStatus = (variant) => {
     let backorderedAvailableDate = null
     if (variant?.type === 'kit') {
         try {
-            let dates = [];
-            variant?.requiredProducts?.flatMap(a => a?.product?.variants?.map(s => {
-                const backorderDate = s?.status?.backorderedAvailableDate || null;
-                dates.push(moment(backorderDate))
-            }))
-            dates = dates.filter(date => date.isValid());
-            const latestBODate = dates && dates.length > 0 ? moment.max(dates).format(dateFormat) : null;
+            /* eslint-disable no-unsafe-optional-chaining */
+            const latestBODate = Math.max(
+                ...variant?.requiredProducts?.flatMap((a) =>
+                    a?.product?.variants?.map(
+                        (s) =>
+                            Number(
+                                new Date(s?.status?.backorderedAvailableDate)
+                            ) || 0
+                    )
+                )
+            )
             if (latestBODate) {
                 isBackordered = true
-                backorderedAvailableDate = latestBODate
+                backorderedAvailableDate = moment(
+                    new Date(latestBODate)
+                ).format(dateFormat)
             }
         } catch {
             backorderedAvailableDate = null
         }
     } else if (variant?.type === 'bundle') {
         try {
-            let dates = [];
-            variant?.requiredProducts?.flatMap(a => a?.product?.variants?.map(s => {
-                const backorderDate = s?.status?.backorderedAvailableDate || null;
-                dates.push(moment(backorderDate))
-            }))
-            dates = dates.filter(date => date.isValid());
-            const latestBODate = dates && dates.length > 0 ? moment.max(dates).format(dateFormat) : null;
+            const latestBODate = Math.max(
+                ...variant?.requiredProducts?.flatMap(
+                    (a) =>
+                        Number(
+                            new Date(
+                                a?.product?.variants[0]?.status?.backorderedAvailableDate
+                            )
+                        ) || 0
+                )
+            )
             if (latestBODate) {
                 isBackordered = true
-                backorderedAvailableDate = latestBODate
+                backorderedAvailableDate = moment(
+                    new Date(latestBODate)
+                ).format(dateFormat)
             }
         } catch {
             backorderedAvailableDate = null
         }
     }
     return {
-        status: variant?.status?.status, 
-        isBackordered: isBackordered, 
+        // changed
+        status: variant?.status?.status,
+        isBackordered: isBackordered,
         backorderedAvailableDate: backorderedAvailableDate
     }
 }
@@ -142,72 +154,36 @@ const parsePrice = (product = []) => {
     return sumOfPriceAndPoints
 }
 
-const getBundleQuantities = (properties) => {
-    let maxQty = null;
-    let backOrderedQty = null;
-    let availableQty = null;
-    let quantities = [];
-    let availableQuantities = [];
-    let prodQty = 0;
+const parseKitAvailableQuantity = (kit) => {
     try {
-        properties?.requiredProducts?.flatMap(a => {
-            prodQty = Number(a?.quantity || 1);
-            a?.product?.variants?.map(s => {
-                const backorderQty = s?.backorderQuantity || 0;
-                const availableQty = s?.availableQuantity || 0;
-                quantities.push({maxPurchasable: (backorderQty + availableQty)/prodQty});
-                availableQuantities.push({availableQty});
-            })
-        })
-        const maxQtyPurchasable = quantities && quantities.length > 0 ? Math.min(...quantities.map(obj=>obj.maxPurchasable)) : 0;
-        const maxAvailableQty = availableQuantities && availableQuantities.length > 0 ? Math.min(...availableQuantities.map(obj=>obj.availableQty)) : 0;
-        maxQty = Math.floor(maxQtyPurchasable);
-        backOrderedQty = maxQty - maxAvailableQty;
-        availableQty = maxAvailableQty;
-    } catch (error) {
-        console.error('back order qty, available qty, or max qty error', error);
-        maxQty = 0;
-        backOrderedQty = 0;
-        availableQty = 0;
+        return (
+            Math.min(
+                ...kit.flatMap((a) =>
+                    a?.sku?.map((s) => s?.inventoryProperties?.atpQty)
+                )
+            ) || 0
+        )
+    } catch {
+        return 0
     }
-    return {maxQty, backOrderedQty, availableQty}
 }
 
-const getKitQuantities = (properties) => {
-    let maxQty = null;
-    let backOrderedQty = null;
-    let availableQty = null;
-    let quantities = [];
-    let availableQuantities = [];
-    let prodQty = 0;
+const parseBundleAvailableQuantity = (product) => {
     try {
-        properties?.flatMap(a => {
-            prodQty = Number(a?.properties?.quantity || 1);
-            a.sku.map(s => {
-                const backorderQty = s?.inventoryProperties?.backOrderedQty|| 0;
-                const availableQty = s?.inventoryProperties?.atpQty || 0;
-                quantities.push({maxPurchasable: (backorderQty + availableQty)/prodQty});
-                availableQuantities.push({availableQty});
-            })
-        })
-        const maxQtyPurchasable = quantities && quantities.length > 0 ? Math.min(...quantities.map(obj=>obj.maxPurchasable)) : 0;
-        const maxAvailableQty = availableQuantities && availableQuantities.length > 0 ? Math.min(...availableQuantities.map(obj=>obj.availableQty)) : 0;
-        maxQty = Math.floor(maxQtyPurchasable);
-        backOrderedQty = maxQty - maxAvailableQty;
-        availableQty = maxAvailableQty;
-    } catch (error) {
-        console.error('back order qty, available qty, or max qty error', error);
-        maxQty = 0;
-        backOrderedQty = 0;
-        availableQty = 0;
+        const { requiredProducts = [] } = !isNullOrEmpty(product) ? product : {}
+        const quantities = requiredProducts?.map((p) =>
+            p?.product?.variants?.map((a) => a?.availableQuantity)
+        )
+        return Math.min(...quantities) || 0
+    } catch {
+        console.log('some error in availableQuantity')
+        return 0
     }
-    return {maxQty, backOrderedQty, availableQty}
 }
 
 const parseKit = (product, market) => {
     const kits = {}
     const [properties] = !isNullOrEmpty(product) ? product : []
-    const status = parseStatus(properties)
     kits.id = properties?.id
     kits.uid = properties?.uid
     kits.title = properties?.title
@@ -216,9 +192,11 @@ const parseKit = (product, market) => {
     kits.chargeShipping = properties?.chargeShipping === 'true'
     kits.customerTypes = properties?.customerTypes
     kits.dangerousGoods = properties?.dangerousGoods === 'true'
+    // missing
     kits.excludeFromSearch = properties?.excludeFromSearch === 'true'
     kits.isExclusive = properties?.isExclusive === 'true'
     kits.marketAttributes = properties?.marketAttributes
+    kits.maxQuantity = (product?.inventoryProperties || {}).atpQty
     const priceData = parsePrice(product)
     kits.points = priceData?.points
     kits.price = priceData?.price
@@ -234,16 +212,14 @@ const parseKit = (product, market) => {
     kits.grpDiscount = properties?.grpDiscount
     kits.scanQualifiedCount = properties?.scanQualifiedCount
     kits.taxClass = properties?.taxClass
-    kits.status = status
-    if ((kits?.status || {})?.status === 'active') kits.status.status = 'sellable'
+    // newVariant.slug = undefined
+    kits.status = parseStatus(properties)
+    if ((kits?.status || {})?.status === 'active')
+        kits.status.status = 'sellable'
     const kitProducts = []
     if (properties?.type === 'kit' && product?.kit) {
         kits.type = 'kit'
-        const quantities = getKitQuantities(properties)
-        kits.maxQuantity = quantities.maxQty
-        kits.availableQuantity = quantities.availableQty
-        kits.backorderQuantity = quantities.backOrderedQty
-        kits.backorderedAvailableDate = status?.backorderedAvailableDate
+        kits.availableQuantity = parseKitAvailableQuantity(product?.kit)
         for (const kit of product?.kit || []) {
             const kitProduct = formatKit(kit, market)
             kitProduct.id = kit?.identifier
@@ -258,11 +234,7 @@ const parseKit = (product, market) => {
         (properties?.type === 'kit' && properties?.requiredProducts)
     ) {
         kits.type = properties?.type
-        const quantities = getBundleQuantities(properties)
-        kits.maxQuantity = quantities.maxQty
-        kits.availableQuantity = quantities.availableQty
-        kits.backorderQuantity = quantities.backOrderedQty
-        kits.backorderedAvailableDate = status?.backorderedAvailableDate
+        kits.availableQuantity = parseBundleAvailableQuantity(properties)
         for (const kit of properties?.requiredProducts || []) {
             if (kit?.product) {
                 const kitProduct = formatKit(kit?.product, market)
@@ -308,8 +280,8 @@ const formatKit = (product, market) => {
 module.exports = {
     formatKit,
     parseKit,
-    getKitQuantities,
-    getBundleQuantities,
+    parseBundleAvailableQuantity,
+    parseKitAvailableQuantity,
     parsePrice,
     parseStatus
 }

package/src/formatProduct.js

@@ -76,7 +76,7 @@ const formatProduct = (parent, homeUrl) => {
         upSellProductIds: helpers?.mapUpSellProductIds(parent),
         crossProductIds: helpers?.mapCrossProductIds(parent)
     }
-    if (parent.bundle || parent.sku_kit || parent.product_bundle) {
+    if (parent.bundle || (parent.sku_kit && parent.sku_kit.length > 0) || (parent.product_bundle && parent.product_bundle.length > 0)) {
         return formatKit(formattedProduct)
     } else {
         return formattedProduct

package/src/formatVariant.js

@@ -2,117 +2,111 @@ const helpers = require('./helpers')
 const _ = require('lodash')
 const entities = require('entities')
 
-const formatVariant = (parent) => {
-    const isBackOrdered = _.get(parent, 'defaults.status.backordered', null);
-    const backOrderedDate = _.get(parent, 'defaults.status.backorderedAvailableDate', null);
-    const preliminaryAvailableQty  = _.get(parent, 'defaults.status.availableQuantity', 0);
-    const availableQty = isBackOrdered ? 0 : preliminaryAvailableQty;
-    const backOrderedQty = isBackOrdered ? availableQty : 0;
-
+const formatVariant = (parent) => ({
     // Each value is a function with a parameter 'parent' that is the current instance of a Variant
     // ContentStack references need to be queried separately
-    return {
-        id: parent?.uid,
-        globalId: parent?.sap_data?.global_id,
-        sku: helpers?.getBestSkuData(parent)?.sku,
-        slug: parent?.slug,
-        size: parent?.size,
-        variantLabel: parent?.select_label,
-        variantColor: parent?.select_color,
-        title: parent?.name || parent?.defaults?.name,
-        salesLabel: parent?.sales_label,
-        salesText: parent?.sales_text,
-        description: entities?.decodeHTML(
-            parent?.short_description_override || parent?.defaults?.description || ''
-        ),
-        salesDisclaimer: helpers?.mapSalesDisclaimer(parent?.sales_disclaimer),
-        nettoWeight: parent?.netto_weight,
-        productImages: helpers?.mapProductImages(parent),
-        isExclusive: parent?.is_exclusive,
-        pricingJson: JSON.stringify(parent?.defaults?.status?.pricing) || null,
-        price: helpers?.mapPrice(parent),
-        points: helpers?.mapPoints(parent),
-        backorderedAvailableDate: backOrderedDate,
-        backorderQuantity: backOrderedQty,
-        availableQuantity: availableQty,
-        maxQuantity: _.get(parent, 'defaults.status.maxQuantity', 0), // will be product status overrideMaxQty else its availableQty
-        status: {
-            status: _.get(parent, 'defaults.status.status.retail', null),
-            retail: _.get(parent, 'defaults.status.status.retail', null),
-            wholesale: _.get(parent, 'defaults.status.status.wholesale', null),
-            isBackordered: isBackOrdered,
-            backorderedAvailableDate: backOrderedDate
-        },
-        csStatus: helpers?.mapCsStatus(parent),
-        purchaseTypes: helpers?.mapPurchaseTypes(parent),
-        features: helpers?.mapFeatures(parent),
-        productDetails: helpers?.mapProductDetails(parent),
-        ingredients: helpers?.mapIngredients(
-            parent.ingredients_override,
-            parent.legacy_ingredients
+    id: parent?.uid,
+    globalId: parent?.sap_data?.global_id,
+    sku: helpers?.getBestSkuData(parent)?.sku,
+    slug: parent?.slug,
+    size: parent?.size,
+    variantLabel: parent?.select_label,
+    variantColor: parent?.select_color,
+    title: parent?.name || parent?.defaults?.name,
+    salesLabel: parent?.sales_label,
+    salesText: parent?.sales_text,
+    description: entities?.decodeHTML(
+        parent?.short_description_override || parent?.defaults?.description || ''
+    ),
+    salesDisclaimer: helpers?.mapSalesDisclaimer(parent?.sales_disclaimer),
+    nettoWeight: parent?.netto_weight,
+    productImages: helpers?.mapProductImages(parent),
+    isExclusive: parent?.is_exclusive,
+    pricingJson: JSON.stringify(parent?.defaults?.status?.pricing) || null,
+    price: helpers?.mapPrice(parent),
+    points: helpers?.mapPoints(parent),
+    availableQuantity: _.get(parent, 'defaults.status.availableQuantity', 0),
+    maxQuantity: _.get(parent, 'defaults.status.maxQuantity', 0),
+    status: {
+        status: _.get(parent, 'defaults.status.status.retail', null),
+        retail: _.get(parent, 'defaults.status.status.retail', null),
+        wholesale: _.get(parent, 'defaults.status.status.wholesale', null),
+        isBackordered: _.get(parent, 'defaults.status.backordered', null),
+        backorderedAvailableDate: _.get(
+            parent,
+            'defaults.status.backorderedAvailableDate',
+            ''
+        )
+    },
+    csStatus: helpers?.mapCsStatus(parent),
+    purchaseTypes: helpers?.mapPurchaseTypes(parent),
+    features: helpers?.mapFeatures(parent),
+    productDetails: helpers?.mapProductDetails(parent),
+    ingredients: helpers?.mapIngredients(
+        parent.ingredients_override,
+        parent.legacy_ingredients
+    ),
+    benefitsAndFeatures: helpers?.mapBenefitsAndFeatures(parent),
+    results: helpers?.mapResults(parent),
+    usage: helpers?.mapUsage(parent, parent.legacy_usage),
+    resources: helpers?.mapResources(parent),
+    faqs: helpers?.mapFaqs(parent),
+    disclaimers: parent?.disclaimers || [],
+    disclaimerWarnings: helpers?.mapDisclaimerWarnings(
+        parent.disclaimer_warnings
+    ),
+    matchingVariant: 
+        parent.sap_data?.sku_data?.findIndex((s) =>
+            parent.searchedSkus.includes(s.sku)
+        ) > -1,
+    shadeable: parent?.shadeable || false,
+    restrictedMarkets: parent?.restricted_markets || [],
+    productType: parent?.sap_data?.product_type,
+    primaryBrand: parent.sap_data?.primary_brand,
+    brandFamily: parent?.sap_data?.brand_family,
+    marketAttributes: {
+        discount: _.get(
+            parent,
+            'defaults.status.marketAttributes.discount',
+            null
         ),
-        benefitsAndFeatures: helpers?.mapBenefitsAndFeatures(parent),
-        results: helpers?.mapResults(parent),
-        usage: helpers?.mapUsage(parent, parent.legacy_usage),
-        resources: helpers?.mapResources(parent),
-        faqs: helpers?.mapFaqs(parent),
-        disclaimers: parent?.disclaimers || [],
-        disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-            parent.disclaimer_warnings
-        ),
-        matchingVariant: 
-            parent.sap_data?.sku_data?.findIndex((s) =>
-                parent.searchedSkus.includes(s.sku)
-            ) > -1,
-        shadeable: parent?.shadeable || false,
-        restrictedMarkets: parent?.restricted_markets || [],
-        productType: parent?.sap_data?.product_type,
-        primaryBrand: parent.sap_data?.primary_brand,
-        brandFamily: parent?.sap_data?.brand_family,
-        marketAttributes: {
-            discount: _.get(
-                parent,
-                'defaults.status.marketAttributes.discount',
-                null
-            ),
-            redeem: _.get(parent, 'defaults.status.marketAttributes.redeem', null),
-            earn: _.get(parent, 'defaults.status.marketAttributes.earn', null)
-        },
-        legacyBenefits: parent.legacy_benefits,
-        legacyLongDescription: parent.legacy_long_description,
-        legacyResources: parent.legacy_resources,
-        legacyUsage: parent.legacy_usage,
-        legacyIngredients: parent.legacy_ingredients,
-        legacyImages: parent.legacy_images || [],
-        legacyYouTube: parent.legacy_youtube_video,
-        csAtts: {
-            version: parent._version || 0,
-            updatedAt: parent.updated_at || '',
-            updatedBy: parent.updated_by || '',
-            createdAt: parent.created_at || '',
-            createdBy: parent.created_by || '',
-            locale: parent.locale || ''
-        },
-        searchKeywords: parent?.search_keywords,
-        excludeFromSearch: parent?.exclude_from_search || helpers?.mapCsStatus(parent).status === 'discontinued' || _.get(parent, 'defaults.status.status.retail', null) === 'DISCONTINUED',
-        customerTypes: helpers?.getBestSkuData(parent)?.status_selections
-            ?.customer_types,
-        availableChannels: helpers?.getBestSkuData(parent)?.status_selections
-            ?.display_channels,
-        displayChannels: helpers?.getBestSkuData(parent)?.status_selections
-            ?.display_channels,
-        scanQualifiedCount: helpers?.getBestSkuData(parent)?.status_selections
-            ?.scan_qualify_count,
-        scanQualifyCount: helpers?.getBestSkuData(parent)?.status_selections
-            ?.scan_qualify_count,
-        chargeShipping: helpers?.getBestSkuData(parent)?.charge_shipping,
-        dangerousGoods: helpers?.getBestSkuData(parent)?.dangerous_goods,
-        channels: helpers?.getBestSkuData(parent)?.channels,
-        foreignLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
-        foreignOrderLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
-        orderType: parent.sap_data?.order_type
-    }
-}
+        redeem: _.get(parent, 'defaults.status.marketAttributes.redeem', null),
+        earn: _.get(parent, 'defaults.status.marketAttributes.earn', null)
+    },
+    legacyBenefits: parent.legacy_benefits,
+    legacyLongDescription: parent.legacy_long_description,
+    legacyResources: parent.legacy_resources,
+    legacyUsage: parent.legacy_usage,
+    legacyIngredients: parent.legacy_ingredients,
+    legacyImages: parent.legacy_images || [],
+    legacyYouTube: parent.legacy_youtube_video,
+    csAtts: {
+        version: parent._version || 0,
+        updatedAt: parent.updated_at || '',
+        updatedBy: parent.updated_by || '',
+        createdAt: parent.created_at || '',
+        createdBy: parent.created_by || '',
+        locale: parent.locale || ''
+    },
+    searchKeywords: parent?.search_keywords,
+    excludeFromSearch: parent?.exclude_from_search || helpers?.mapCsStatus(parent).status === 'discontinued' || _.get(parent, 'defaults.status.status.retail', null) === 'DISCONTINUED',
+    customerTypes: helpers?.getBestSkuData(parent)?.status_selections
+        ?.customer_types,
+    availableChannels: helpers?.getBestSkuData(parent)?.status_selections
+        ?.display_channels,
+    displayChannels: helpers?.getBestSkuData(parent)?.status_selections
+        ?.display_channels,
+    scanQualifiedCount: helpers?.getBestSkuData(parent)?.status_selections
+        ?.scan_qualify_count,
+    scanQualifyCount: helpers?.getBestSkuData(parent)?.status_selections
+        ?.scan_qualify_count,
+    chargeShipping: helpers?.getBestSkuData(parent)?.charge_shipping,
+    dangerousGoods: helpers?.getBestSkuData(parent)?.dangerous_goods,
+    channels: helpers?.getBestSkuData(parent)?.channels,
+    foreignLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
+    foreignOrderLimit: helpers?.getBestSkuData(parent)?.foreign_limit,
+    orderType: parent.sap_data?.order_type
+})
 
 module.exports = {
     formatVariant

package/src/productStatus.js

@@ -45,7 +45,6 @@ async function getProductStatus(skus, locale, homeUrl, awsBase, clientId) {
                 const overrideMaxQuantity = marketConfig.skuMaxQty
                     ? marketConfig.skuMaxQty[skus[i]]
                     : undefined
-                // @TODO - Update this code when we update our config for minimum availableQuantity in CS
                 const availableQuantity =
                     productStatus.availableQuantity < 999
                         ? productStatus.availableQuantity