From 8ee7bd9211a75809e1819de32ddf974c3736ebde Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 5 Dec 2025 16:46:24 +0700 Subject: Initial COmmit baru --- indoteknik_custom/models/keywords.py | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 indoteknik_custom/models/keywords.py (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py new file mode 100644 index 00000000..38b6e2fe --- /dev/null +++ b/indoteknik_custom/models/keywords.py @@ -0,0 +1,52 @@ +from itertools import product +from odoo import fields, models, api, tools, _ +import logging +import re +import pysolr +from odoo.exceptions import UserError +import base64 +import xlrd, xlwt +import io + + +_logger = logging.getLogger(__name__) + +class Keywords(models.Model): + _name = 'keywords' + _order= 'id desc' + + category_id = fields.Many2one('product.public.category', string='Category') + keywords = fields.Char('Keywords') + product_ids = fields.One2many('product.product', 'keyword_id', string='Products') + + @api.constrains('product_ids', 'keywords', 'category_id') + def action_generate_products(self): + for record in self: + if not record.keywords: + continue + + domain = [ + ('name', 'ilike', record.keywords), + ('product_rating', '>=', 8), + ('unpublish', '=', False) + ] + + # if record.category_id: + # domain += [(record.product_ids.id, 'in', record.category_id.id)] + + matched_products = self.env['product.product'].search(domain) + + record.product_ids = [(6, 0, matched_products.ids)] + + _logger.info('Generated %s products for keyword "%s"', len(matched_products), record.keywords) + + @api.model + def create(self, vals): + record = super().create(vals) + record.action_generate_products() + return record + + def write(self, vals): + result = super().write(vals) + self.action_generate_products() + return result -- cgit v1.2.3 From e27101a407ad9df9b341149b2b5ff5120062a464 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Mon, 8 Dec 2025 13:03:38 +0700 Subject: done temp --- indoteknik_custom/models/keywords.py | 69 +++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 17 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 38b6e2fe..6e34642a 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -15,38 +15,73 @@ class Keywords(models.Model): _name = 'keywords' _order= 'id desc' - category_id = fields.Many2one('product.public.category', string='Category') - keywords = fields.Char('Keywords') - product_ids = fields.One2many('product.product', 'keyword_id', string='Products') + category_id = fields.Many2one('product.public.category', string='Category', required=True) + keywords = fields.Char('Keywords', required=True) + product_ids = fields.Many2many( + 'product.product', + 'keywords_product_rel', + 'keyword_id', + 'product_id', + string='Products' + ) + skip = fields.Boolean('Skip Generate Product', default=False) - @api.constrains('product_ids', 'keywords', 'category_id') - def action_generate_products(self): + + def generate_products(self): + """Generate product_ids menggunakan SQL mentah (super cepat).""" for record in self: if not record.keywords: continue - domain = [ - ('name', 'ilike', record.keywords), - ('product_rating', '>=', 8), - ('unpublish', '=', False) - ] + keyword = "%" + record.keywords.strip() + "%" + + # Query dasar + sql = """ + SELECT pp.id + FROM product_product pp + JOIN product_template pt ON pt.id = pp.product_tmpl_id + LEFT JOIN product_public_category_product_template_rel rel + ON rel.product_template_id = pt.id + WHERE ( + pt.name ILIKE %s + OR pt.website_description ILIKE %s + AND pt.unpublished = False + AND pt.product_rating >= 8 + ) + """ + + params = [keyword, keyword] + + # Filter kategori kalau ada + if record.category_id: + sql += " AND rel.product_public_category_id = %s" + params.append(record.category_id.id) - # if record.category_id: - # domain += [(record.product_ids.id, 'in', record.category_id.id)] + # Eksekusi SQL + self.env.cr.execute(sql, params) + rows = self.env.cr.fetchall() - matched_products = self.env['product.product'].search(domain) + product_ids = [r[0] for r in rows] - record.product_ids = [(6, 0, matched_products.ids)] + # Update Many2many + record.with_context(skip_generate=True).write({ + 'product_ids': [(6, 0, product_ids)] + }) - _logger.info('Generated %s products for keyword "%s"', len(matched_products), record.keywords) + _logger.info( + "SQL FAST MODE: Found %s products for keyword '%s'", + len(product_ids), + record.keywords + ) @api.model def create(self, vals): record = super().create(vals) - record.action_generate_products() + record.generate_products() return record def write(self, vals): result = super().write(vals) - self.action_generate_products() + if not self.env.context.get("skip_generate") and self.skip == False: + self.generate_products() return result -- cgit v1.2.3 From f71156bc5e0ce9ceb22215a4345518b02f5250ed Mon Sep 17 00:00:00 2001 From: Mqdd Date: Mon, 8 Dec 2025 15:19:36 +0700 Subject: solr --- indoteknik_custom/models/keywords.py | 76 ++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 8 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 6e34642a..b1f2642d 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -7,9 +7,12 @@ from odoo.exceptions import UserError import base64 import xlrd, xlwt import io +from bs4 import BeautifulSoup _logger = logging.getLogger(__name__) +# solr = pysolr.Solr('http://10.148.0.5:8983/solr/keywords/', always_commit=True, timeout=30) +solr = pysolr.Solr('http://127.0.0.1:8983/solr/keywords/', always_commit=True, timeout=30) class Keywords(models.Model): _name = 'keywords' @@ -24,18 +27,22 @@ class Keywords(models.Model): 'product_id', string='Products' ) + name = fields.Char('Name', compute="_compute_name") skip = fields.Boolean('Skip Generate Product', default=False) + def _compute_name(self): + for record in self: + if not record.name: + record.name = record.keywords + def generate_products(self): - """Generate product_ids menggunakan SQL mentah (super cepat).""" for record in self: if not record.keywords: continue keyword = "%" + record.keywords.strip() + "%" - # Query dasar sql = """ SELECT pp.id FROM product_product pp @@ -52,28 +59,81 @@ class Keywords(models.Model): params = [keyword, keyword] - # Filter kategori kalau ada if record.category_id: sql += " AND rel.product_public_category_id = %s" params.append(record.category_id.id) - # Eksekusi SQL - self.env.cr.execute(sql, params) + # Exec query rows = self.env.cr.fetchall() product_ids = [r[0] for r in rows] - # Update Many2many record.with_context(skip_generate=True).write({ 'product_ids': [(6, 0, product_ids)] }) _logger.info( - "SQL FAST MODE: Found %s products for keyword '%s'", + "SQL : Found %s products for keyword '%s'", len(product_ids), record.keywords ) + + def sync_solr(self): + solr = self.env['apache.solr'] # pastikan ini model Solr sudah ada + documents = [] + + # Sync Keywords + for keyword in self.search([]): + doc = { + 'id': f'keyword_{keyword.id}', # prefix biar unik di Solr + 'type_s': 'keyword', + 'name_s': keyword.keywords, + 'category_id_i': keyword.category_id.id if keyword.category_id else 0, + 'product_ids_ii': keyword.product_ids.ids, + } + documents.append(doc) + _logger.info('Prepared Solr document for keyword %s', keyword.keywords) + + # Sync Products + products = self.env['product.product'].search([]) + for product in products: + category_ids = [c.id for c in product.public_categ_ids] + doc = { + 'id': f'product_{product.id}', + 'type_s': 'product', + 'name_s': product.name, + 'default_code_s': product.default_code or '', + 'category_ids_ii': category_ids, + 'website_description_t': product.website_description or '', + 'product_rating_f': getattr(product, 'virtual_rating', 0), + 'active_b': product.active, + } + documents.append(doc) + _logger.info('Prepared Solr document for product %s', product.name) + + # Sync Categories + categories = self.env['product.public.category'].search([]) + for cat in categories: + doc = { + 'id': f'category_{cat.id}', + 'type_s': 'category', + 'name_s': cat.name, + 'parent_id_i': cat.parent_id.id if cat.parent_id else 0, + } + documents.append(doc) + _logger.info('Prepared Solr document for category %s', cat.name) + + # Kirim ke Solr + if documents: + try: + solr.add(documents, softCommit=True) + _logger.info('Synced %d documents to Solr', len(documents)) + except Exception as e: + _logger.error('Failed to sync documents to Solr: %s', e) + else: + _logger.warning('No documents to sync to Solr') + @api.model def create(self, vals): record = super().create(vals) @@ -82,6 +142,6 @@ class Keywords(models.Model): def write(self, vals): result = super().write(vals) - if not self.env.context.get("skip_generate") and self.skip == False: + if not self.env.context.get("skip_generate") and not self.skip: self.generate_products() return result -- cgit v1.2.3 From b92137264988d43477da7d308ecc9ac7e68f36f1 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Tue, 9 Dec 2025 09:20:20 +0700 Subject: solr & fix cannot fetch data --- indoteknik_custom/models/keywords.py | 91 ++++++++++++++---------------------- 1 file changed, 36 insertions(+), 55 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index b1f2642d..de7636b7 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -35,6 +35,16 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords + # @api.constrains('keywords') + # def check_already_exist(self): + # model = self.env['keywords'] + # for record in self: + # match = model.search([ + # ('name', 'ilike', record.name) + # ]) + # if match: + # raise UserError("Tidak bisa create/write/duplicate karena keywords sudah dipakai") + def generate_products(self): for record in self: @@ -43,6 +53,7 @@ class Keywords(models.Model): keyword = "%" + record.keywords.strip() + "%" + # Query dasar sql = """ SELECT pp.id FROM product_product pp @@ -59,11 +70,16 @@ class Keywords(models.Model): params = [keyword, keyword] + # Filter kategori ke child if record.category_id: - sql += " AND rel.product_public_category_id = %s" - params.append(record.category_id.id) - - # Exec query + child_categs = self.env['product.public.category'].search([ + ('id', 'child_of', record.category_id.id) + ]) + sql += " AND rel.product_public_category_id = ANY(%s)" + params.append(child_categs.ids) + + # Exec SQL + self.env.cr.execute(sql, params) rows = self.env.cr.fetchall() product_ids = [r[0] for r in rows] @@ -73,66 +89,31 @@ class Keywords(models.Model): }) _logger.info( - "SQL : Found %s products for keyword '%s'", + "Product Found: Found %s products for keyword '%s'", len(product_ids), record.keywords ) - def sync_solr(self): - solr = self.env['apache.solr'] # pastikan ini model Solr sudah ada + # solr_model = self.env['apache.solr'] documents = [] - - # Sync Keywords + data = {} for keyword in self.search([]): - doc = { - 'id': f'keyword_{keyword.id}', # prefix biar unik di Solr - 'type_s': 'keyword', - 'name_s': keyword.keywords, - 'category_id_i': keyword.category_id.id if keyword.category_id else 0, - 'product_ids_ii': keyword.product_ids.ids, - } - documents.append(doc) - _logger.info('Prepared Solr document for keyword %s', keyword.keywords) - - # Sync Products - products = self.env['product.product'].search([]) - for product in products: - category_ids = [c.id for c in product.public_categ_ids] - doc = { - 'id': f'product_{product.id}', - 'type_s': 'product', - 'name_s': product.name, - 'default_code_s': product.default_code or '', - 'category_ids_ii': category_ids, - 'website_description_t': product.website_description or '', - 'product_rating_f': getattr(product, 'virtual_rating', 0), - 'active_b': product.active, - } - documents.append(doc) - _logger.info('Prepared Solr document for product %s', product.name) - - # Sync Categories - categories = self.env['product.public.category'].search([]) - for cat in categories: - doc = { - 'id': f'category_{cat.id}', - 'type_s': 'category', - 'name_s': cat.name, - 'parent_id_i': cat.parent_id.id if cat.parent_id else 0, - } - documents.append(doc) - _logger.info('Prepared Solr document for category %s', cat.name) - - # Kirim ke Solr - if documents: try: - solr.add(documents, softCommit=True) - _logger.info('Synced %d documents to Solr', len(documents)) + doc = { + 'id': f'keyword_{keyword.id}', + 'type_s': 'keyword', + 'name_s': keyword.keywords, + 'category_id_i': keyword.category_id.id if keyword.category_id else 0, + 'product_ids_ii': keyword.product_ids.ids, + } + documents.append(doc) + data = doc except Exception as e: - _logger.error('Failed to sync documents to Solr: %s', e) - else: - _logger.warning('No documents to sync to Solr') + _logger.error('failed %s', e) + _logger.error('doc data: %s', data) + solr.add(documents) + return True @api.model def create(self, vals): -- cgit v1.2.3 From ea7edf0fee4949203e94360882590ea0c9bb3b0b Mon Sep 17 00:00:00 2001 From: Mqdd Date: Tue, 9 Dec 2025 10:32:27 +0700 Subject: done solr --- indoteknik_custom/models/keywords.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index de7636b7..fd8603c6 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -11,8 +11,8 @@ from bs4 import BeautifulSoup _logger = logging.getLogger(__name__) -# solr = pysolr.Solr('http://10.148.0.5:8983/solr/keywords/', always_commit=True, timeout=30) -solr = pysolr.Solr('http://127.0.0.1:8983/solr/keywords/', always_commit=True, timeout=30) +# solr = pysolr.Solr('http://10.148.0.5:8983/solr/searchkey/', always_commit=True, timeout=30) +solr = pysolr.Solr('http://127.0.0.1:8983/solr/searchkey/', always_commit=True, timeout=30) class Keywords(models.Model): _name = 'keywords' @@ -29,6 +29,18 @@ class Keywords(models.Model): ) name = fields.Char('Name', compute="_compute_name") skip = fields.Boolean('Skip Generate Product', default=False) + url = fields.Char('Website URL', compute="_compute_url") + + @api.depends('keywords') + def _compute_url(self): + prefix = "https://indoteknik.com/searchkey/" + for record in self: + if record.keywords: + slug = re.sub(r'[^a-zA-Z0-9]+', '-', record.keywords.strip().lower()) + slug = slug.strip('-') + record.url = prefix + slug + else: + record.url = False def _compute_name(self): for record in self: @@ -84,6 +96,9 @@ class Keywords(models.Model): product_ids = [r[0] for r in rows] + if not product_ids: + raise UserError("Tidak berhasil menemukan barang") + record.with_context(skip_generate=True).write({ 'product_ids': [(6, 0, product_ids)] }) @@ -101,11 +116,11 @@ class Keywords(models.Model): for keyword in self.search([]): try: doc = { - 'id': f'keyword_{keyword.id}', + 'id': keyword.id, 'type_s': 'keyword', - 'name_s': keyword.keywords, - 'category_id_i': keyword.category_id.id if keyword.category_id else 0, - 'product_ids_ii': keyword.product_ids.ids, + 'keywords_t': keyword.keywords, + 'url_s': keyword.url, + 'product_ids_is': keyword.product_ids.ids, } documents.append(doc) data = doc -- cgit v1.2.3 From c13ed8b1f00d513bec387c614ac785c7c91debf7 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 10 Dec 2025 07:53:30 +0700 Subject: Add count product --- indoteknik_custom/models/keywords.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index fd8603c6..a8d2fce6 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -30,6 +30,12 @@ class Keywords(models.Model): name = fields.Char('Name', compute="_compute_name") skip = fields.Boolean('Skip Generate Product', default=False) url = fields.Char('Website URL', compute="_compute_url") + sum = fields.Integer('Total Product', compute="_compute_total_product", readonly=True) + + @api.depends('product_ids') + def _compute_total_product(self): + for record in self: + record.sum = len(record.product_ids) @api.depends('keywords') def _compute_url(self): @@ -114,13 +120,15 @@ class Keywords(models.Model): documents = [] data = {} for keyword in self.search([]): + searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') try: doc = { 'id': keyword.id, - 'type_s': 'keyword', - 'keywords_t': keyword.keywords, + # 'type_s': 'keyword', + 'keywords_s': searchkey, + # 'searchkey_t': searchkey, 'url_s': keyword.url, - 'product_ids_is': keyword.product_ids.ids, + 'product_ids_is': [p.product_tmpl_id.id for p in keyword.product_ids] } documents.append(doc) data = doc -- cgit v1.2.3 From 2ae552a716040d65690bd20e6b1854d5201d32bd Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 10 Dec 2025 13:06:25 +0700 Subject: throw category to solr --- indoteknik_custom/models/keywords.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index a8d2fce6..cee189c4 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -125,6 +125,7 @@ class Keywords(models.Model): doc = { 'id': keyword.id, # 'type_s': 'keyword', + 'category_id_i': keyword.category_id.id, 'keywords_s': searchkey, # 'searchkey_t': searchkey, 'url_s': keyword.url, -- cgit v1.2.3 From 64da5a5b37a7c016e863b2c3d615a21bdb45839a Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 10 Dec 2025 13:25:56 +0700 Subject: remove unused solr field --- indoteknik_custom/models/keywords.py | 1 - 1 file changed, 1 deletion(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index cee189c4..03f5a11d 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -124,7 +124,6 @@ class Keywords(models.Model): try: doc = { 'id': keyword.id, - # 'type_s': 'keyword', 'category_id_i': keyword.category_id.id, 'keywords_s': searchkey, # 'searchkey_t': searchkey, -- cgit v1.2.3 From ed88e91aa769e07ba048fd8b3067442754c06065 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 11 Dec 2025 08:53:01 +0700 Subject: disable query --- indoteknik_custom/models/keywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 03f5a11d..5faa94a6 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -146,6 +146,6 @@ class Keywords(models.Model): def write(self, vals): result = super().write(vals) - if not self.env.context.get("skip_generate") and not self.skip: - self.generate_products() + # if not self.env.context.get("skip_generate") and not self.skip: + # self.generate_products() return result -- cgit v1.2.3 From 0a81a44ccfdfc7219ee29b2b6f79fa73143e095d Mon Sep 17 00:00:00 2001 From: Mqdd Date: Mon, 15 Dec 2025 13:42:30 +0700 Subject: add button generate product manually --- indoteknik_custom/models/keywords.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 5faa94a6..495a42cc 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -1,4 +1,5 @@ from itertools import product +from multiprocessing import Condition from odoo import fields, models, api, tools, _ import logging import re @@ -68,6 +69,8 @@ class Keywords(models.Model): for record in self: if not record.keywords: continue + if record.skip: + continue keyword = "%" + record.keywords.strip() + "%" @@ -141,7 +144,7 @@ class Keywords(models.Model): @api.model def create(self, vals): record = super().create(vals) - record.generate_products() + # record.generate_products() return record def write(self, vals): -- cgit v1.2.3 From 274a067754ae67bc0f7f77c4c079aa2634b8000c Mon Sep 17 00:00:00 2001 From: Mqdd Date: Mon, 15 Dec 2025 15:11:30 +0700 Subject: add clear button --- indoteknik_custom/models/keywords.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 495a42cc..3602be15 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -65,6 +65,10 @@ class Keywords(models.Model): # raise UserError("Tidak bisa create/write/duplicate karena keywords sudah dipakai") + def clear_products(self): + for record in self: + record.product_ids = [(5, 0, 0)] + def generate_products(self): for record in self: if not record.keywords: -- cgit v1.2.3 From dcfbed94e24f7bf6fd06bd0404c1424af2a840be Mon Sep 17 00:00:00 2001 From: Mqdd Date: Tue, 16 Dec 2025 09:39:32 +0700 Subject: fix quey --- indoteknik_custom/models/keywords.py | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 3602be15..e0c7705c 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -71,31 +71,31 @@ class Keywords(models.Model): def generate_products(self): for record in self: - if not record.keywords: - continue - if record.skip: + if not record.keywords or record.skip: continue - keyword = "%" + record.keywords.strip() + "%" + keyword = f"%{record.keywords.strip()}%" - # Query dasar sql = """ - SELECT pp.id + SELECT DISTINCT pp.id FROM product_product pp JOIN product_template pt ON pt.id = pp.product_tmpl_id - LEFT JOIN product_public_category_product_template_rel rel + JOIN product_public_category_product_template_rel rel ON rel.product_template_id = pt.id - WHERE ( - pt.name ILIKE %s - OR pt.website_description ILIKE %s - AND pt.unpublished = False - AND pt.product_rating >= 8 - ) + WHERE + pp.active = true + AND COALESCE(pt.product_rating, 0) >= 8 + AND ( + pt.name ILIKE %s + OR COALESCE(pt.website_description, '') ILIKE %s + ) """ - params = [keyword, keyword] + params = [ + keyword, + keyword, + ] - # Filter kategori ke child if record.category_id: child_categs = self.env['product.public.category'].search([ ('id', 'child_of', record.category_id.id) @@ -103,14 +103,15 @@ class Keywords(models.Model): sql += " AND rel.product_public_category_id = ANY(%s)" params.append(child_categs.ids) - # Exec SQL self.env.cr.execute(sql, params) - rows = self.env.cr.fetchall() + rows = self.env.cr.fetchall() product_ids = [r[0] for r in rows] if not product_ids: - raise UserError("Tidak berhasil menemukan barang") + raise UserError( + f"Tidak berhasil menemukan barang untuk keyword '{record.keywords}'" + ) record.with_context(skip_generate=True).write({ 'product_ids': [(6, 0, product_ids)] @@ -121,7 +122,6 @@ class Keywords(models.Model): len(product_ids), record.keywords ) - def sync_solr(self): # solr_model = self.env['apache.solr'] documents = [] -- cgit v1.2.3 From 33e6fc960fc3dcdbb77eedbff6239b7763ace468 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 18 Dec 2025 10:52:43 +0700 Subject: fix query --- indoteknik_custom/models/keywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index e0c7705c..69ecdd46 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -83,8 +83,8 @@ class Keywords(models.Model): JOIN product_public_category_product_template_rel rel ON rel.product_template_id = pt.id WHERE - pp.active = true - AND COALESCE(pt.product_rating, 0) >= 8 + COALESCE(pt.product_rating, 0) >= 3 + AND (pt.unpublished IS FALSE OR pt.unpublished IS NULL) AND ( pt.name ILIKE %s OR COALESCE(pt.website_description, '') ILIKE %s -- cgit v1.2.3 From fbb30fff2489546e4c21ab55d504b6b861e70deb Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 18 Dec 2025 15:43:02 +0700 Subject: fix solr sync --- indoteknik_custom/models/keywords.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 69ecdd46..225710ab 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -76,6 +76,7 @@ class Keywords(models.Model): keyword = f"%{record.keywords.strip()}%" + # AND (pt.unpublished IS FALSE OR pt.unpublished IS NULL) sql = """ SELECT DISTINCT pp.id FROM product_product pp @@ -83,11 +84,11 @@ class Keywords(models.Model): JOIN product_public_category_product_template_rel rel ON rel.product_template_id = pt.id WHERE - COALESCE(pt.product_rating, 0) >= 3 - AND (pt.unpublished IS FALSE OR pt.unpublished IS NULL) + pt.product_rating >= 3 + AND pp.active IS TRUE AND ( pt.name ILIKE %s - OR COALESCE(pt.website_description, '') ILIKE %s + OR pt.website_description ILIKE %s ) """ @@ -122,27 +123,34 @@ class Keywords(models.Model): len(product_ids), record.keywords ) + def sync_solr(self): - # solr_model = self.env['apache.solr'] + active_ids = self.env.context.get('active_ids', []) + if not active_ids: + _logger.warning("No active_ids found, nothing to sync") + return True + + keywords = self.browse(active_ids) + documents = [] - data = {} - for keyword in self.search([]): + for keyword in keywords: searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') try: doc = { 'id': keyword.id, 'category_id_i': keyword.category_id.id, 'keywords_s': searchkey, - # 'searchkey_t': searchkey, 'url_s': keyword.url, - 'product_ids_is': [p.product_tmpl_id.id for p in keyword.product_ids] + 'product_ids_is': [p.product_tmpl_id.id for p in keyword.product_ids], } documents.append(doc) - data = doc except Exception as e: _logger.error('failed %s', e) - _logger.error('doc data: %s', data) - solr.add(documents) + _logger.error('doc data: %s', doc) + + if documents: + solr.add(documents) + return True @api.model -- cgit v1.2.3 From 9596f3806d8f177c5a701c16be4b10c964be7c07 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 18 Dec 2025 15:43:18 +0700 Subject: fix product rating --- indoteknik_custom/models/keywords.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 225710ab..b2ada3f8 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -84,7 +84,7 @@ class Keywords(models.Model): JOIN product_public_category_product_template_rel rel ON rel.product_template_id = pt.id WHERE - pt.product_rating >= 3 + pt.product_rating >= 8 AND pp.active IS TRUE AND ( pt.name ILIKE %s -- cgit v1.2.3 From 41e5e8defc0d0b928e43307f72887b0789ffb589 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 18 Dec 2025 16:00:19 +0700 Subject: fix duplicate keywords functions --- indoteknik_custom/models/keywords.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index b2ada3f8..41deea3e 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -8,7 +8,6 @@ from odoo.exceptions import UserError import base64 import xlrd, xlwt import io -from bs4 import BeautifulSoup _logger = logging.getLogger(__name__) @@ -19,7 +18,7 @@ class Keywords(models.Model): _name = 'keywords' _order= 'id desc' - category_id = fields.Many2one('product.public.category', string='Category', required=True) + category_id = fields.Many2one('product.public.category', string='Category', required=True, help="Category to filter products when generating products for this keyword and to throw to solr") keywords = fields.Char('Keywords', required=True) product_ids = fields.Many2many( 'product.product', @@ -29,9 +28,9 @@ class Keywords(models.Model): string='Products' ) name = fields.Char('Name', compute="_compute_name") - skip = fields.Boolean('Skip Generate Product', default=False) - url = fields.Char('Website URL', compute="_compute_url") - sum = fields.Integer('Total Product', compute="_compute_total_product", readonly=True) + skip = fields.Boolean('Skip Generate Product', default=False, help="If checked, the system will not generate products for this keyword") + url = fields.Char('Website URL', compute="_compute_url", help="Generated website url based on keywords") + sum = fields.Integer('Total Product', compute="_compute_total_product", readonly=True, help="Total products found for this keyword including variants") @api.depends('product_ids') def _compute_total_product(self): @@ -54,15 +53,19 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords - # @api.constrains('keywords') - # def check_already_exist(self): - # model = self.env['keywords'] - # for record in self: - # match = model.search([ - # ('name', 'ilike', record.name) - # ]) - # if match: - # raise UserError("Tidak bisa create/write/duplicate karena keywords sudah dipakai") + @api.constrains('keywords', 'name') + def check_already_exist(self): + model = self.env['keywords'] + for record in self: + match = model.search([ '|', + ('name', '=', record.name), + ('keywords', '=', record.keywords) + ]) + if match: + raise UserError("Tidak bisa create/write/duplicate karena keywords sudah dipakai") + + def copy(self): + raise UserError("Duplicate Record not allowed") def clear_products(self): -- cgit v1.2.3 From 2e3e5853ce9fc3e9568eea3a673c2a154b8de9da Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 19 Dec 2025 15:10:58 +0700 Subject: fix duplicate keywords --- indoteknik_custom/models/keywords.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 41deea3e..fedaa180 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -53,16 +53,15 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords - @api.constrains('keywords', 'name') + @api.depends('keywords') def check_already_exist(self): model = self.env['keywords'] for record in self: - match = model.search([ '|', - ('name', '=', record.name), - ('keywords', '=', record.keywords) + match = model.search([ + ('keywords', 'ilike', record.keywords) ]) if match: - raise UserError("Tidak bisa create/write/duplicate karena keywords sudah dipakai") + raise UserError("Tidak bisa create karena keywords sudah dipakai") def copy(self): raise UserError("Duplicate Record not allowed") @@ -159,11 +158,13 @@ class Keywords(models.Model): @api.model def create(self, vals): record = super().create(vals) + self.check_already_exist() # record.generate_products() return record def write(self, vals): result = super().write(vals) + self.check_already_exist() # if not self.env.context.get("skip_generate") and not self.skip: # self.generate_products() return result -- cgit v1.2.3 From b0c16534780cc69320f16e7d3bbec29a811a6215 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Tue, 30 Dec 2025 11:48:16 +0700 Subject: fix check duplicate --- indoteknik_custom/models/keywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index fedaa180..47546c1f 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -53,12 +53,12 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords - @api.depends('keywords') def check_already_exist(self): model = self.env['keywords'] for record in self: match = model.search([ - ('keywords', 'ilike', record.keywords) + ('keywords', '=', record.keywords), + ('category_id.id', '=', record.category_id.id) ]) if match: raise UserError("Tidak bisa create karena keywords sudah dipakai") -- cgit v1.2.3 From ea309ccb34ed588e91198cde98074c77ed1b2bef Mon Sep 17 00:00:00 2001 From: Mqdd Date: Tue, 30 Dec 2025 16:19:05 +0700 Subject: add brands --- indoteknik_custom/models/keywords.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 47546c1f..ef3715c9 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -20,6 +20,10 @@ class Keywords(models.Model): category_id = fields.Many2one('product.public.category', string='Category', required=True, help="Category to filter products when generating products for this keyword and to throw to solr") keywords = fields.Char('Keywords', required=True) + brand_id = fields.Many2one( + comodel_name="x_manufactures", + string="Brand" + ) product_ids = fields.Many2many( 'product.product', 'keywords_product_rel', @@ -53,15 +57,15 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords - def check_already_exist(self): - model = self.env['keywords'] - for record in self: - match = model.search([ - ('keywords', '=', record.keywords), - ('category_id.id', '=', record.category_id.id) - ]) - if match: - raise UserError("Tidak bisa create karena keywords sudah dipakai") + # def check_already_exist(self): + # model = self.env['keywords'] + # for record in self: + # match = model.search([ + # ('keywords', '=', record.keywords), + # ('category_id.id', '=', record.category_id.id) + # ]) + # if match: + # raise UserError("Tidak bisa create karena keywords sudah dipakai") def copy(self): raise UserError("Duplicate Record not allowed") @@ -158,13 +162,13 @@ class Keywords(models.Model): @api.model def create(self, vals): record = super().create(vals) - self.check_already_exist() + # self.check_already_exist() # record.generate_products() return record def write(self, vals): result = super().write(vals) - self.check_already_exist() + # self.check_already_exist() # if not self.env.context.get("skip_generate") and not self.skip: # self.generate_products() return result -- cgit v1.2.3 From a069b9d6b986e514c17b42df5e807b7076338cda Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 31 Dec 2025 13:29:51 +0700 Subject: add brand & compute url --- indoteknik_custom/models/keywords.py | 92 +++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 22 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index ef3715c9..53cf4225 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -41,16 +41,25 @@ class Keywords(models.Model): for record in self: record.sum = len(record.product_ids) - @api.depends('keywords') + + @api.depends('keywords', 'brand_id') def _compute_url(self): prefix = "https://indoteknik.com/searchkey/" for record in self: - if record.keywords: - slug = re.sub(r'[^a-zA-Z0-9]+', '-', record.keywords.strip().lower()) - slug = slug.strip('-') - record.url = prefix + slug - else: + if not record.keywords: record.url = False + continue + slug = re.sub(r'[^a-zA-Z0-9]+', '-', record.keywords.strip().lower()).strip('-') + + if record.brand_id: + brand_slug = re.sub( + r'[^a-zA-Z0-9]+', + '-', + record.brand_id.x_name.strip().lower() + ).strip('-') + record.url = f"{prefix}{slug}-{brand_slug}" + else: + record.url = f"{prefix}{slug}" def _compute_name(self): for record in self: @@ -75,14 +84,23 @@ class Keywords(models.Model): for record in self: record.product_ids = [(5, 0, 0)] + def generate_products(self): for record in self: - if not record.keywords or record.skip: + if record.skip: continue - keyword = f"%{record.keywords.strip()}%" + if not record.keywords: + raise UserError("Keyword wajib diisi") + + if not record.category_id: + raise UserError( + f"Category wajib diisi untuk keyword '{record.keywords}'" + ) + + keyword_raw = record.keywords.strip() + keyword = f"%{keyword_raw}%" - # AND (pt.unpublished IS FALSE OR pt.unpublished IS NULL) sql = """ SELECT DISTINCT pp.id FROM product_product pp @@ -98,26 +116,55 @@ class Keywords(models.Model): ) """ - params = [ - keyword, - keyword, - ] + params = [keyword, keyword] + + # ====================== + # CATEGORY (WAJIB) + # ====================== + child_categs = self.env['product.public.category'].search([ + ('id', 'child_of', record.category_id.id) + ]) + + sql += " AND rel.product_public_category_id = ANY(%s)" + params.append(child_categs.ids) - if record.category_id: - child_categs = self.env['product.public.category'].search([ - ('id', 'child_of', record.category_id.id) + # ====================== + # BRAND (OPTIONAL) + # ====================== + if record.brand_id: + brand = record.brand_id.x_name.strip() + + brand_kw_1 = f"%{brand} {keyword_raw}%" + brand_kw_2 = f"%{keyword_raw} {brand}%" + + sql += """ + AND ( + pt.name ILIKE %s + OR pt.name ILIKE %s + OR pt.website_description ILIKE %s + OR pt.website_description ILIKE %s + ) + """ + + params.extend([ + brand_kw_1, + brand_kw_2, + brand_kw_1, + brand_kw_2, ]) - sql += " AND rel.product_public_category_id = ANY(%s)" - params.append(child_categs.ids) + # ====================== + # EXECUTE + # ====================== self.env.cr.execute(sql, params) - rows = self.env.cr.fetchall() + product_ids = [r[0] for r in rows] if not product_ids: raise UserError( - f"Tidak berhasil menemukan barang untuk keyword '{record.keywords}'" + f"Tidak menemukan product untuk keyword " + f"'{record.keywords}' di category '{record.category_id.name}'" ) record.with_context(skip_generate=True).write({ @@ -125,9 +172,10 @@ class Keywords(models.Model): }) _logger.info( - "Product Found: Found %s products for keyword '%s'", + "Product Found: %s products | keyword='%s' | category='%s'", len(product_ids), - record.keywords + record.keywords, + record.category_id.name ) def sync_solr(self): -- cgit v1.2.3 From 2d46030560670a0d016012465447ea37b0242581 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 31 Dec 2025 13:57:38 +0700 Subject: cannot sync solr when no products --- indoteknik_custom/models/keywords.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 53cf4225..d7cfc810 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -132,7 +132,7 @@ class Keywords(models.Model): # BRAND (OPTIONAL) # ====================== if record.brand_id: - brand = record.brand_id.x_name.strip() + brand = record.brand_id.x_name brand_kw_1 = f"%{brand} {keyword_raw}%" brand_kw_2 = f"%{keyword_raw} {brand}%" @@ -183,12 +183,16 @@ class Keywords(models.Model): if not active_ids: _logger.warning("No active_ids found, nothing to sync") return True + elif active_ids and self.sum < 1: + raise UserError("Tidak ada product untuk keyword ini, sync ke solr dibatalkan") keywords = self.browse(active_ids) documents = [] for keyword in keywords: searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') + if keyword.brand_id: + searchkey = f"{searchkey}-{keyword.brand_id.x_name.strip().lower().replace(' ', '-')}" try: doc = { 'id': keyword.id, -- cgit v1.2.3 From 604598292fa99546b34422613a8f6399e1a55c61 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 31 Dec 2025 21:54:08 +0700 Subject: fix check duplicate --- indoteknik_custom/models/keywords.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index d7cfc810..f6c1cf6e 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -66,15 +66,18 @@ class Keywords(models.Model): if not record.name: record.name = record.keywords - # def check_already_exist(self): - # model = self.env['keywords'] - # for record in self: - # match = model.search([ - # ('keywords', '=', record.keywords), - # ('category_id.id', '=', record.category_id.id) - # ]) - # if match: - # raise UserError("Tidak bisa create karena keywords sudah dipakai") + @api.constrains('keywords', 'category_id') + def check_already_exist(self): + for record in self: + if not (record.keywords and record.category_id): + continue + match = self.search([ + ('id', '!=', record.id), + ('keywords', '=', record.keywords), + ('category_id', '=', record.category_id.id) + ], limit = 1) + if match: + raise UserError("Tidak bisa create karena keywords sudah dipakai") def copy(self): raise UserError("Duplicate Record not allowed") -- cgit v1.2.3 From 9039bb8de5ea157692120b8b2dd24338a13a0071 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 31 Dec 2025 22:24:35 +0700 Subject: rev query (need improvement) --- indoteknik_custom/models/keywords.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index f6c1cf6e..b5c7ae8c 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -139,6 +139,8 @@ class Keywords(models.Model): brand_kw_1 = f"%{brand} {keyword_raw}%" brand_kw_2 = f"%{keyword_raw} {brand}%" + keyword = f"%{keyword_raw}%" + sql += "AND pt.x_manufacture = %s" sql += """ AND ( @@ -147,13 +149,22 @@ class Keywords(models.Model): OR pt.website_description ILIKE %s OR pt.website_description ILIKE %s ) + OR ( + pt.x_manufacture = %s + AND (pt.name ilike %s + OR pt.website_description ilike %s) + ) """ params.extend([ + record.brand_id.id, brand_kw_1, brand_kw_2, brand_kw_1, brand_kw_2, + record.brand_id.id, + keyword, + keyword ]) # ====================== -- cgit v1.2.3 From 48d95b4e9f11eac11931a4679b0cc5cc3249e69d Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 18 Feb 2026 13:06:30 +0700 Subject: remove brand --- indoteknik_custom/models/keywords.py | 118 ++++++++--------------------------- 1 file changed, 27 insertions(+), 91 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index b5c7ae8c..f4774bbd 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -41,25 +41,16 @@ class Keywords(models.Model): for record in self: record.sum = len(record.product_ids) - - @api.depends('keywords', 'brand_id') + @api.depends('keywords') def _compute_url(self): prefix = "https://indoteknik.com/searchkey/" for record in self: - if not record.keywords: - record.url = False - continue - slug = re.sub(r'[^a-zA-Z0-9]+', '-', record.keywords.strip().lower()).strip('-') - - if record.brand_id: - brand_slug = re.sub( - r'[^a-zA-Z0-9]+', - '-', - record.brand_id.x_name.strip().lower() - ).strip('-') - record.url = f"{prefix}{slug}-{brand_slug}" + if record.keywords: + slug = re.sub(r'[^a-zA-Z0-9]+', '-', record.keywords.strip().lower()) + slug = slug.strip('-') + record.url = prefix + slug else: - record.url = f"{prefix}{slug}" + record.url = False def _compute_name(self): for record in self: @@ -68,14 +59,13 @@ class Keywords(models.Model): @api.constrains('keywords', 'category_id') def check_already_exist(self): + model = self.env['keywords'] for record in self: - if not (record.keywords and record.category_id): - continue - match = self.search([ - ('id', '!=', record.id), + match = model.search([ ('keywords', '=', record.keywords), - ('category_id', '=', record.category_id.id) - ], limit = 1) + ('category_id.id', '=', record.category_id.id), + ('id', '!=', record.id) + ]) if match: raise UserError("Tidak bisa create karena keywords sudah dipakai") @@ -87,23 +77,14 @@ class Keywords(models.Model): for record in self: record.product_ids = [(5, 0, 0)] - def generate_products(self): for record in self: - if record.skip: + if not record.keywords or record.skip: continue - if not record.keywords: - raise UserError("Keyword wajib diisi") - - if not record.category_id: - raise UserError( - f"Category wajib diisi untuk keyword '{record.keywords}'" - ) - - keyword_raw = record.keywords.strip() - keyword = f"%{keyword_raw}%" + keyword = f"%{record.keywords.strip()}%" + # AND (pt.unpublished IS FALSE OR pt.unpublished IS NULL) sql = """ SELECT DISTINCT pp.id FROM product_product pp @@ -119,66 +100,26 @@ class Keywords(models.Model): ) """ - params = [keyword, keyword] - - # ====================== - # CATEGORY (WAJIB) - # ====================== - child_categs = self.env['product.public.category'].search([ - ('id', 'child_of', record.category_id.id) - ]) - - sql += " AND rel.product_public_category_id = ANY(%s)" - params.append(child_categs.ids) - - # ====================== - # BRAND (OPTIONAL) - # ====================== - if record.brand_id: - brand = record.brand_id.x_name + params = [ + keyword, + keyword, + ] - brand_kw_1 = f"%{brand} {keyword_raw}%" - brand_kw_2 = f"%{keyword_raw} {brand}%" - keyword = f"%{keyword_raw}%" - sql += "AND pt.x_manufacture = %s" - - sql += """ - AND ( - pt.name ILIKE %s - OR pt.name ILIKE %s - OR pt.website_description ILIKE %s - OR pt.website_description ILIKE %s - ) - OR ( - pt.x_manufacture = %s - AND (pt.name ilike %s - OR pt.website_description ilike %s) - ) - """ - - params.extend([ - record.brand_id.id, - brand_kw_1, - brand_kw_2, - brand_kw_1, - brand_kw_2, - record.brand_id.id, - keyword, - keyword + if record.category_id: + child_categs = self.env['product.public.category'].search([ + ('id', 'child_of', record.category_id.id) ]) + sql += " AND rel.product_public_category_id = ANY(%s)" + params.append(child_categs.ids) - # ====================== - # EXECUTE - # ====================== self.env.cr.execute(sql, params) - rows = self.env.cr.fetchall() + rows = self.env.cr.fetchall() product_ids = [r[0] for r in rows] if not product_ids: raise UserError( - f"Tidak menemukan product untuk keyword " - f"'{record.keywords}' di category '{record.category_id.name}'" + f"Tidak berhasil menemukan barang untuk keyword '{record.keywords}'" ) record.with_context(skip_generate=True).write({ @@ -186,10 +127,9 @@ class Keywords(models.Model): }) _logger.info( - "Product Found: %s products | keyword='%s' | category='%s'", + "Product Found: Found %s products for keyword '%s'", len(product_ids), - record.keywords, - record.category_id.name + record.keywords ) def sync_solr(self): @@ -197,16 +137,12 @@ class Keywords(models.Model): if not active_ids: _logger.warning("No active_ids found, nothing to sync") return True - elif active_ids and self.sum < 1: - raise UserError("Tidak ada product untuk keyword ini, sync ke solr dibatalkan") keywords = self.browse(active_ids) documents = [] for keyword in keywords: searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') - if keyword.brand_id: - searchkey = f"{searchkey}-{keyword.brand_id.x_name.strip().lower().replace(' ', '-')}" try: doc = { 'id': keyword.id, -- cgit v1.2.3 From e419a0e52ac9d01ac0b8900bfb2bebff1db522c9 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Wed, 18 Feb 2026 14:45:39 +0700 Subject: remove brand_Id --- indoteknik_custom/models/keywords.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index f4774bbd..20a18726 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -20,10 +20,6 @@ class Keywords(models.Model): category_id = fields.Many2one('product.public.category', string='Category', required=True, help="Category to filter products when generating products for this keyword and to throw to solr") keywords = fields.Char('Keywords', required=True) - brand_id = fields.Many2one( - comodel_name="x_manufactures", - string="Brand" - ) product_ids = fields.Many2many( 'product.product', 'keywords_product_rel', -- cgit v1.2.3 From d098ff60225cd6d7770a08bdd1c06aafdd74f1d9 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 19 Feb 2026 15:44:17 +0700 Subject: sync to solr --- indoteknik_custom/models/keywords.py | 66 ++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 20a18726..ca5fc8d0 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -31,6 +31,7 @@ class Keywords(models.Model): skip = fields.Boolean('Skip Generate Product', default=False, help="If checked, the system will not generate products for this keyword") url = fields.Char('Website URL', compute="_compute_url", help="Generated website url based on keywords") sum = fields.Integer('Total Product', compute="_compute_total_product", readonly=True, help="Total products found for this keyword including variants") + solr_flag = fields.Integer(string='Solr Flag', default=0, help="0=no sync needed, 2=needs sync, 1=queued") @api.depends('product_ids') def _compute_total_product(self): @@ -128,7 +129,62 @@ class Keywords(models.Model): record.keywords ) + @api.onchange('keywords', 'category_id', 'product_ids') + def _onchange_solr_flag(self): + """Set solr_flag=2 when tracked fields change to trigger queue sync""" + for record in self: + if not record.skip: + record.solr_flag = 2 + + def solr_flag_to_queue(self, limit=500): + """Find keywords with solr_flag=2 and create apache.solr.queue entries""" + keywords = self.search([('solr_flag', '=', 2)], limit=limit) + + for keyword in keywords: + # Create unique queue entry + queue_obj = self.env['apache.solr.queue'] + queue_obj.create_unique({ + 'res_model': 'keywords', + 'res_id': keyword.id, + 'function_name': '_sync_keywords_queue_callback' + }) + + # Set flag to indicate queued + keyword.solr_flag = 1 + + if keywords: + _logger.info( + 'Queued %s keywords for Solr synchronization', + len(keywords) + ) + + return True + + def _sync_keywords_queue_callback(self): + """Callback method executed by apache.solr.queue - syncs keyword data to Solr""" + documents = [] + for keyword in self: + searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') + try: + doc = { + 'id': keyword.id, + 'category_id_i': keyword.category_id.id, + 'keywords_s': searchkey, + 'url_s': keyword.url, + 'product_ids_is': [p.product_tmpl_id.id for p in keyword.product_ids], + } + documents.append(doc) + except Exception as e: + _logger.error('failed %s', e) + _logger.error('doc data: %s', doc) + + if documents: + solr.add(documents) + + return True + def sync_solr(self): + """Manual sync method for active_ids context (backward compatibility)""" active_ids = self.env.context.get('active_ids', []) if not active_ids: _logger.warning("No active_ids found, nothing to sync") @@ -166,7 +222,11 @@ class Keywords(models.Model): def write(self, vals): result = super().write(vals) - # self.check_already_exist() - # if not self.env.context.get("skip_generate") and not self.skip: - # self.generate_products() + + tracked_fields = ['keywords', 'category_id', 'product_ids'] + neded_sync = any(field in vals for field in tracked_fields) + if neded_sync and self.skip == False: + for record in self: + record.solr_flag = 2 + return result -- cgit v1.2.3 From 605241e33856c45660fce9ba16102557160c235a Mon Sep 17 00:00:00 2001 From: Mqdd Date: Thu, 19 Feb 2026 15:44:47 +0700 Subject: sync solr to production --- indoteknik_custom/models/keywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index ca5fc8d0..4ab649dc 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -11,8 +11,8 @@ import io _logger = logging.getLogger(__name__) -# solr = pysolr.Solr('http://10.148.0.5:8983/solr/searchkey/', always_commit=True, timeout=30) -solr = pysolr.Solr('http://127.0.0.1:8983/solr/searchkey/', always_commit=True, timeout=30) +solr = pysolr.Solr('http://10.148.0.5:8983/solr/searchkey/', always_commit=True, timeout=30) +# solr = pysolr.Solr('http://127.0.0.1:8983/solr/searchkey/', always_commit=True, timeout=30) class Keywords(models.Model): _name = 'keywords' -- cgit v1.2.3 From 7394cd71c05d56ebfd5a5f95518a849289a782e0 Mon Sep 17 00:00:00 2001 From: Mqdd Date: Fri, 20 Feb 2026 10:17:13 +0700 Subject: fix not sync to solr when there is no products --- indoteknik_custom/models/keywords.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models/keywords.py') diff --git a/indoteknik_custom/models/keywords.py b/indoteknik_custom/models/keywords.py index 4ab649dc..9c8e2cfd 100644 --- a/indoteknik_custom/models/keywords.py +++ b/indoteknik_custom/models/keywords.py @@ -133,7 +133,7 @@ class Keywords(models.Model): def _onchange_solr_flag(self): """Set solr_flag=2 when tracked fields change to trigger queue sync""" for record in self: - if not record.skip: + if not record.skip and len(record.product_ids) > 0: record.solr_flag = 2 def solr_flag_to_queue(self, limit=500): @@ -164,6 +164,11 @@ class Keywords(models.Model): """Callback method executed by apache.solr.queue - syncs keyword data to Solr""" documents = [] for keyword in self: + # Skip syncing if product count is 0 + if len(keyword.product_ids) == 0: + _logger.info('Skipping Solr sync for keyword "%s" - no products found', keyword.keywords) + continue + searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') try: doc = { @@ -194,6 +199,11 @@ class Keywords(models.Model): documents = [] for keyword in keywords: + # Skip syncing if product count is 0 + if len(keyword.product_ids) == 0: + _logger.info('Skipping Solr sync for keyword "%s" - no products found', keyword.keywords) + continue + searchkey = (keyword.keywords or '').strip().lower().replace(' ', '-') try: doc = { @@ -227,6 +237,8 @@ class Keywords(models.Model): neded_sync = any(field in vals for field in tracked_fields) if neded_sync and self.skip == False: for record in self: - record.solr_flag = 2 + # Only flag for sync if there are products + if len(record.product_ids) > 0: + record.solr_flag = 2 return result -- cgit v1.2.3