Merge branch 'release' into Feature/category-management

2 files changed, 80 insertions, 7 deletions

diff --git a/src/pages/api/shop/generate-recomendation.js b/src/pages/api/shop/generate-recomendation.js
new file mode 100644
index 00000000..dce8ae72
--- /dev/null
+++ b/src/pages/api/shop/generate-recomendation.js
@@ -0,0 +1,64 @@
+import { productMappingSolr } from '@/utils/solrMapping'
+import axios from 'axios';
+import camelcaseObjectDeep from 'camelcase-object-deep';
+
+export default async function handler(req, res) {
+  const { q = null, op = 'AND'  } = req.query
+
+  if (!q) {
+    return res.status(422).json({ error: 'parameter missing' })
+  }
+
+  /*let parameter = [
+    `q=${escapeSolrQuery(q)}`,
+    `q.op=${op}`,
+    `indent=true`,
+    `fq=-publish_b:false`,
+    `qf=name_s^2 description_s`,
+    `facetch=true`,
+    `fq=price_tier1_v2_f:[1 TO *]`,
+    `rows=10`,
+    `sort=product_rating_f DESC, price_discount_f DESC`,
+  ];
+  let result = await axios(
+    process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
+  );*/
+  let parameter = [
+    `q=${q}`,
+    `q.op=${op}`,
+    `debugQuery=on`,
+    `defType=edismax`,
+    `df=display_name_s`,
+    `fq=-publish_b:false`,
+    `rows=5`,
+  ];
+  if(op == 'AND'){
+    parameter.push(`sort=product_rating_f DESC, price_discount_f DESC`);
+    parameter.push(`rows=1`);
+  } 
+
+  let result = await axios(
+    process.env.SOLR_HOST + '/solr/recommendation/select?' + parameter.join('&')
+  );
+  try {
+    result.data = camelcaseObjectDeep(result.data)
+    res.status(200).json(result.data)
+  } catch (error) {
+    res.status(400).json({ error: error.message });
+  }
+}
+
+const escapeSolrQuery = (query) => {
+  if (query == '*') return query;
+
+  const specialChars = /([\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
+  const words = query.split(/\s+/);
+  const escapedWords = words.map((word) => {
+    if (specialChars.test(word)) {
+      return `"${word.replace(specialChars, '\\$1')}"`;
+    }
+    return word;
+  });
+
+  return escapedWords.join(' ');
+};
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index b6b8c795..6f98efcb 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -39,10 +39,13 @@ export default async function handler(req, res) {
       paramOrderBy += 'flashsale_price_f ASC';
       break;
     default:
-      paramOrderBy += 'product_rating_f DESC, price_discount_f DESC';
+      paramOrderBy += '';
       break;
   }
-
+  
+  let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
+  let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
+  
   let offset = (page - 1) * limit;
   let parameter = [
     'facet.field=manufacture_name_s',
@@ -51,12 +54,12 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${escapeSolrQuery(q)}`,
+    `q=${newQ}`,
     'qf=name_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false`,
+    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
@@ -77,7 +80,10 @@ export default async function handler(req, res) {
     parameter.push(
       `fq=${brand
         .split(',')
-        .map((manufacturer) => `manufacture_name:"${encodeURIComponent(manufacturer)}"`)
+        .map(
+          (manufacturer) =>
+            `manufacture_name:"${encodeURIComponent(manufacturer)}"`
+        )
         .join(' OR ')}`
     );
   if (category)
@@ -120,12 +126,14 @@ export default async function handler(req, res) {
 
 const escapeSolrQuery = (query) => {
   if (query == '*') return query;
+  
+  query = query.replace(/-/g, ' ');
 
-  const specialChars = /([\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
+  const specialChars = /([\+\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
   const words = query.split(/\s+/);
   const escapedWords = words.map((word) => {
     if (specialChars.test(word)) {
-      return `"${word.replace(specialChars, '\\$1')}"`;
+      return word.replace(specialChars, '\\$1');
     }
     return word;
   });
@@ -133,6 +141,7 @@ const escapeSolrQuery = (query) => {
   return escapedWords.join(' ');
 };
 
+
 /*const productResponseMap = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0