handling ready to ship

1 files changed, 25 insertions, 5 deletions

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 6f98efcb..a19224df 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -1,6 +1,7 @@
 import { productMappingSolr } from '@/utils/solrMapping';
 import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
+import searchSuggestApi from '@/core/api/searchSuggestApi';
 
 export default async function handler(req, res) {
   const {
@@ -42,10 +43,29 @@ export default async function handler(req, res) {
       paramOrderBy += '';
       break;
   }
-  
+
+  // let suggestWord = null;
+  // let keywords = q;
+  // let checkQ = null;
+
+  // if (q != '*') {
+  //   checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
+  //   if (checkQ.length > 1) {
+  //     const dataSearchSuggest = await axios(
+  //       `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/suggest?q=${checkQ[1]}`
+  //     );
+  //     suggestWord = dataSearchSuggest.data.suggestions[0];
+  //   }
+  //   if (suggestWord && suggestWord?.term.split(' ').length <= 1) {
+  //     keywords = `"${escapeSolrQuery(checkQ[0] + ' ' + suggestWord?.term)}"`;
+  //   }
+  // }
+
+  // let newQ = keywords;
+
   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',
@@ -54,7 +74,7 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${newQ}`,
+    `q=name_s:${newQ}`,
     'qf=name_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
@@ -105,6 +125,7 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
+  console.log('ini search', parameter.join('&'));
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,
@@ -126,7 +147,7 @@ export default async function handler(req, res) {
 
 const escapeSolrQuery = (query) => {
   if (query == '*') return query;
-  
+
   query = query.replace(/-/g, ' ');
 
   const specialChars = /([\+\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
@@ -141,7 +162,6 @@ const escapeSolrQuery = (query) => {
   return escapedWords.join(' ');
 };
 
-
 /*const productResponseMap = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0