From 0b7db052b04ab983632463232fc8190a6f69143a Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 8 Aug 2024 15:06:27 +0700
Subject: update q

---
 src/pages/api/shop/search.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index d5a7ab31..b886985c 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -42,7 +42,10 @@ export default async function handler(req, res) {
       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,7 +54,7 @@ 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}`,
@@ -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)
-- 
cgit v1.2.3


From a0c053de428bcf40a8435921023290a56bd7d8ea Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 9 Aug 2024 14:28:01 +0700
Subject: tunning uqery for sku

---
 src/pages/api/shop/search.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index b886985c..6f98efcb 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -43,7 +43,7 @@ export default async function handler(req, res) {
       break;
   }
   
-  let checkQ = q.trim().split(/\s+/);
+  let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
   
   let offset = (page - 1) * limit;
@@ -126,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;
   });
@@ -139,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
-- 
cgit v1.2.3