[MIG] base_user_role: replace numeric x2many tuples with fields.Command in models, wizard and tests

Milan Topuzov · Milan Topuzov · commit 8681aceed475 · 2025-11-09T23:57:14.000+01:00
diff --git a/base_user_role/models/user.py b/base_user_role/models/user.py
@@ -101,8 +101,8 @@ def set_groups_from_roles(self, force=False):
                     group_ids.append(admin_group.id)
             groups_to_add = list(set(group_ids) - set(user.group_ids.ids))
             groups_to_remove = list(set(user.group_ids.ids) - set(group_ids))
-            to_add = [(4, gr) for gr in groups_to_add]
-            to_remove = [(3, gr) for gr in groups_to_remove]
+            to_add = [fields.Command.link(gr) for gr in groups_to_add]
+            to_remove = [fields.Command.unlink(gr) for gr in groups_to_remove]
             groups = to_remove + to_add
             if groups:
                 vals = {"group_ids": groups}
diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py
@@ -30,7 +30,9 @@ def setUpClass(cls):
         cls.group_no_one_id = cls.env.ref("base.group_no_one")
         vals = {
             "name": "ROLE_1",
-            "implied_ids": [(6, 0, [cls.group_user_id.id, cls.group_no_one_id.id])],
+            "implied_ids": [
+                fields.Command.set([cls.group_user_id.id, cls.group_no_one_id.id])
+            ],
         }
         cls.role1_id = cls.role_model.create(vals)
 
@@ -42,14 +44,12 @@ def setUpClass(cls):
         vals = {
             "name": "ROLE_2",
             "implied_ids": [
-                (
-                    6,
-                    0,
+                fields.Command.set(
                     [
                         cls.group_user_id.id,
                         cls.group_multi_currency_id.id,
                         cls.group_settings_id.id,
-                    ],
+                    ]
                 )
             ],
         }
@@ -60,36 +60,44 @@ def setUpClass(cls):
             {
                 "name": "User 2",
                 "company_id": cls.company1.id,
-                "company_ids": [(6, 0, [cls.company1.id, cls.company2.id])],
-                "group_ids": [(6, 0, cls.env.ref("base.group_erp_manager").ids)],
+                "company_ids": [fields.Command.set([cls.company1.id, cls.company2.id])],
+                "group_ids": [
+                    fields.Command.set(cls.env.ref("base.group_erp_manager").ids)
+                ],
                 "login": "multicompany_user_1",
             }
         )
         cls.multicompany_user_2 = cls.user_model.create(
             {
                 "name": "User 2",
                 "company_id": cls.company2.id,
-                "company_ids": [(6, 0, [cls.company2.id])],
-                "group_ids": [(6, 0, cls.env.ref("base.group_user").ids)],
+                "company_ids": [fields.Command.set([cls.company2.id])],
+                "group_ids": [fields.Command.set(cls.env.ref("base.group_user").ids)],
                 "login": "multicompany_user_2",
             }
         )
         cls.multicompany_role = cls.role_model.create(
             {
                 "name": "MULTICOMPANY_ROLE",
-                "implied_ids": [(6, 0, [cls.group_user_id.id])],
-                "line_ids": [(0, 0, {"user_id": cls.multicompany_user_2.id})],
+                "implied_ids": [fields.Command.set([cls.group_user_id.id])],
+                "line_ids": [
+                    fields.Command.create({"user_id": cls.multicompany_user_2.id})
+                ],
             }
         )
 
     def test_role_1(self):
-        self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})
+        self.user_id.write(
+            {"role_line_ids": [fields.Command.create({"role_id": self.role1_id.id})]}
+        )
         user_group_ids = sorted({group.id for group in self.user_id.group_ids})
         role_group_ids = sorted(set(self.role1_id.all_implied_ids.ids))
         self.assertEqual(user_group_ids, role_group_ids)
 
     def test_role_2(self):
-        self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role2_id.id})]})
+        self.user_id.write(
+            {"role_line_ids": [fields.Command.create({"role_id": self.role2_id.id})]}
+        )
         user_group_ids = sorted({group.id for group in self.user_id.group_ids})
         role_group_ids = sorted(set(self.role2_id.all_implied_ids.ids))
         self.assertEqual(user_group_ids, role_group_ids)
