@nuskin/cs-product-lib 1.0.19 → 1.0.20-cx12-7271.1

package/package.json

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

@@ -344,75 +344,30 @@ const csProduct = (props) => {
     }
 
     const getBundle = async (id, locale) => {
-        const query = `{ "$or": [{ "bundle_id": { "$in": ["${id}"]}}, { "uid": { "$in": ["${id}"] }}] }`
-        const bundles = await getEntriesByQuery({
-            query,
-            locale,
-            contentType: BUNDLE_TYPE
-        })
-        const translations = await getTranslations(locale)
-
-        for (let b = 0; b < bundles.length; b++) {
-            for (
-                let i = 0;
-                i < (bundles[b].required_products || []).length;
-                i++
-            ) {
-                await removeInvalidVariants(
-                    bundles[b].required_products[i].product,
-                    locale,
-                    translations
-                )
-            }
-            for (
-                let i = 0;
-                i < (bundles[b].optional_products || []).length;
-                i++
-            ) {
-                await removeInvalidVariants(
-                    bundles[b].optional_products[i].product,
-                    locale,
-                    translations
-                )
-            }
-        }
-        return formatKitWithSchema(bundles)?.[0]
+        const bundles = await getBundles(id, locale)
+        return bundles && bundles[0] ? bundles[0] : null
     }
     
     const getBundles = async (ids, locale) => {
-        const query = `{ "$or": [{ "bundle_id": { "$in": ${helpers?.arrayString(ids)} }}, { "uid": { "$in": ${helpers?.arrayString(ids)} }}] }`
-        const bundles = await getEntriesByQuery({
-            query,
-            locale,
-            contentType: BUNDLE_TYPE
-        })
-        const translations = await getTranslations(locale)
-
-        for (let b = 0; b < bundles.length; b++) {
-            for (
-                let i = 0;
-                i < (bundles[b].required_products || []).length;
-                i++
-            ) {
-                await removeInvalidVariants(
-                    bundles[b].required_products[i].product,
-                    locale,
-                    translations
-                )
-            }
-            for (
-                let i = 0;
-                i < (bundles[b].optional_products || []).length;
-                i++
-            ) {
-                await removeInvalidVariants(
-                    bundles[b].optional_products[i].product,
-                    locale,
-                    translations
-                )
-            }
+        if (!Array.isArray(ids)) {
+            ids = [ids]
+        }
+        const idString = helpers?.arrayString([ids])
+        const query = `{"$or": [
+                        {"product_bundle":{"$in_query":{"bundle_id":{"$in": ${idString}}}}}, 
+                        {"product_bundle":{"$in_query":{"uid":{"$in": ${idString}}}}}, 
+                        {"sku_kit":{"$in_query":{"kit_id":{"$in": ${idString}}}}}, 
+                        {"sku_kit":{"$in_query":{"uid":{"$in": ${idString}}}}}
+                        ]}`
+        const products = await queryProducts(query, locale)
+        if (products.length > 0) {
+            const translations = await getTranslations(locale)
+            await formatKit(products, locale, translations)
+            await removeInvalidVariants(products, locale, translations)
+            return formatProductWithSchema(products)
+        } else {
+            return []
         }
-        return formatKitWithSchema(bundles)
     }
 
     const getProductsBySku = async (skus, locale) => {