various clean ups - tests passing

Author: richard-willdooit

queue_job/models/base.py

@@ -260,11 +260,15 @@ def _job_prepare_context_before_enqueue(self):
             if key in self._job_prepare_context_before_enqueue_keys()
         }
 
+    # Odoo have deprecated _patch_method and api.propagate in v16
     @classmethod
     def _patch_method(cls, name, method):
         origin = getattr(cls, name)
         method.origin = origin
-        # propagate decorators from origin to method, and apply api decorator
-        wrapped = api.propagate(origin, method)
-        wrapped.origin = origin
-        setattr(cls, name, wrapped)
+
+        # propagate appeared to only deal with the returns decorator
+        # which is now, also, deprecated
+        # wrapped = api.propagate(origin, method)
+        # wrapped.origin = origin
+        # setattr(cls, name, wrapped)
+        setattr(cls, name, method)

queue_job/models/queue_job.py

@@ -140,20 +140,18 @@ def init(self):
 
     @api.depends("dependencies")
     def _compute_dependency_graph(self):
-        jobs_groups = self.env["queue.job"].read_group(
+        jobs_groups = self.env["queue.job"]._read_group(
             [
                 (
                     "graph_uuid",
                     "in",
                     [uuid for uuid in self.mapped("graph_uuid") if uuid],
                 )
             ],
-            ["graph_uuid", "ids:array_agg(id)"],
             ["graph_uuid"],
+            ["id:array_agg"],
         )
-        ids_per_graph_uuid = {
-            group["graph_uuid"]: group["ids"] for group in jobs_groups
-        }
+        ids_per_graph_uuid = {group[0]: group[1] for group in jobs_groups}
         for record in self:
             if not record.graph_uuid:
                 record.dependency_graph = {}
@@ -211,7 +209,7 @@ def _dependency_graph_vis_node(self):
         }
 
     def _compute_graph_jobs_count(self):
-        jobs_groups = self.env["queue.job"].read_group(
+        jobs_groups = self.env["queue.job"]._read_group(
             [
                 (
                     "graph_uuid",
@@ -351,7 +349,7 @@ def _subscribe_users_domain(self):
         if not group:
             return None
         companies = self.mapped("company_id")
-        domain = [("groups_id", "=", group.id)]
+        domain = [("group_ids", "=", group.id)]
         if companies:
             domain.append(("company_id", "in", companies.ids))
         return domain

test_queue_job/tests/test_autovacuum.py

@@ -19,7 +19,8 @@ def test_old_jobs_are_deleted_by_cron_job(self):
         )
         stored = self._create_job()
         stored.write({"date_done": date_done})
-        self.cron_job.method_direct_trigger()
+        with self.enter_registry_test_mode():
+            self.cron_job.method_direct_trigger()
         self.assertFalse(stored.exists())
 
     def test_autovacuum(self):

test_queue_job/tests/test_job.py

@@ -6,6 +6,7 @@
 from unittest import mock
 
 import odoo.tests.common as common
+from odoo import Command
 
 from odoo.addons.queue_job import identity_exact
 from odoo.addons.queue_job.delay import DelayableGraph
@@ -208,7 +209,7 @@ def test_company_complex(self):
         company1 = self.env.ref("base.main_company")
         company2 = company1.create({"name": "Queue job company"})
         companies = company1 | company2
-        self.env.user.write({"company_ids": [(6, False, companies.ids)]})
+        self.env.user.write({"company_ids": [Command.set(companies.ids)]})
         # Ensure the main company still the first
         self.assertEqual(self.env.user.company_id, company1)
         eta = datetime.now() + timedelta(hours=5)
@@ -604,17 +605,17 @@ def test_follower_when_write_fail(self):
         vals = {
             "name": "xx",
             "login": "xx",
-            "groups_id": [(6, 0, [group.id])],
+            "group_ids": [Command.set(group.ids)],
             "active": False,
         }
         inactiveusr = self.user.create(vals)
         inactiveusr.partner_id.active = True
-        self.assertFalse(inactiveusr in group.users)
+        self.assertFalse(inactiveusr in group.user_ids)
         stored = self._create_job()
         stored.write({"state": "failed"})
         followers = stored.message_follower_ids.mapped("partner_id")
         self.assertFalse(inactiveusr.partner_id in followers)
-        self.assertFalse({u.partner_id for u in group.users} - set(followers))
+        self.assertFalse({u.partner_id for u in group.user_ids} - set(followers))
 
     def test_wizard_requeue(self):
         stored = self._create_job()
@@ -663,10 +664,10 @@ def setUp(self):
         self.simple_user = User.create(
             {
                 "partner_id": self.partner_user.id,
-                "company_ids": [(4, main_company.id)],
+                "company_ids": [Command.link(main_company.id)],
                 "login": "simple_user",
                 "name": "simple user",
-                "groups_id": [],
+                "group_ids": [],
             }
         )
 
@@ -684,10 +685,10 @@ def setUp(self):
             {
                 "partner_id": self.other_partner_a.id,
                 "company_id": self.other_company_a.id,
-                "company_ids": [(4, self.other_company_a.id)],
+                "company_ids": [Command.link(self.other_company_a.id)],
                 "login": "my_login a",
                 "name": "my user A",
-                "groups_id": [(4, grp_queue_job_manager)],
+                "group_ids": [Command.link(grp_queue_job_manager)],
             }
         )
         self.other_partner_b = Partner.create(
@@ -704,10 +705,10 @@ def setUp(self):
             {
                 "partner_id": self.other_partner_b.id,
                 "company_id": self.other_company_b.id,
-                "company_ids": [(4, self.other_company_b.id)],
+                "company_ids": [Command.link(self.other_company_b.id)],
                 "login": "my_login_b",
                 "name": "my user B",
-                "groups_id": [(4, grp_queue_job_manager)],
+                "group_ids": [Command.link(grp_queue_job_manager)],
             }
         )
 
@@ -761,7 +762,7 @@ def test_job_subscription(self):
         stored._message_post_on_failure()
         users = (
             User.search(
-                [("groups_id", "=", self.ref("queue_job.group_queue_job_manager"))]
+                [("group_ids", "=", self.ref("queue_job.group_queue_job_manager"))]
             )
             + stored.user_id
         )