Merged in Feature/template-switch (pull request #240)

<iman> update search product using name

3 files changed, 8 insertions, 3 deletions

diff --git a/src-migrate/modules/product-detail/components/SimilarBottom.tsx b/src-migrate/modules/product-detail/components/SimilarBottom.tsx
index 8ff0a6bf..f2daf664 100644
--- a/src-migrate/modules/product-detail/components/SimilarBottom.tsx
+++ b/src-migrate/modules/product-detail/components/SimilarBottom.tsx
@@ -11,7 +11,7 @@ type Props = {
 const SimilarBottom = ({ product, source }: Props) => {
   const productSimilar = useProductSimilar({
     name: product.name,
-    except: { productId: product.id },
+    except: { productId: product.id, manufactureId: product.manufacture.id },
     source: source
   })
 
diff --git a/src-migrate/modules/product-detail/components/SimilarSide.tsx b/src-migrate/modules/product-detail/components/SimilarSide.tsx
index d70a314d..2ba8fa21 100644
--- a/src-migrate/modules/product-detail/components/SimilarSide.tsx
+++ b/src-migrate/modules/product-detail/components/SimilarSide.tsx
@@ -11,7 +11,7 @@ type Props = {
 const SimilarSide = ({ product }: Props) => {
   const productSimilar = useProductSimilar({
     name: product.name,
-    except: { productId: product.id, manufactureId: product.manufacture.id },
+    except: { productId: product.id },
   })
 
   const products = productSimilar.data?.products || []
diff --git a/src-migrate/services/product.ts b/src-migrate/services/product.ts
index 2152ba26..a5039ad9 100644
--- a/src-migrate/services/product.ts
+++ b/src-migrate/services/product.ts
@@ -76,8 +76,13 @@ export const getProductSimilar = async ({
       dataflashSale = dataflashSale
     }
   }
+
+  const regex = /\b(?![A-Z\s]+\b)[A-Za-z\s]+\b/g;
+  const matches = name?.match(regex);
+  const extractedName = matches ? matches.join(' ').trim() : '';
+  console.log("extractedName",extractedName);
   const query = [
-    `q=${name}`,
+    `q=${extractedName}`,
     'page=1',
     'orderBy=popular-weekly',
     'operation=OR',