2 files changed, 26 insertions, 3 deletions
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 49a5fe69..bc1c014b 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -88,7 +88,10 @@ export default async function handler(req, res) {
     'price_tier1_v2_f:[1 TO *]',
   ];
 
-  const fq_ = filterQueries.join('AND ');
+  if(fq){
+    filterQueries.push(fq);
+  }
+  const fq_ = filterQueries.join(' AND ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -106,7 +109,7 @@ export default async function handler(req, res) {
         : 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}`,
@@ -149,7 +152,7 @@ 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(
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' });
+  }
+}