@nuskin/cs-product-lib 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.5.0",
+  "version": "1.5.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

@@ -7,11 +7,12 @@ const { formatTranslations } = require('./formatTranslations')
 const { formatVariant } = require('./formatVariant')
 const { formatProduct } = require('./formatProduct')
 const { transformBundle } = require('./transformBundle')
-const { formatCategoryTranslations } = require('./formatCategoryTranslations')
-const { isNullOrEmpty } = require('@nuskin/ns-common-lib')
-const { formatDiscounts } = require('./helpers/formatDiscounts');
-const { formatCategory } = require('./formatCategory')
-const { getAllTopCategories } = require('./getAllTopCategories')
+const { formatCategoryTranslations } = require('./formatCategoryTranslations')
+const { isNullOrEmpty } = require('@nuskin/ns-common-lib')
+const { formatDiscounts } = require('./helpers/formatDiscounts');
+const { mergeProductsByRequestedSkus } = require('./helpers/mergeProductsByRequestedSkus')
+const { formatCategory } = require('./formatCategory')
+const { getAllTopCategories } = require('./getAllTopCategories')
 
 const validateConfig = (props) => {
     if (!props) {
@@ -479,36 +480,55 @@ 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) => {
-        locale = badLocaleMap(locale)
-        if (!Array.isArray(skus)) {
-            skus = [skus]
-        }
-
-        const skuBundle = await getBundles(skus, locale)
-        if (skuBundle.length > 0 && !skuBundle[0].error || skuBundle[0].error.message !== undefined) {
-            return skuBundle
-        }
-
-        const query = `{"variants": {"$in_query":{"sap_data.skus": {"$in": ${helpers?.arrayString(
-            skus
-        )}}}}}`
-
-        let products = await queryProducts(query, locale)
-        if (Array.isArray(products)) {
-            const translations = await getTranslations(locale)
-            await formatKit(products, locale, translations)
-            await removeInvalidVariants(products, locale, translations)
-            for (const product of products) {
-                product.skus = skus
-                product.locale = locale
-            }
-            return formatProductWithSchema(products)
-        }
-        const errorResponse = products.response || {}
-        const responseData = errorResponse.data || {}
-        return [{error: {message: products.message, name: products.name, status: errorResponse.status, errors: [`${responseData.error_code}: ${responseData.error_message}`]}}]
-    }
+    const getProductsBySku = async (skus, locale) => {
+        locale = badLocaleMap(locale)
+        if (!Array.isArray(skus)) {
+            skus = [skus]
+        }
+
+        const skuBundle = await getBundles(skus, locale)
+        const bundleProducts = Array.isArray(skuBundle)
+            ? skuBundle.filter((product) => product && !product.error)
+            : []
+
+        for (const product of bundleProducts) {
+            product.skus = skus
+            product.locale = locale
+        }
+
+        const query = `{"variants": {"$in_query":{"sap_data.skus": {"$in": ${helpers?.arrayString(
+            skus
+        )}}}}}`
+
+        const products = await queryProducts(query, locale)
+        if (Array.isArray(products)) {
+            if (products.length === 0) {
+                return bundleProducts
+            }
+            const translations = await getTranslations(locale)
+            await formatKit(products, locale, translations)
+            await removeInvalidVariants(products, locale, translations)
+            const formattedProducts = formatProductWithSchema(products)
+            for (const product of formattedProducts) {
+                product.skus = skus
+                product.locale = locale
+            }
+            if (bundleProducts.length === 0) {
+                return formattedProducts
+            }
+            return mergeProductsByRequestedSkus({
+                bundleProducts,
+                variantProducts: formattedProducts,
+                requestedSkus: skus
+            })
+        }
+        if (bundleProducts.length > 0) {
+            return bundleProducts
+        }
+        const errorResponse = products.response || {}
+        const responseData = errorResponse.data || {}
+        return [{error: {message: products.message, name: products.name, status: errorResponse.status, errors: [`${responseData.error_code}: ${responseData.error_message}`]}}]
+    }
 
     const getProductsByGlobalId = async (ids, locale) => {
         locale = badLocaleMap(locale)
@@ -699,4 +719,4 @@ const csProduct = (props) => {
 
 module.exports = {
     csProduct
-}
+}

package/src/helpers/mergeProductsByRequestedSkus.js

@@ -0,0 +1,49 @@
+const getRequestedSkuOrder = (product = {}, requestedSkus = []) => {
+    const matchedSkus = new Set()
+
+    if (product?.bundle?.id) {
+        matchedSkus.add(product.bundle.id)
+    }
+
+    for (const variant of product?.variants || []) {
+        if (variant?.sku) {
+            matchedSkus.add(variant.sku)
+        }
+    }
+
+    const indexes = [...matchedSkus]
+        .map((sku) => requestedSkus.indexOf(sku))
+        .filter((index) => index > -1)
+
+    return indexes.length > 0 ? Math.min(...indexes) : Number.MAX_SAFE_INTEGER
+}
+
+const mergeProductsByRequestedSkus = ({
+    bundleProducts = [],
+    variantProducts = [],
+    requestedSkus = []
+} = {}) => {
+    const seenProductIds = new Set()
+
+    return [...bundleProducts, ...variantProducts]
+        .filter((product) => {
+            if (!product?.id) {
+                return true
+            }
+            if (seenProductIds.has(product.id)) {
+                return false
+            }
+            seenProductIds.add(product.id)
+            return true
+        })
+        .sort(
+            (left, right) =>
+                getRequestedSkuOrder(left, requestedSkus) -
+                getRequestedSkuOrder(right, requestedSkus)
+        )
+}
+
+module.exports = {
+    getRequestedSkuOrder,
+    mergeProductsByRequestedSkus
+}