summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pages/api/magento-product.ts29
-rw-r--r--src/pages/api/shop/search.js230
2 files changed, 121 insertions, 138 deletions
diff --git a/src/pages/api/magento-product.ts b/src/pages/api/magento-product.ts
index c494b05d..32dd0e5c 100644
--- a/src/pages/api/magento-product.ts
+++ b/src/pages/api/magento-product.ts
@@ -54,19 +54,14 @@ export default async function handler(
let specsWithLabels: any[] = [];
- // Cek apakah ada custom_attributes
if (data.custom_attributes) {
- // Filter atribut yang kodenya dimulai dengan 'z'
- // FIX: Menghapus filter 'Pakai link' agar MSDS tetap muncul
const zAttributes = data.custom_attributes.filter((attr: any) =>
attr.attribute_code.startsWith('z')
);
- // Fetch detail label untuk setiap atribut secara paralel
specsWithLabels = await Promise.all(
zAttributes.map(async (attr: any) => {
try {
- // Endpoint untuk ambil detail atribut (Label)
const attrUrl = `https://pimdev.1211.my.id/rest/V1/products/attributes/${attr.attribute_code}`;
const attrRes = await fetch(attrUrl, {
@@ -80,7 +75,7 @@ export default async function handler(
if (attrRes.ok) {
const attrData = await attrRes.json();
return {
- code: attr.attribute_code, // FIX: Kirim code agar bisa dideteksi frontend (z_doc_)
+ code: attr.attribute_code,
label: attrData.default_frontend_label || attr.attribute_code,
value: attr.value
};
@@ -89,12 +84,11 @@ export default async function handler(
console.error(`Failed to fetch label for ${attr.attribute_code}`);
}
- // Fallback: Format manual
const fallbackLabel = attr.attribute_code
.substring(1).replace(/_/g, ' ').trim();
return {
- code: attr.attribute_code, // FIX: Kirim code di fallback juga
+ code: attr.attribute_code,
label: fallbackLabel,
value: attr.value
};
@@ -103,15 +97,24 @@ export default async function handler(
}
// =====================================================================
- // TAMBAHAN 2: AMBIL UP-SELLS (product_links)
+ // TAMBAHAN 2: AMBIL UP-SELLS (product_links type = upsell)
// =====================================================================
let upsellIds: number[] = [];
if (data.product_links && Array.isArray(data.product_links)) {
upsellIds = data.product_links
- // Filter hanya link type 'upsell'
.filter((link: any) => link.link_type === 'upsell')
- // Ambil SKU (yang isinya ID Odoo) dan ubah ke number
+ .map((link: any) => Number(link.linked_product_sku));
+ }
+
+ // =====================================================================
+ // TAMBAHAN 3: AMBIL RELATED PRODUCTS (product_links type = related)
+ // =====================================================================
+ let relatedIds: number[] = [];
+
+ if (data.product_links && Array.isArray(data.product_links)) {
+ relatedIds = data.product_links
+ .filter((link: any) => link.link_type === 'related')
.map((link: any) => Number(link.linked_product_sku));
}
@@ -121,10 +124,12 @@ export default async function handler(
const responseData = {
...data,
specs: specsWithLabels, // Data Spesifikasi (z_*)
- upsell_ids: upsellIds // Data Upsell ID (product_links)
+ upsell_ids: upsellIds, // Data Upsell ID
+ related_ids: relatedIds // Data Related ID (BARU)
};
res.status(200).json(responseData);
+ console.log(responseData);
} catch (error) {
console.error('Proxy Server Error:', error);
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 42d16100..7d4adfcb 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -12,7 +12,7 @@ export default async function handler(req, res) {
priceTo = 0,
orderBy = '',
operation = 'AND',
- fq = '',
+ fq = '', // bisa berupa string atau array
limit = 30,
source = '',
} = req.query;
@@ -20,107 +20,119 @@ export default async function handler(req, res) {
let { stock = '' } = req.query;
// ============================================================
- // SITEMAP
+ // LOGIC KHUSUS UPSELL (Simple & Direct)
// ============================================================
- if (source === 'sitemap') {
+ if (source === 'upsell') {
try {
- const offset = (page - 1) * limit;
+ // Ambil fq dari query (format: product_id_i:(...))
+ // Pastikan fq adalah string tunggal
+ let fqUpsell = Array.isArray(fq) ? fq.join(' OR ') : fq;
+ fqUpsell = decodeURIComponent(fqUpsell);
const parameter = [
'q=*:*',
`rows=${limit}`,
- `start=${offset}`,
- 'fl=product_id_i,name_s,default_code_s,image_s,category_name',
'wt=json',
- 'omitHeader=true',
+ 'indent=true',
+ 'defType=edismax',
+ // Filter Query khusus Upsell
+ `fq=${encodeURIComponent(fqUpsell)}`,
+ // Tetap filter yang publish & ada harga agar produk valid
+ `fq=${encodeURIComponent('-publish_b:false')}`,
+ `fq=${encodeURIComponent('price_tier1_v2_f:[1 TO *]')}`
];
- // const parameter = [
- // 'q=*:*',
- // `rows=${limit}`,
- // `start=${offset}`,
-
- // // ❌ EXCLUDE PROMOTION
- // 'fq=-(name_s:*promotion* OR display_name_s:*promotion* OR variants_name_t:*promotion*)',
-
- // // ❌ EXCLUDE DUMMY PRODUCT
- // 'fq=-(name_s:*dummy* OR display_name_s:*dummy* OR variants_name_t:*dummy* OR default_code_s:A.*)',
+ // PENTING: SEARCH DI CORE 'VARIANTS'
+ const solrUrl = process.env.SOLR_HOST + '/solr/variants/select?' + parameter.join('&');
- // 'fl=product_id_i,name_s,default_code_s,image_s,category_name',
- // 'wt=json',
- // 'omitHeader=true',
- // ];
+ const result = await axios(solrUrl);
- const solrUrl =
- process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&');
-
- // console.log('[SITEMAP SOLR QUERY]', solrUrl);
-
- const result = await axios(solrUrl, { timeout: 25000 });
-
- // mapping seperti biasa
- result.data.response.products = productMappingSolr(
+ // 1. Mapping dasar
+ const mappedProducts = productMappingSolr(
result.data.response.docs,
false
);
- delete result.data.response.docs;
+ // 2. FIX URL LINK: Override ID Varian dengan Template ID
+ const rawDocs = result.data.response.docs;
+
+ const fixedProducts = mappedProducts.map((p, index) => {
+ const raw = rawDocs[index];
+ if (raw && raw.template_id_i) {
+ return {
+ ...p,
+ id: raw.template_id_i, // Ganti ID Varian jadi ID Template agar link valid
+ variantId: raw.product_id_i
+ };
+ }
+ return p;
+ });
+
+ const finalResponse = {
+ ...result.data,
+ response: {
+ ...result.data.response,
+ products: fixedProducts
+ }
+ };
+
+ delete finalResponse.response.docs;
+ const camelCasedData = camelcaseObjectDeep(finalResponse);
+
+ return res.status(200).json(camelCasedData);
- result.data = camelcaseObjectDeep(result.data);
+ } catch (e) {
+ console.error('[UPSELL ERROR]', e.response?.data || e.message);
+ return res.status(200).json({ response: { products: [], numFound: 0 } });
+ }
+ }
+ // ============================================================
+ // SITEMAP (Biarkan tetap sama)
+ // ============================================================
+ if (source === 'sitemap') {
+ try {
+ const offset = (page - 1) * limit;
+ const parameter = [
+ 'q=*:*',
+ `rows=${limit}`,
+ `start=${offset}`,
+ 'fl=product_id_i,name_s,default_code_s,image_s,category_name',
+ 'wt=json',
+ 'omitHeader=true',
+ ];
+ const solrUrl = process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&');
+ const result = await axios(solrUrl, { timeout: 25000 });
+ result.data.response.products = productMappingSolr(result.data.response.docs, false);
+ delete result.data.response.docs;
+ result.data = camelcaseObjectDeep(result.data);
return res.status(200).json(result.data);
} catch (e) {
- console.error('[SITEMAP ERROR]', e);
return res.status(500).json({ error: 'Sitemap query failed' });
}
}
// ============================================================
- // SEARCH NORMAL
+ // SEARCH NORMAL (LOGIKA LAMA)
// ============================================================
let paramOrderBy = '';
switch (orderBy) {
- case 'flashsale-discount-desc':
- paramOrderBy += 'flashsale_discount_f DESC';
- break;
- case 'price-asc':
- paramOrderBy += 'price_tier1_v2_f ASC';
- break;
- case 'price-desc':
- paramOrderBy += 'price_tier1_v2_f DESC';
- break;
- case 'popular':
- paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,';
- break;
- case 'popular-weekly':
- paramOrderBy += 'search_rank_weekly_i DESC';
- break;
- case 'stock':
- paramOrderBy += 'product_rating_f DESC, stock_total_f DESC';
- break;
- case 'flashsale-price-asc':
- paramOrderBy += 'flashsale_price_f ASC';
- break;
- default:
- paramOrderBy += '';
- break;
+ case 'flashsale-discount-desc': paramOrderBy += 'flashsale_discount_f DESC'; break;
+ case 'price-asc': paramOrderBy += 'price_tier1_v2_f ASC'; break;
+ case 'price-desc': paramOrderBy += 'price_tier1_v2_f DESC'; break;
+ case 'popular': paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,'; break;
+ case 'popular-weekly': paramOrderBy += 'search_rank_weekly_i DESC'; break;
+ case 'stock': paramOrderBy += 'product_rating_f DESC, stock_total_f DESC'; break;
+ case 'flashsale-price-asc': paramOrderBy += 'flashsale_price_f ASC'; break;
+ default: paramOrderBy += ''; break;
}
let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
let newQ = escapeSolrQuery(q);
- const formattedQuery = `(${newQ
- .split(' ')
- .map((term) => (term.length < 2 ? term : `${term}*`))
- .join(' ')})`;
-
- const mm =
- checkQ.length > 2
- ? checkQ.length > 5
- ? '55%'
- : '85%'
- : `${checkQ.length}`;
+ const formattedQuery = `(${newQ.split(' ').map((term) => (term.length < 2 ? term : `${term}*`)).join(' ')})`;
+ const mm = checkQ.length > 2 ? (checkQ.length > 5 ? '55%' : '85%') : `${checkQ.length}`;
const filterQueries = [
'-publish_b:false',
@@ -128,23 +140,19 @@ export default async function handler(req, res) {
'price_tier1_v2_f:[1 TO *]',
];
- if (orderBy === 'stock') {
- filterQueries.push('stock_total_f:[1 TO *]');
- }
+ if (orderBy === 'stock') filterQueries.push('stock_total_f:[1 TO *]');
- if (fq && source != 'similar' && typeof fq != 'string') {
- fq.push(...filterQueries);
+ // Handle 'fq' parameter from request
+ let finalFq = [...filterQueries];
+ if (fq) {
+ if (Array.isArray(fq)) finalFq.push(...fq);
+ else finalFq.push(fq);
}
- const fq_ = filterQueries.join(' AND ');
-
let keywords = newQ;
if (source === 'similar' || checkQ.length < 3) {
- if (checkQ.length < 2 || checkQ[1].length < 2) {
- keywords = newQ;
- } else {
- keywords = newQ + '*';
- }
+ if (checkQ.length < 2 || checkQ[1].length < 2) keywords = newQ;
+ else keywords = newQ + '*';
} else {
keywords = formattedQuery;
}
@@ -164,16 +172,16 @@ export default async function handler(req, res) {
`start=${parseInt(offset)}`,
`rows=${limit}`,
`sort=${paramOrderBy}`,
- `fq=${encodeURIComponent(fq_)}`,
`mm=${encodeURIComponent(mm)}`,
];
+ // Masukkan semua Filter Query (fq)
+ finalFq.forEach(f => {
+ parameter.push(`fq=${encodeURIComponent(f)}`);
+ });
+
if (priceFrom > 0 || priceTo > 0) {
- parameter.push(
- `fq=price_tier1_v2_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
- priceTo == '' ? '*' : priceTo
- }]`
- );
+ parameter.push(`fq=price_tier1_v2_f:[${priceFrom || '*'} TO ${priceTo || '*'}]`);
}
let { auth } = req.cookies;
@@ -183,49 +191,28 @@ export default async function handler(req, res) {
}
if (brand) {
- const brandExpr = brand
- .split(',')
- .map(
- (manufacturer) =>
- `manufacture_name:"${encodeURIComponent(manufacturer)}"`
- )
- .join(' OR ');
+ const brandExpr = brand.split(',').map(m => `manufacture_name:"${encodeURIComponent(m)}"`).join(' OR ');
parameter.push(`fq={!tag=brand}(${brandExpr})`);
}
if (category) {
- const catExpr = category
- .split(',')
- .map((cat) => `category_name:"${encodeURIComponent(cat)}"`)
- .join(' OR ');
+ const catExpr = category.split(',').map(c => `category_name:"${encodeURIComponent(c)}"`).join(' OR ');
parameter.push(`fq={!tag=cat}(${catExpr})`);
}
if (stock) parameter.push(`fq=stock_total_f:(1 TO *)`);
- if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
-
- if (Array.isArray(fq))
- parameter = parameter.concat(
- fq.map((val) => `fq=${encodeURIComponent(val)}`)
- );
-
- const solrUrl =
- process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&');
-
- const result = await axios(solrUrl);
+ // SEARCH NORMAL: DEFAULT KE CORE 'PRODUCT'
+ const solrUrl = process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&');
try {
+ const result = await axios(solrUrl);
result.data.response.products = productMappingSolr(
result.data.response.docs,
auth?.pricelist || false
);
- result.data.responseHeader.params.start = parseInt(
- result.data.responseHeader.params.start
- );
- result.data.responseHeader.params.rows = parseInt(
- result.data.responseHeader.params.rows
- );
+ result.data.responseHeader.params.start = parseInt(result.data.responseHeader.params.start);
+ result.data.responseHeader.params.rows = parseInt(result.data.responseHeader.params.rows);
delete result.data.response.docs;
result.data = camelcaseObjectDeep(result.data);
res.status(200).json(result.data);
@@ -236,17 +223,8 @@ export default async function handler(req, res) {
const escapeSolrQuery = (query) => {
if (query == '*') return query;
-
query = query.replace(/-/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;
- });
-
- return escapedWords.join(' ');
-};
+ return words.map((word) => specialChars.test(word) ? word.replace(specialChars, '\\$1') : word).join(' ');
+}; \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 18:56:33 +0000