@nuskin/cs-product-lib 1.7.3-bundleonly-members.1 → 1.8.0-bundleonly-members.2

package/package.json

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

package/src/csProduct.js

@@ -42,6 +42,34 @@ const validateConfig = (props) => {
 /* istanbul ignore next */
 const csProduct = (props) => {
     const DEV_ENVIRONMENT = 'public-dev'
+    // CS-native sellable gate for the bypassProductStatus path -- mirrors
+    // content-validator ValidationSteps (csStatus === 'sellable' || 'bundleOnly').
+    const CS_SELLABLE_STATUSES = ['sellable', 'bundleOnly']
+
+    // Kit-member dedup tiebreak (order-independent). A kit member SKU can match
+    // more than one product entry (e.g. a market-localized product AND an older
+    // en-only promo product that still carries the same variant). Prefer the
+    // entry whose own locale matches the requested market locale; if that does
+    // not disambiguate, prefer the newer publish, then a stable uid -- so the
+    // kept entry never depends on query/array order.
+    const kitMemberLocaleRank = (member, requestedLocale) => {
+        const memberLocale = member?.csAtts?.locale
+        return memberLocale && requestedLocale &&
+            memberLocale.toLowerCase() === requestedLocale.toLowerCase()
+            ? 1
+            : 0
+    }
+    const isPreferredKitMember = (candidate, current, requestedLocale) => {
+        if (!current) return true
+        const candRank = kitMemberLocaleRank(candidate, requestedLocale)
+        const currRank = kitMemberLocaleRank(current, requestedLocale)
+        if (candRank !== currRank) return candRank > currRank
+        const candTime = Date.parse(candidate?.csAtts?.updatedAt) || 0
+        const currTime = Date.parse(current?.csAtts?.updatedAt) || 0
+        if (candTime !== currTime) return candTime > currTime
+        return `${candidate?.id}` < `${current?.id}`
+    }
+
     const VARIANTS = 'variants'
     const VARIANT = 'variant'
     const KEY_INGREDIENTS = 'ingredients.key_ingredients'
@@ -108,7 +136,7 @@ const csProduct = (props) => {
         }
     }
 
-    const removeInvalidVariants = async (products = [], locale, translations, keepBundleOnly = false) => {
+    const removeInvalidVariants = async (products = [], locale, translations, keepBundleOnly = false, bypassProductStatus = false) => {
         const validSkus = []
         for (const product of products) {
             for (const variant of product?.variants || []) {
@@ -125,13 +153,35 @@ const csProduct = (props) => {
         let status = {}
         let marketData = {}
         if (validSkus?.length > 0) {
-            status = await getProductStatus(
-                validSkus,
-                locale,
-                homeUrl,
-                awsBase,
-                clientId
-            )
+            if (bypassProductStatus) {
+                // Equinox markets: derive status from the CS entry instead of
+                // calling product-status. Live availability/quantity is
+                // intentionally not available on this path. Temporary until
+                // cs-product-graphql is retired.
+                status = {}
+                for (const product of products) {
+                    for (const variant of product?.variants || []) {
+                        const best = helpers?.getBestSkuData(variant)
+                        if (best?.sku) {
+                            const csStatus = helpers.mapCsStatus(variant)
+                            status[best.sku] = {
+                                status: { retail: csStatus.retail, wholesale: csStatus.wholesale },
+                                csStatus: csStatus.status,
+                                isBackordered: false,
+                                backorderedAvailableDate: null
+                            }
+                        }
+                    }
+                }
+            } else {
+                status = await getProductStatus(
+                    validSkus,
+                    locale,
+                    homeUrl,
+                    awsBase,
+                    clientId
+                )
+            }
             const localeSplit = locale.split('_')
             let market =
                 localeSplit?.length > 1 ? localeSplit[1].toUpperCase() : 'XX'
@@ -156,7 +206,12 @@ const csProduct = (props) => {
                     const varStatus = status[bestSkuData.sku]
                     const isBundleOnly =
                         bestSkuData?.status_selections?.status === 'bundleOnly'
-                    if ((varStatus && varStatus.status.retail) || (keepBundleOnly && isBundleOnly)) {
+                    const passesBypassGate =
+                        bypassProductStatus &&
+                        CS_SELLABLE_STATUSES.includes(varStatus?.csStatus)
+                    const passesStatusGate =
+                        !bypassProductStatus && varStatus && varStatus.status.retail
+                    if (passesStatusGate || passesBypassGate || (keepBundleOnly && isBundleOnly)) {
                         variant.sap_data.sku_data = [bestSkuData]
                         validVariants.push({
                             ...variant,
@@ -256,46 +311,63 @@ const csProduct = (props) => {
         })
     }
 
-    const convertKitToRequiredProducts = async (skuKit, locale) => {
-        let productBundle = {}
-        const variantSkus = []
-        for (let kitItem of skuKit[0].variants) {
-            const skuData = helpers.getBestSkuData((kitItem.variant || [])[0])
-            variantSkus.push((skuData || {}).sku)
-            kitItem.sku = (skuData || {}).sku
-        }
-        const products = await getProductsBySku(variantSkus, locale, true)
-        const requiredProducts = []
-        for (let i = 0; i < products?.length; i++) {
+    // Clone a product and keep only the variant matching the given sku.
+    const selectVariantProduct = (product, variantSku) => {
+        const productSelect = JSON.parse(JSON.stringify(product))
+        productSelect.variants = (productSelect?.variants || []).filter(
+            (variant) => variant.sku === variantSku
+        )
+        return productSelect
+    }
+
+    // Build the kit's required-product list, deduped by sku+quantity. A member
+    // sku can match more than one product entry; keep the preferred one
+    // (locale-native over fallback) via isPreferredKitMember, order-independent.
+    const dedupeKitMembers = (products, variantSkus, kitVariants, requestedLocale) => {
+        const bestBySkuQuantity = new Map()
+        for (const product of products || []) {
             for (const variantSku of variantSkus) {
-                const productSelect = JSON.parse(JSON.stringify(products[i]))
-                for (let v = 0; v < productSelect?.variants?.length; v++) {
-                    if (productSelect.variants[v].sku !== variantSku) {
-                        productSelect.variants.splice(v, 1)
-                        v--
-                    }
-                }
-                if (!isNullOrEmpty(productSelect?.variants)) {
-                    requiredProducts.push({
-                        product: [productSelect],
-                        quantity: skuKit[0].variants.find(v=>v.sku === variantSku).quantity
-                    })
+                const productSelect = selectVariantProduct(product, variantSku)
+                if (isNullOrEmpty(productSelect?.variants)) continue
+                const quantity = kitVariants.find((v) => v.sku === variantSku)?.quantity
+                const dedupKey = `${variantSku}:${quantity}`
+                const current = bestBySkuQuantity.get(dedupKey)
+                if (isPreferredKitMember(productSelect, current?.product?.[0], requestedLocale)) {
+                    bestBySkuQuantity.set(dedupKey, { product: [productSelect], quantity })
                 }
             }
-        }
-        const discounts = skuKit[0].discounts || {}
-        const dangerousGoods = requiredProducts.some(({ product }) => {
-            const [requiredProduct] = product || []
-            const [variant] = requiredProduct?.variants || []
-            return variant?.dangerousGoods === true
-        })
-        productBundle.required_products = requiredProducts
-        productBundle.charge_shipping = skuKit[0].charge_shipping
-        productBundle.cvdis = discounts.cvDiscount || skuKit[0].cvdis
-        productBundle.dangerous_goods = dangerousGoods
-        productBundle.foreign_limit = skuKit[0].foreign_limit
-        productBundle.grpdis = discounts.grpDiscount || skuKit[0].grpdis
-        productBundle.is_exclusive = skuKit[0].is_exclusive
+        }
+        return [...bestBySkuQuantity.values()]
+    }
+
+    const convertKitToRequiredProducts = async (skuKit, locale, bypassProductStatus = false) => {
+        let productBundle = {}
+        const variantSkus = []
+        for (let kitItem of skuKit[0].variants) {
+            const skuData = helpers.getBestSkuData((kitItem.variant || [])[0])
+            variantSkus.push((skuData || {}).sku)
+            kitItem.sku = (skuData || {}).sku
+        }
+        const products = await getProductsBySku(variantSkus, locale, true, bypassProductStatus)
+        const requiredProducts = dedupeKitMembers(
+            products,
+            variantSkus,
+            skuKit[0].variants,
+            badLocaleMap(locale)
+        )
+        const discounts = skuKit[0].discounts || {}
+        const dangerousGoods = requiredProducts.some(({ product }) => {
+            const [requiredProduct] = product || []
+            const [variant] = requiredProduct?.variants || []
+            return variant?.dangerousGoods === true
+        })
+        productBundle.required_products = requiredProducts
+        productBundle.charge_shipping = skuKit[0].charge_shipping
+        productBundle.cvdis = discounts.cvDiscount || skuKit[0].cvdis
+        productBundle.dangerous_goods = dangerousGoods
+        productBundle.foreign_limit = skuKit[0].foreign_limit
+        productBundle.grpdis = discounts.grpDiscount || skuKit[0].grpdis
+        productBundle.is_exclusive = skuKit[0].is_exclusive
         productBundle.bundle_id = skuKit[0].legacy_sku || skuKit[0].kit_id
         productBundle.locale = skuKit[0].locale
         productBundle.point_discount = skuKit[0].point_discount
@@ -316,14 +388,15 @@ const csProduct = (props) => {
         return [productBundle]
     }
 
-    const formatKit = async (products, locale, translations) => {
+    const formatKit = async (products, locale, translations, bypassProductStatus = false) => {
         for (let p = 0; p < products.length; p++) {
             let noFormat = false
             if (products[p]?.sku_kit?.length > 0) {
                 products[p].type = 'kit'
                 products[p].product_bundle = await convertKitToRequiredProducts(
                     products[p].sku_kit,
-                    locale
+                    locale,
+                    bypassProductStatus
                 )
                 noFormat = true
             }
@@ -439,8 +512,8 @@ const csProduct = (props) => {
      * @deprecated use getProductsByUID instead
      * @returns 
      */
-    const getBundle = async (id, locale) => {
-        const bundles = await getBundles(id, locale)
+    const getBundle = async (id, locale, bypassProductStatus = false) => {
+        const bundles = await getBundles(id, locale, bypassProductStatus)
         return bundles && bundles[0] ? bundles[0] : null
     }
 
@@ -464,7 +537,7 @@ const csProduct = (props) => {
      * @deprecated use getProductsByUID instead
      * @returns 
      */
-    const getBundles = async (ids, locale) => {
+    const getBundles = async (ids, locale, bypassProductStatus = false) => {
         locale = badLocaleMap(locale)
         if (!Array.isArray(ids)) {
             ids = [ids]
@@ -480,9 +553,11 @@ const csProduct = (props) => {
         const products = await queryProducts(query, locale)
         if (Array.isArray(products) && products.length > 0) {
             const translations = await getTranslations(locale)
-            await formatKit(products, locale, translations)
-            await removeInvalidVariants(products, locale, translations)
-            const status = await getProductStatus(getAllBundleIds(products), helpers?.reorderLocale(locale), homeUrl, awsBase, clientId)
+            await formatKit(products, locale, translations, bypassProductStatus)
+            await removeInvalidVariants(products, locale, translations, false, bypassProductStatus)
+            const status = bypassProductStatus
+                ? {}
+                : await getProductStatus(getAllBundleIds(products), helpers?.reorderLocale(locale), homeUrl, awsBase, clientId)
             return formatProductWithSchema(products, status)
         }
         const errorResponse = products.response || {}
@@ -490,7 +565,7 @@ const csProduct = (props) => {
         return [{error: {message: products.message, name: products.name, status: errorResponse.status, errors: [`${responseData.error_code}: ${responseData.error_message}`]}}]
     }
 
-    const getProductsBySku = async (skus, locale, keepBundleOnly = false) => {
+    const getProductsBySku = async (skus, locale, keepBundleOnly = false, bypassProductStatus = false) => {
         locale = badLocaleMap(locale)
         if (!Array.isArray(skus)) {
             skus = [skus]
@@ -516,8 +591,8 @@ const csProduct = (props) => {
                 return bundleProducts
             }
             const translations = await getTranslations(locale)
-            await formatKit(products, locale, translations)
-            await removeInvalidVariants(products, locale, translations, keepBundleOnly)
+            await formatKit(products, locale, translations, bypassProductStatus)
+            await removeInvalidVariants(products, locale, translations, keepBundleOnly, bypassProductStatus)
             const formattedProducts = formatProductWithSchema(products)
             for (const product of formattedProducts) {
                 product.skus = skus