From e5a01976cb665b824b2ad6426a2c52a5bd0964e6 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 27 Jul 2024 08:27:54 +0700 Subject: add feature category lob --- src/pages/api/shop/product-homepage.js | 3 ++- src/pages/api/shop/search.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/product-homepage.js b/src/pages/api/shop/product-homepage.js index 02c01ee0..61732c77 100644 --- a/src/pages/api/shop/product-homepage.js +++ b/src/pages/api/shop/product-homepage.js @@ -36,7 +36,8 @@ const respoonseMap = (productHomepage, products) => { name: productHomepage.name_s, image: productHomepage.image_s, url: productHomepage.url_s, - products: products + products: products, + categoryIds: productHomepage.category_id_ids, } return productMapped diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index b6b8c795..66f517ae 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -56,7 +56,7 @@ export default async function handler(req, res) { `start=${parseInt(offset)}`, `rows=${limit}`, `sort=${paramOrderBy}`, - `fq=-publish_b:false`, + // `fq=-publish_b:false`, ]; if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From f1910544cf6df50bcb175b66b604f5903f6ae3fa Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 27 Jul 2024 13:34:00 +0700 Subject: update category management for lob --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 66f517ae..b6b8c795 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -56,7 +56,7 @@ export default async function handler(req, res) { `start=${parseInt(offset)}`, `rows=${limit}`, `sort=${paramOrderBy}`, - // `fq=-publish_b:false`, + `fq=-publish_b:false`, ]; if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From e26e9b44c88cf6cf76ba3ab1d8e8408bf45c61ca Mon Sep 17 00:00:00 2001 From: trisusilo48 Date: Wed, 7 Aug 2024 10:35:54 +0700 Subject: cr fq solr search --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 29471f7b..5c2d4ffc 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -56,7 +56,7 @@ export default async function handler(req, res) { `start=${parseInt(offset)}`, `rows=${limit}`, `sort=${paramOrderBy}`, - `fq=-publish_b:false, product_rating_f:[13 TO *], discount_tier1_v2_f:[1 TO *]`, + `fq=-publish_b:false, product_rating_f:[13 TO *], price_tier1_v2_f:[1 TO *]`, ]; if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From af15f29e8e057b338cbf9d8264edf703a7d624e6 Mon Sep 17 00:00:00 2001 From: trisusilo48 Date: Thu, 8 Aug 2024 08:35:52 +0700 Subject: cr query filter product rating --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 5c2d4ffc..d5a7ab31 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -56,7 +56,7 @@ export default async function handler(req, res) { `start=${parseInt(offset)}`, `rows=${limit}`, `sort=${paramOrderBy}`, - `fq=-publish_b:false, product_rating_f:[13 TO *], price_tier1_v2_f:[1 TO *]`, + `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`, ]; if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From 0b7db052b04ab983632463232fc8190a6f69143a Mon Sep 17 00:00:00 2001 From: trisusilo48 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/pages/api/shop') 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 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/pages/api/shop') 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 From e9f3435ceb5d85e4926f26c3a893b96edb898918 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 24 Aug 2024 09:29:31 +0700 Subject: update ready stock search --- src/pages/api/shop/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 6f98efcb..eadccede 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -18,6 +18,8 @@ export default async function handler(req, res) { let { stock = '' } = req.query; + let isStock = false + let paramOrderBy = ''; switch (orderBy) { case 'price-asc': @@ -33,6 +35,7 @@ export default async function handler(req, res) { paramOrderBy += 'search_rank_weekly_i DESC'; break; case 'stock': + isStock = true paramOrderBy += 'product_rating_f DESC, stock_total_f DESC'; break; case 'flashsale-price-asc': @@ -94,7 +97,7 @@ export default async function handler(req, res) { .join(' OR ')}` ); // if (category) parameter.push(`fq=category_name:${capitalizeFirstLetter(category.replace(/,/g, ' OR '))}`) - if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`); + if (stock || isStock) parameter.push(`fq=stock_total_f:[0.1 TO *]`); // Single fq in url params if (typeof fq === 'string') parameter.push(`fq=${fq}`); -- cgit v1.2.3 From 49118c78bf93fbb4d35b163e4c4b6db0f0f8be27 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 24 Aug 2024 10:25:13 +0700 Subject: update search sort by stock on populer --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index eadccede..f476faf8 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -29,7 +29,7 @@ export default async function handler(req, res) { paramOrderBy += 'price_tier1_v2_f DESC'; break; case 'popular': - paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,'; + paramOrderBy += 'stock_total_f DESC, product_rating_f DESC, search_rank_i DESC,'; break; case 'popular-weekly': paramOrderBy += 'search_rank_weekly_i DESC'; -- cgit v1.2.3 From eb849656d807aa22d14f97f79b6114c599628b42 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 26 Aug 2024 10:37:39 +0700 Subject: back to original code before stock --- src/pages/api/shop/search.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/pages/api/shop') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index f476faf8..6f98efcb 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -18,8 +18,6 @@ export default async function handler(req, res) { let { stock = '' } = req.query; - let isStock = false - let paramOrderBy = ''; switch (orderBy) { case 'price-asc': @@ -29,13 +27,12 @@ export default async function handler(req, res) { paramOrderBy += 'price_tier1_v2_f DESC'; break; case 'popular': - paramOrderBy += 'stock_total_f DESC, product_rating_f DESC, search_rank_i DESC,'; + paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,'; break; case 'popular-weekly': paramOrderBy += 'search_rank_weekly_i DESC'; break; case 'stock': - isStock = true paramOrderBy += 'product_rating_f DESC, stock_total_f DESC'; break; case 'flashsale-price-asc': @@ -97,7 +94,7 @@ export default async function handler(req, res) { .join(' OR ')}` ); // if (category) parameter.push(`fq=category_name:${capitalizeFirstLetter(category.replace(/,/g, ' OR '))}`) - if (stock || isStock) parameter.push(`fq=stock_total_f:[0.1 TO *]`); + if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`); // Single fq in url params if (typeof fq === 'string') parameter.push(`fq=${fq}`); -- cgit v1.2.3