[FIX] website_event_attendee_fields: учитываем все контакты с введенной почтой при проверке на существующую регистрацию

Author: em230418

website_event_attendee_fields/controllers/main.py

@@ -55,10 +55,7 @@ def check_email(self, event_id, email):
             return {"email_not_allowed": _("Invalid email")}
 
         current_user = request.env.user
-        if email == current_user.email:
-            partner = current_user.partner_id
-        else:
-            partner = Partners.search([("email", "=", email)], limit=1)
+        partner = Partners.search([("email", "=", email)])
 
         if not partner:
 
@@ -76,7 +73,6 @@ def remove_spaces(s):
                     ("email", "=ilike", "% " + email + " %"),
                     ("email", "=ilike", email + " %"),
                 ],
-                limit=1,
             )
             if not partner:
                 return {}
@@ -85,10 +81,15 @@ def remove_spaces(s):
             partner.write({"email": partner_email})
 
         event = request.env["event.event"].sudo().browse(event_id)
-        error_msg = event.check_partner_for_new_ticket(partner.id)
+        error_msg = event.check_partner_for_new_ticket(partner.ids)
         if error_msg:
             return {"email_not_allowed": error_msg}
 
+        if current_user.partner_id in partner:
+            partner = current_user.partner_id
+        else:
+            partner = partner.sorted("id", reverse=True)[0]
+
         known_fields = {}
         do_not_disable_fields = {}
 

website_event_attendee_fields/models/event_event.py

@@ -15,12 +15,12 @@ def _compute_partner_questions(self):
                 lambda q: q.question_type == "partner_field"
             )
 
-    def check_partner_for_new_ticket(self, partner_id):
-        if self.partner_is_participating(partner_id):
+    def check_partner_for_new_ticket(self, partner_ids):
+        if self.partners_are_participating(partner_ids):
             return _("This email address is already signed up for the event")
         return None
 
-    def partner_is_participating(self, partner_id):
+    def partners_are_participating(self, partner_ids):
         self.ensure_one()
         registration = (
             self.env["event.registration"]
@@ -29,10 +29,10 @@ def partner_is_participating(self, partner_id):
                 [
                     ("event_id", "=", self.id),
                     "|",
-                    ("attendee_partner_id", "=", partner_id),
+                    ("attendee_partner_id", "in", partner_ids),
                     "&",
                     ("attendee_partner_id", "=", False),
-                    ("partner_id", "=", partner_id),
+                    ("partner_id", "in", partner_ids),
                     ("state", "=", "open"),
                 ]
             )

website_event_attendee_fields/models/ir_ui_view.py

@@ -15,7 +15,7 @@ def _render_template(self, template, values=None):
             if (
                 are_tickets_different
                 or user._is_public()
-                or event.partner_is_participating(user.partner_id.id)
+                or event.partners_are_participating(user.partner_id.ids)
             ):
                 values["default_first_attendee"] = {}
 

website_event_attendee_fields/tests/test_backend.py

@@ -66,3 +66,61 @@ def test_emails_duplicates(self):
         with MockRequest(self.env), self.assertRaises(AssertionError):
             obj = WebsiteEventControllerExtended()
             obj.registration_confirm(event, **post)
+
+    def test_check_email_01(self):
+        event = self.env["event.event"].create(
+            {
+                "name": "Test Default Event",
+            }
+        )
+
+        with MockRequest(self.env):
+            obj = WebsiteEventControllerExtended()
+            res = obj.check_email(event.id, "attendee01@example.com")
+            self.assertNotIn("email_not_allowed", res)
+
+        self.env["event.registration"].create(
+            {
+                "name": "Attendee Name",
+                "email": "attendee01@example.com",
+                "event_id": event.id,
+            }
+        )
+
+        with MockRequest(self.env):
+            obj = WebsiteEventControllerExtended()
+            res = obj.check_email(event.id, "attendee01@example.com")
+            self.assertIn("email_not_allowed", res)
+
+    def test_check_email_02(self):
+        slavik_email = "slavik@slavik.ru"
+        slavik1, slavik2 = self.env["res.partner"].create(
+            [
+                {"name": "Slavik 01", "email": slavik_email},
+                {"name": "Slavik 02", "email": slavik_email},
+            ]
+        )
+
+        event = self.env["event.event"].create(
+            {
+                "name": "Test Default Event",
+            }
+        )
+
+        with MockRequest(self.env):
+            obj = WebsiteEventControllerExtended()
+            res = obj.check_email(event.id, slavik_email)
+            self.assertNotIn("email_not_allowed", res)
+
+        self.env["event.registration"].create(
+            {
+                "name": "Attendee Name",
+                "attendee_partner_id": slavik2.id,
+                "event_id": event.id,
+            }
+        )
+
+        with MockRequest(self.env):
+            obj = WebsiteEventControllerExtended()
+            res = obj.check_email(event.id, slavik_email)
+            self.assertIn("email_not_allowed", res)