Merge PR #516 into 12.0

Signed-off-by carmenbianca

cooperator_eater/tests/test_eaters.py

@@ -33,6 +33,10 @@ def setUpClass(cls):
             {"name": "Eater 4", "customer": True, "eater": "eater"}
         )
 
+        cls.cooperator_x.eater = "worker_eater"
+        cls.cooperator_y.eater = "worker_eater"
+        cls.cooperator_z.eater = "worker_eater"
+
         cls.worker_share = ptemplate_obj.create(
             {
                 "name": "Worker Share",

eater/__manifest__.py

@@ -11,7 +11,7 @@
     "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Sales",
-    "version": "12.0.1.0.0",
+    "version": "12.0.2.0.0",
     "depends": ["base", "partner_firstname"],
     "data": [
         "wizard/new_eater_wizard_views.xml",

eater/migrations/12.0.2.0.0/pre-migration.py

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2023 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # This is an impossible scenario. It causes an endless loop bug that I'm not
+    # able to debug exactly, but it's easier to just get rid of this scenario.
+    sql = """
+        UPDATE res_partner
+        SET parent_eater_id = null
+        WHERE eater = 'worker_eater'
+    """
+    openupgrade.logged_query(env.cr, sql)

eater/models/partner.py

@@ -15,12 +15,39 @@ class Partner(models.Model):
     child_eater_ids = fields.One2many(
         "res.partner",
         "parent_eater_id",
-        domain=[("customer", "=", True), ("eater", "=", "eater")],
+        domain=[("eater", "=", "eater")],
     )
     parent_eater_id = fields.Many2one(
-        "res.partner", string="Parent Worker", readonly=True
+        "res.partner",
+        string="Parent Worker",
+        readonly=True,
+        domain=[("eater", "=", "worker_eater")],
     )
 
+    @api.constrains("eater", "parent_eater_id")
+    def _check_parent_is_worker(self):
+        """The parent of an eater must be a worker_eater, and worker_eaters
+        cannot have parents.
+        """
+        for partner in self:
+            parent = partner.parent_eater_id
+            if partner.eater == "eater" and parent:
+                if parent.eater != "worker_eater":
+                    raise ValidationError(
+                        _(
+                            "{0} cannot be the parent of {1} because the parent"
+                            " must be a worker."
+                        ).format(parent.name, partner.name)
+                    )
+            if partner.eater == "worker_eater" and parent:
+                raise ValidationError(
+                    _(
+                        "%s cannot have a parent worker because they are"
+                        " themselves a worker."
+                    )
+                    % partner.name
+                )
+
     @api.multi
     def write(self, values):
         for partner in self:
@@ -42,7 +69,7 @@ def write(self, values):
             for command in values["child_eater_ids"]:
                 if command[0] == 2:
                     command[0] = 3
-        return super(Partner, self).write(values)
+        return super().write(values)
 
     @api.multi
     def _new_eater(self, surname, name, email):

eater/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_partner

eater/tests/test_partner.py

@@ -0,0 +1,55 @@
+from odoo.exceptions import ValidationError
+from odoo.tests.common import SavepointCase
+
+
+class TestPartner(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.worker_1 = cls.env["res.partner"].create(
+            {
+                "name": "Worker 1",
+                "eater": "worker_eater",
+            }
+        )
+        cls.worker_2 = cls.env["res.partner"].create(
+            {
+                "name": "Worker 2",
+                "eater": "worker_eater",
+            }
+        )
+        cls.eater_1 = cls.env["res.partner"].create(
+            {
+                "name": "Eater 1",
+                "eater": "eater",
+            }
+        )
+        cls.eater_2 = cls.env["res.partner"].create(
+            {
+                "name": "Eater 2",
+                "eater": "eater",
+            }
+        )
+
+    def test_eater_not_parent_of_worker_eater(self):
+        with self.assertRaises(ValidationError):
+            self.worker_1.parent_eater_id = self.eater_1
+
+    def test_worker_eater_not_child_of_eater(self):
+        with self.assertRaises(ValidationError):
+            self.eater_1.child_eater_ids = self.worker_1
+
+    def test_eater_not_parent_of_eater(self):
+        with self.assertRaises(ValidationError):
+            self.eater_1.parent_eater_id = self.eater_2
+
+    def test_worker_eater_no_parent(self):
+        with self.assertRaises(ValidationError):
+            self.worker_2.parent_eater_id = self.worker_1
+
+    def test_no_parent_of_self(self):
+        with self.assertRaises(ValidationError):
+            self.worker_2.parent_eater_id = self.worker_2
+
+    def test_worker_eater_parent_of_eater(self):
+        self.eater_1.parent_eater_id = self.worker_1

eater/views/partner.xml

@@ -8,10 +8,7 @@
         <field name="arch" type="xml">
 
             <xpath expr="//notebook" position="inside">
-                <page
-                    string="Eaters"
-                    attrs="{'invisible': ['|', ('customer', '=', False), ('eater', 'not in', ('worker_eater'))]}"
-                >
+                <page string="Eaters">
                     <group>
                         <group>
                             <field
@@ -20,6 +17,12 @@
                                 widget="many2many_tags"
                                 options="{'no_create': True}"
                                 context="{'default_eater' : 'eater', 'default_customer' : True}"
+                                attrs="{'invisible': [('eater', '=', 'eater')]}"
+                            />
+                            <field
+                                name="parent_eater_id"
+                                options="{'no_create': True}"
+                                attrs="{'invisible': [('eater', '=', 'worker_eater')]}"
                             />
                         </group>
                         <group>
@@ -28,6 +31,7 @@
                                 name="%(new_eater_wizard_action)d"
                                 type="action"
                                 class="btn btn-primary"
+                                attrs="{'invisible': [('eater', '=', 'eater')]}"
                             />
                         </group>
                     </group>