3 files changed, 72 insertions, 23 deletions

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 6269d3ed..ace281f7 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -23,6 +23,9 @@ export default async function handler(req, res) {
 
   let paramOrderBy = '';
   switch (orderBy) {
+    case 'flashsale-discount-desc':
+      paramOrderBy += 'flashsale_discount_f DESC';
+      break;
     case 'price-asc':
       paramOrderBy += 'price_tier1_v2_f ASC';
       break;
@@ -68,16 +71,27 @@ export default async function handler(req, res) {
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = escapeSolrQuery(q);
 
-  const formattedQuery = `(${newQ.split(' ').map(term => `${term}*`).join(' ') })`;
-  const mm = checkQ.length > 2 ?  checkQ.length > 5 ? '55%' : '85%' : `${checkQ.length}`;
+  const formattedQuery = `(${newQ
+    .split(' ')
+    .map((term) => `${term}*`)
+    .join(' ')})`;
+  const mm =
+    checkQ.length > 2
+      ? checkQ.length > 5
+        ? '55%'
+        : '85%'
+      : `${checkQ.length}`;
 
   const filterQueries = [
     '-publish_b:false',
     'product_rating_f:[8 TO *]',
-    'price_tier1_v2_f:[1 TO *]'
+    'price_tier1_v2_f:[1 TO *]',
   ];
-  
-  const fq_ = filterQueries.join('AND ');
+
+  if (fq && source != 'similar') {
+    filterQueries.push(fq);
+  }
+  const fq_ = filterQueries.join(' AND ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -87,9 +101,15 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=OR`,
-    `q=${source == 'similar' || checkQ.length < 3  ?  checkQ.length < 2 ?  newQ : newQ + '*' : formattedQuery }`,
+    `q=${
+      source == 'similar' || checkQ.length < 3
+        ? checkQ.length < 2
+          ? newQ
+          : newQ + '*'
+        : formattedQuery
+    }`,
     `defType=edismax`,
-    'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s',
+    'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s manufacture_id_i category_id_i  ',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
@@ -132,15 +152,17 @@ export default async function handler(req, res) {
   if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
 
   // Single fq in url params
-  if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
+  // if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
   // Multi fq in url params
   if (Array.isArray(fq))
-    parameter = parameter.concat(fq.map((val) => `fq=${encodeURIComponent(val)}`));
-  
+    parameter = parameter.concat(
+      fq.map((val) => `fq=${encodeURIComponent(val)}`)
+    );
+
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
-  
+
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,
diff --git a/src/pages/api/shop/url-category_brand.js b/src/pages/api/shop/url-category_brand.js
new file mode 100644
index 00000000..160aa166
--- /dev/null
+++ b/src/pages/api/shop/url-category_brand.js
@@ -0,0 +1,20 @@
+import axios from 'axios';
+
+export default async function handler(req, res) {
+  const { url = '', page = 1, limit = 30 } = req.query;
+
+  let offset = (page - 1) * limit;
+ 
+  const params = [`q.op=AND`, `q=${url ? `"${url}"` : '*'}`, `indent=true`, `rows=${limit}`, `start=${offset}`];
+  
+  try {
+    let result = await axios(
+      process.env.SOLR_HOST +
+        `/solr/url_category_brand/select?` + 
+        params.join('&')
+    );
+    res.status(200).json(result.data);
+  } catch (error) {
+    res.status(500).json({ error: 'Internal Server Error' });
+  }
+}
diff --git a/src/pages/api/shop/variant-detail.js b/src/pages/api/shop/variant-detail.js
index 160ec979..af3525b3 100644
--- a/src/pages/api/shop/variant-detail.js
+++ b/src/pages/api/shop/variant-detail.js
@@ -1,21 +1,28 @@
-import { variantsMappingSolr } from '@/utils/solrMapping'
-import axios from 'axios'
+import { productMappingSolr, variantsMappingSolr } from '@/utils/solrMapping';
+import axios from 'axios';
 
 export default async function handler(req, res) {
   try {
     let productVariants = await axios(
       process.env.SOLR_HOST +
         `/solr/variants/select?q=id:${req.query.id}&q.op=OR&indent=true`
-    )
-    let auth  = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth
+    );
+    let template_id = productVariants.data.response.docs[0].template_id_i;
+    let auth =
+      req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth;
     let productTemplate = await axios(
-      process.env.SOLR_HOST + `/solr/product/select?q=id:${req.query.id}&q.op=OR&indent=true`
-    )
-    let result = variantsMappingSolr(productTemplate.data.response.docs, productVariants.data.response.docs, auth || false)
-    
-    res.status(200).json(result)
+      process.env.SOLR_HOST +
+        `/solr/product/select?q=id:${template_id}&q.op=OR&indent=true`
+    );
+    let result = variantsMappingSolr(
+      productTemplate.data.response.docs,
+      productVariants.data.response.docs,
+      auth || false
+    );
+
+    res.status(200).json(result);
   } catch (error) {
-    console.error('Error fetching data from Solr:', error)
-    res.status(500).json({ error: 'Internal Server Error' })
+    console.error('Error fetching data from Solr:', error);
+    res.status(500).json({ error: 'Internal Server Error' });
   }
-}
\ No newline at end of file
+}