@@ -98,8 +106,8 @@ def test_role_1_2(self):
         self.user_id.write(
             {
                 "role_line_ids": [
-                    (0, 0, {"role_id": self.role1_id.id}),
-                    (0, 0, {"role_id": self.role2_id.id}),
+                    fields.Command.create({"role_id": self.role1_id.id}),
+                    fields.Command.create({"role_id": self.role2_id.id}),
                 ]
             }
         )
@@ -118,9 +126,13 @@ def test_role_1_2_with_dates(self):
             {
                 "role_line_ids": [
                     # Role 1 should be enabled
-                    (0, 0, {"role_id": self.role1_id.id, "date_from": today_str}),
+                    fields.Command.create(
+                        {"role_id": self.role1_id.id, "date_from": today_str}
+                    ),
                     # Role 2 should be disabled
-                    (0, 0, {"role_id": self.role2_id.id, "date_to": yesterday_str}),
+                    fields.Command.create(
+                        {"role_id": self.role2_id.id, "date_to": yesterday_str}
+                    ),
                 ]
             }
         )
@@ -137,8 +149,8 @@ def test_role_unlink(self):
         self.user_id.write(
             {
                 "role_line_ids": [
-                    (0, 0, {"role_id": self.role1_id.id}),
-                    (0, 0, {"role_id": self.role2_id.id}),
+                    fields.Command.create({"role_id": self.role1_id.id}),
+                    fields.Command.create({"role_id": self.role2_id.id}),
                 ]
             }
         )
@@ -165,8 +177,8 @@ def test_role_line_unlink(self):
         self.user_id.write(
             {
                 "role_line_ids": [
-                    (0, 0, {"role_id": self.role1_id.id}),
-                    (0, 0, {"role_id": self.role2_id.id}),
+                    fields.Command.create({"role_id": self.role1_id.id}),
+                    fields.Command.create({"role_id": self.role2_id.id}),
                 ]
             }
         )
@@ -192,8 +204,8 @@ def test_default_user_roles(self):
         self.default_user.write(
             {
                 "role_line_ids": [
-                    (0, 0, {"role_id": self.role1_id.id}),
-                    (0, 0, {"role_id": self.role2_id.id}),
+                    fields.Command.create({"role_id": self.role1_id.id}),
+                    fields.Command.create({"role_id": self.role2_id.id}),
                 ]
             }
         )
@@ -214,7 +226,7 @@ def test_role_multicompany(self):
         role.with_context(allowed_company_ids=self.company1.ids).read()
         # Downgrade multicompany user 1 to common user
         self.multicompany_user_1.write(
-            {"group_ids": [(6, 0, self.env.ref("base.group_user").ids)]}
+            {"group_ids": [fields.Command.set(self.env.ref("base.group_user").ids)]}
         )
         # Check that the user cannot read multicompany data again since it lost
         # its admin privileges
@@ -245,7 +257,9 @@ def test_create_role_from_user(self):
 
     def test_show_alert_computation(self):
         """Test the computation of the `show_alert` field."""
-        self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})
+        self.user_id.write(
+            {"role_line_ids": [fields.Command.create({"role_id": self.role1_id.id})]}
+        )
         self.assertTrue(self.user_id.show_alert)
 
         # disable role
diff --git a/base_user_role/wizards/create_from_user.py b/base_user_role/wizards/create_from_user.py
@@ -28,7 +28,7 @@ def create_from_user(self):
             }
         )
 
