[FIX] helpdesk_mgmt_project: improve performance counting tickets

OCA · Jun 30, 2023 · 50055d6 · 50055d6
1 parent 9999371
commit 50055d6
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 11 deletions.
diff --git a/helpdesk_mgmt_project/README.rst b/helpdesk_mgmt_project/README.rst
@@ -74,6 +74,10 @@ Contributors
 
   * Manuel Regidor
 
+* `ALBA Software <https://www.albasoft.com>`_:
+
+  * Rafa Morant
+
 Maintainers
 ~~~~~~~~~~~
 

diff --git a/helpdesk_mgmt_project/models/project.py b/helpdesk_mgmt_project/models/project.py
@@ -20,8 +20,19 @@ class ProjectProject(models.Model):
 
     @api.depends("ticket_ids", "ticket_ids.stage_id")
     def _compute_ticket_count(self):
+        HelpdeskTicket = self.env["helpdesk.ticket"]
+        domain = [("project_id", "in", self.ids)]
+        fields = ["project_id"]
+        groupby = ["project_id"]
+        counts = {
+            pr["project_id"][0]: pr["project_id_count"]
+            for pr in HelpdeskTicket.read_group(domain, fields, groupby)
+        }
+        domain.append(("closed", "=", False))
+        counts_todo = {
+            pr["project_id"][0]: pr["project_id_count"]
+            for pr in HelpdeskTicket.read_group(domain, fields, groupby)
+        }
         for record in self:
-            record.ticket_count = len(record.ticket_ids)
-            record.todo_ticket_count = len(
-                record.ticket_ids.filtered(lambda ticket: not ticket.closed)
-            )
+            record.ticket_count = counts.get(record.id, 0)
+            record.todo_ticket_count = counts_todo.get(record.id, 0)
diff --git a/helpdesk_mgmt_project/models/project_task.py b/helpdesk_mgmt_project/models/project_task.py
@@ -20,18 +20,30 @@ class ProjectTask(models.Model):
 
     @api.depends("ticket_ids", "ticket_ids.stage_id")
     def _compute_ticket_count(self):
+        HelpdeskTicket = self.env["helpdesk.ticket"]
+        invname = "task_id"
+        domain = [(invname, "in", self.ids)]
+        fields = [invname]
+        groupby = [invname]
+        counts = {
+            pr[invname][0]: pr[f"{invname}_count"]
+            for pr in HelpdeskTicket.read_group(domain, fields, groupby)
+        }
+        domain.append(("closed", "=", False))
+        counts_todo = {
+            pr[invname][0]: pr[f"{invname}_count"]
+            for pr in HelpdeskTicket.read_group(domain, fields, groupby)
+        }
         for record in self:
-            record.ticket_count = len(record.ticket_ids)
-            record.todo_ticket_count = len(
-                record.ticket_ids.filtered(lambda ticket: not ticket.closed)
-            )
+            record.ticket_count = counts.get(record.id, 0)
+            record.todo_ticket_count = counts_todo.get(record.id, 0)
 
     def action_view_ticket(self):
         result = self.env["ir.actions.act_window"]._for_xml_id(
             "helpdesk_mgmt.action_helpdesk_ticket_kanban_from_dashboard"
         )
         # choose the view_mode accordingly
-        if not self.ticket_ids or len(self.ticket_ids) > 1:
+        if not self.ticket_ids or self.ticket_count > 1:
             result["domain"] = "[('id','in',%s)]" % (self.ticket_ids.ids)
             res = self.env.ref("helpdesk_mgmt.ticket_view_tree", False)
             tree_view = [(res and res.id or False, "tree")]
@@ -41,7 +53,7 @@ def action_view_ticket(self):
                 ]
             else:
                 result["views"] = tree_view
-        elif len(self.ticket_ids) == 1:
+        elif self.ticket_count == 1:
             res = self.env.ref("helpdesk_mgmt.ticket_view_form", False)
             form_view = [(res and res.id or False, "form")]
             if "views" in result:

diff --git a/helpdesk_mgmt_project/readme/CONTRIBUTORS.rst b/helpdesk_mgmt_project/readme/CONTRIBUTORS.rst
@@ -17,3 +17,7 @@
 * `Sygel <https://www.sygel.es>`_:
 
   * Manuel Regidor
+
+* `ALBA Software <https://www.albasoft.com>`_:
+
+  * Rafa Morant
diff --git a/helpdesk_mgmt_project/static/description/index.html b/helpdesk_mgmt_project/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Helpdesk Project</title>
 <style type="text/css">
 
@@ -421,6 +421,10 @@ <h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <li>Manuel Regidor</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.albasoft.com">ALBA Software</a>:<ul>
+<li>Rafa Morant</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">