Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve building of domain through osv.expression

pull/3183/head
Akim Juillerat 2022-12-05 17:29:14 +01:00 committed by GabbasovDinar
parent 2a490683d2
commit cfab415c48
No known key found for this signature in database
GPG Key ID: 29C4D35381B4C360
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
autovacuum_message_attachment/models/ir_attachment.py
View File

@ -4,6 +4,7 @@
from datetime import timedelta from datetime import timedelta
from odoo import fields, models from odoo import fields, models
from odoo.osv import expression
class IrAttachment(models.Model): class IrAttachment(models.Model):
@ -15,14 +16,14 @@ class IrAttachment(models.Model):
domain = super()._get_autovacuum_domain(rule) domain = super()._get_autovacuum_domain(rule)
today = fields.Datetime.now() today = fields.Datetime.now()
limit_date = today - timedelta(days=rule.retention_time) limit_date = today - timedelta(days=rule.retention_time)
domain += [("create_date", "<", limit_date)] domains = [domain, [("create_date", "<", limit_date)]]
if rule.filename_pattern: if rule.filename_pattern:
domain += [("name", "ilike", rule.filename_pattern)] domains.append([("name", "ilike", rule.filename_pattern)])
if rule.model_ids: if rule.model_ids:
models = rule.model_ids.mapped("model") models = rule.model_ids.mapped("model")
domain += [("res_model", "in", models)] domains.append([("res_model", "in", models)])
else: else:
# Avoid deleting attachment without model, if there are, it is # Avoid deleting attachment without model, if there are, it is
# probably some attachments created by Odoo # probably some attachments created by Odoo
domain += [("res_model", "!=", False)] domains.append([("res_model", "!=", False)])
return domain return expression.AND(domains)

25
autovacuum_message_attachment/models/mail_message.py
View File

@ -4,6 +4,7 @@
from datetime import timedelta from datetime import timedelta
from odoo import fields, models from odoo import fields, models
from odoo.osv import expression
class MailMessage(models.Model): class MailMessage(models.Model):
@ -15,21 +16,23 @@ class MailMessage(models.Model):
domain = super()._get_autovacuum_domain(rule) domain = super()._get_autovacuum_domain(rule)
today = fields.Datetime.now() today = fields.Datetime.now()
limit_date = today - timedelta(days=rule.retention_time) limit_date = today - timedelta(days=rule.retention_time)
domain += [("date", "<", limit_date)] domains = [domain, [("date", "<", limit_date)]]
if rule.message_type != "all": if rule.message_type != "all":
domain += [("message_type", "=", rule.message_type)] domains.append([("message_type", "=", rule.message_type)])
if rule.model_ids: if rule.model_ids:
models = rule.model_ids.mapped("model") models = rule.model_ids.mapped("model")
domain += [("model", "in", models)] domains.append([("model", "in", models)])
subtype_ids = rule.message_subtype_ids.ids subtype_ids = rule.message_subtype_ids.ids
if subtype_ids and rule.empty_subtype: if subtype_ids and rule.empty_subtype:
domain = [ domains.append(
"|", [
("subtype_id", "in", subtype_ids), "|",
("subtype_id", "=", False), ("subtype_id", "in", subtype_ids),
] ("subtype_id", "=", False),
]
)
elif subtype_ids and not rule.empty_subtype: elif subtype_ids and not rule.empty_subtype:
domain += [("subtype_id", "in", subtype_ids)] domains.append([("subtype_id", "in", subtype_ids)])
elif not subtype_ids and not rule.empty_subtype: elif not subtype_ids and not rule.empty_subtype:
domain += [("subtype_id", "!=", False)] domains.append([("subtype_id", "!=", False)])
return domain return expression.AND(domains)