[#3087] Add DB constraint that primary and alternative phonenumber differ

Author: pi-sigma

src/open_inwoner/accounts/forms.py

@@ -194,6 +194,10 @@ def clean_phonenumber_alternative(self):
                     "A primary phone number is required for setting an alternative phone number"
                 )
             )
+        if phonenumber_alt and phonenumber_alt == phonenumber:
+            raise ValidationError(
+                _("Primary and secondary phone numbers cannot be the same")
+            )
 
         return phonenumber_alt
 

src/open_inwoner/accounts/migrations/0081_user_check_alternative_phonenumber_differs_from_primary_phonenumber.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.2.18 on 2025-03-11 15:35
+
+from django.db import migrations, models
+from django.db.models import F
+
+
+def dedupe_phone_numbers(apps, schema_editor):
+    User = apps.get_model("accounts", "User")
+
+    for user in User.objects.filter(phonenumber=F("phonenumber_alternative")):
+        user.phonenumber_alternative = ""
+        user.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0080_user_phonenumber_alternative"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=dedupe_phone_numbers,
+            reverse_code=migrations.RunPython.noop,
+        ),
+        migrations.AddConstraint(
+            model_name="user",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    models.Q(
+                        ("phonenumber", models.F("phonenumber_alternative")),
+                        _negated=True,
+                    ),
+                    ("phonenumber__exact", ""),
+                    _connector="OR",
+                ),
+                name="check_alternative_phonenumber_differs_from_primary_phonenumber",
+            ),
+        ),
+    ]

src/open_inwoner/accounts/models.py

@@ -7,7 +7,7 @@
 from django.contrib.contenttypes.fields import GenericRelation
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import Q, UniqueConstraint
+from django.db.models import F, Q, UniqueConstraint
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.crypto import get_random_string
@@ -335,6 +335,11 @@ class Meta:
                 check=~Q(phonenumber__exact="") | Q(phonenumber_alternative__exact=""),
                 name="phonenumber_alt_requires_phonenumber_primary",
             ),
+            models.CheckConstraint(
+                check=~Q(phonenumber=F("phonenumber_alternative"))
+                | Q(phonenumber__exact=""),
+                name="check_alternative_phonenumber_differs_from_primary_phonenumber",
+            ),
         ]
 
     def __init__(self, *args, **kwargs):

src/open_inwoner/accounts/tests/test_migrations.py

@@ -0,0 +1,32 @@
+from django.db.models import F
+from django.db.utils import IntegrityError
+
+from open_inwoner.utils.tests.test_migrations import TestSuccessfulMigrations
+
+
+class UserMigrationTest(TestSuccessfulMigrations):
+    migrate_from = "0080_user_phonenumber_alternative"
+    migrate_to = (
+        "0081_user_check_alternative_phonenumber_differs_from_primary_phonenumber"
+    )
+    app = "accounts"
+
+    def setUpBeforeMigration(self, apps):
+        User = apps.get_model("accounts", "User")
+
+        user = User.objects.create(phonenumber="0612345678")
+
+        # no IntegrityError before migration
+        user.phonenumber_alternative = user.phonenumber
+        user.save()
+
+    def test_migrate_phonenumber_constraint(self):
+        User = self.apps.get_model("accounts", "User")
+
+        self.assertFalse(User.objects.filter(phonenumber=F("phonenumber_alternative")))
+
+        user = User.objects.first()
+
+        with self.assertRaises(IntegrityError):
+            user.phonenumber_alternative = user.phonenumber
+            user.save()

src/open_inwoner/accounts/tests/test_user.py

@@ -112,9 +112,16 @@ def test_plan_contact_new_count_methods(self):
         user.clear_plan_contact_new_count()
         self.assertEqual(0, user.get_plan_contact_new_count())
 
-    def test_constraint_phonenumber_alternative(self):
+    def test_phonenumber_alternative_requires_primary_phonenumber(self):
         user = UserFactory(phonenumber="")
 
         with self.assertRaises(IntegrityError):
             user.phonenumber_alternative = "0612345678"
             user.save()
+
+    def test_phonenumber_alternative_differs_from_non_empty_primary_phonenumber(self):
+        user = UserFactory(phonenumber="612345678")
+
+        with self.assertRaises(IntegrityError):
+            user.phonenumber_alternative = user.phonenumber
+            user.save()