-        role.implied_ids = [(6, 0, user.group_ids.ids)]
+        role.implied_ids = [fields.Command.set(user.group_ids.ids)]
 
         if self.assign_to_user:
             role_line_obj.create(

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ def setUpClass(cls):`
`30`	`30`	`cls.group_no_one_id = cls.env.ref("base.group_no_one")`
`31`	`31`	`vals = {`
`32`	`32`	`"name": "ROLE_1",`
`33`		`- "implied_ids": [(6, 0, [cls.group_user_id.id, cls.group_no_one_id.id])],`
	`33`	`+ "implied_ids": [`
	`34`	`+ fields.Command.set([cls.group_user_id.id, cls.group_no_one_id.id])`
	`35`	`+ ],`
`34`	`36`	`}`
`35`	`37`	`cls.role1_id = cls.role_model.create(vals)`
`36`	`38`
`@@ -42,14 +44,12 @@ def setUpClass(cls):`
`42`	`44`	`vals = {`
`43`	`45`	`"name": "ROLE_2",`
`44`	`46`	`"implied_ids": [`
`45`		`- (`
`46`		`- 6,`
`47`		`- 0,`
	`47`	`+ fields.Command.set(`
`48`	`48`	`[`
`49`	`49`	`cls.group_user_id.id,`
`50`	`50`	`cls.group_multi_currency_id.id,`
`51`	`51`	`cls.group_settings_id.id,`
`52`		`- ],`
	`52`	`+ ]`
`53`	`53`	`)`
`54`	`54`	`],`
`55`	`55`	`}`
`@@ -60,36 +60,44 @@ def setUpClass(cls):`
`60`	`60`	`{`
`61`	`61`	`"name": "User 2",`
`62`	`62`	`"company_id": cls.company1.id,`
`63`		`- "company_ids": [(6, 0, [cls.company1.id, cls.company2.id])],`
`64`		`- "group_ids": [(6, 0, cls.env.ref("base.group_erp_manager").ids)],`
	`63`	`+ "company_ids": [fields.Command.set([cls.company1.id, cls.company2.id])],`
	`64`	`+ "group_ids": [`
	`65`	`+ fields.Command.set(cls.env.ref("base.group_erp_manager").ids)`
	`66`	`+ ],`
`65`	`67`	`"login": "multicompany_user_1",`
`66`	`68`	`}`
`67`	`69`	`)`
`68`	`70`	`cls.multicompany_user_2 = cls.user_model.create(`
`69`	`71`	`{`
`70`	`72`	`"name": "User 2",`
`71`	`73`	`"company_id": cls.company2.id,`
`72`		`- "company_ids": [(6, 0, [cls.company2.id])],`
`73`		`- "group_ids": [(6, 0, cls.env.ref("base.group_user").ids)],`
	`74`	`+ "company_ids": [fields.Command.set([cls.company2.id])],`
	`75`	`+ "group_ids": [fields.Command.set(cls.env.ref("base.group_user").ids)],`
`74`	`76`	`"login": "multicompany_user_2",`
`75`	`77`	`}`
`76`	`78`	`)`
`77`	`79`	`cls.multicompany_role = cls.role_model.create(`
`78`	`80`	`{`
`79`	`81`	`"name": "MULTICOMPANY_ROLE",`
`80`		`- "implied_ids": [(6, 0, [cls.group_user_id.id])],`
`81`		`- "line_ids": [(0, 0, {"user_id": cls.multicompany_user_2.id})],`
	`82`	`+ "implied_ids": [fields.Command.set([cls.group_user_id.id])],`
	`83`	`+ "line_ids": [`
	`84`	`+ fields.Command.create({"user_id": cls.multicompany_user_2.id})`
	`85`	`+ ],`
`82`	`86`	`}`
`83`	`87`	`)`
`84`	`88`
`85`	`89`	`def test_role_1(self):`
`86`		`- self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})`
	`90`	`+ self.user_id.write(`
	`91`	`+ {"role_line_ids": [fields.Command.create({"role_id": self.role1_id.id})]}`
	`92`	`+ )`
`87`	`93`	`user_group_ids = sorted({group.id for group in self.user_id.group_ids})`
`88`	`94`	`role_group_ids = sorted(set(self.role1_id.all_implied_ids.ids))`
`89`	`95`	`self.assertEqual(user_group_ids, role_group_ids)`
`90`	`96`
`91`	`97`	`def test_role_2(self):`
`92`		`- self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role2_id.id})]})`
	`98`	`+ self.user_id.write(`
	`99`	`+ {"role_line_ids": [fields.Command.create({"role_id": self.role2_id.id})]}`
	`100`	`+ )`
`93`	`101`	`user_group_ids = sorted({group.id for group in self.user_id.group_ids})`
`94`	`102`	`role_group_ids = sorted(set(self.role2_id.all_implied_ids.ids))`
`95`	`103`	`self.assertEqual(user_group_ids, role_group_ids)`
`@@ -98,8 +106,8 @@ def test_role_1_2(self):`
`98`	`106`	`self.user_id.write(`
`99`	`107`	`{`
`100`	`108`	`"role_line_ids": [`
`101`		`- (0, 0, {"role_id": self.role1_id.id}),`
`102`		`- (0, 0, {"role_id": self.role2_id.id}),`
	`109`	`+ fields.Command.create({"role_id": self.role1_id.id}),`
	`110`	`+ fields.Command.create({"role_id": self.role2_id.id}),`
`103`	`111`	`]`
`104`	`112`	`}`
`105`	`113`	`)`
`@@ -118,9 +126,13 @@ def test_role_1_2_with_dates(self):`
`118`	`126`	`{`
`119`	`127`	`"role_line_ids": [`
`120`	`128`	`# Role 1 should be enabled`
`121`		`- (0, 0, {"role_id": self.role1_id.id, "date_from": today_str}),`
	`129`	`+ fields.Command.create(`
	`130`	`+ {"role_id": self.role1_id.id, "date_from": today_str}`
	`131`	`+ ),`
`122`	`132`	`# Role 2 should be disabled`
`123`		`- (0, 0, {"role_id": self.role2_id.id, "date_to": yesterday_str}),`
	`133`	`+ fields.Command.create(`
	`134`	`+ {"role_id": self.role2_id.id, "date_to": yesterday_str}`
	`135`	`+ ),`
`124`	`136`	`]`
`125`	`137`	`}`
`126`	`138`	`)`
`@@ -137,8 +149,8 @@ def test_role_unlink(self):`
`137`	`149`	`self.user_id.write(`
`138`	`150`	`{`
`139`	`151`	`"role_line_ids": [`
`140`		`- (0, 0, {"role_id": self.role1_id.id}),`
`141`		`- (0, 0, {"role_id": self.role2_id.id}),`
	`152`	`+ fields.Command.create({"role_id": self.role1_id.id}),`
	`153`	`+ fields.Command.create({"role_id": self.role2_id.id}),`
`142`	`154`	`]`
`143`	`155`	`}`
`144`	`156`	`)`
`@@ -165,8 +177,8 @@ def test_role_line_unlink(self):`
`165`	`177`	`self.user_id.write(`
`166`	`178`	`{`
`167`	`179`	`"role_line_ids": [`
`168`		`- (0, 0, {"role_id": self.role1_id.id}),`
`169`		`- (0, 0, {"role_id": self.role2_id.id}),`
	`180`	`+ fields.Command.create({"role_id": self.role1_id.id}),`
	`181`	`+ fields.Command.create({"role_id": self.role2_id.id}),`
`170`	`182`	`]`
`171`	`183`	`}`
`172`	`184`	`)`
`@@ -192,8 +204,8 @@ def test_default_user_roles(self):`
`192`	`204`	`self.default_user.write(`
`193`	`205`	`{`
`194`	`206`	`"role_line_ids": [`
`195`		`- (0, 0, {"role_id": self.role1_id.id}),`
`196`		`- (0, 0, {"role_id": self.role2_id.id}),`
	`207`	`+ fields.Command.create({"role_id": self.role1_id.id}),`
	`208`	`+ fields.Command.create({"role_id": self.role2_id.id}),`
`197`	`209`	`]`
`198`	`210`	`}`
`199`	`211`	`)`
`@@ -214,7 +226,7 @@ def test_role_multicompany(self):`
`214`	`226`	`role.with_context(allowed_company_ids=self.company1.ids).read()`
`215`	`227`	`# Downgrade multicompany user 1 to common user`
`216`	`228`	`self.multicompany_user_1.write(`
`217`		`- {"group_ids": [(6, 0, self.env.ref("base.group_user").ids)]}`
	`229`	`+ {"group_ids": [fields.Command.set(self.env.ref("base.group_user").ids)]}`
`218`	`230`	`)`
`219`	`231`	`# Check that the user cannot read multicompany data again since it lost`
`220`	`232`	`# its admin privileges`
`@@ -245,7 +257,9 @@ def test_create_role_from_user(self):`
`245`	`257`
`246`	`258`	`def test_show_alert_computation(self):`
`247`	`259`	"""Test the computation of the `show_alert` field."""
`248`		`- self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})`
	`260`	`+ self.user_id.write(`
	`261`	`+ {"role_line_ids": [fields.Command.create({"role_id": self.role1_id.id})]}`
	`262`	`+ )`
`249`	`263`	`self.assertTrue(self.user_id.show_alert)`
`250`	`264`
`251`	`265`	`# disable role`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def create_from_user(self):`
`28`	`28`	`}`
`29`	`29`	`)`
`30`	`30`
`31`		`- role.implied_ids = [(6, 0, user.group_ids.ids)]`
	`31`	`+ role.implied_ids = [fields.Command.set(user.group_ids.ids)]`
`32`	`32`
`33`	`33`	`if self.assign_to_user:`
`34`	`34`	`role_line_obj.create(`