[#2684] Replaced call_name with display_name

src/open_inwoner/accounts/migrations/0077_no_display_name.py → src/open_inwoner/accounts/migrations/0077_no_roepnaam.py

@@ -1,10 +1,9 @@
-# Generated by Django 4.2.15 on 2024-08-20 14:24
+# Generated by Django 4.2.15 on 2024-08-22 08:50
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("accounts", "0076_user_case_notification_channel"),
     ]

src/open_inwoner/accounts/models.py

@@ -351,16 +351,13 @@ def seed(self):
 
     def get_full_name(self):
         # validator allowed spaces as values
-        first_name = self.first_name.strip()
+        first_name = self.display_name.strip() or self.first_name.strip()
         parts = (first_name, self.infix.strip(), self.last_name.strip())
         return " ".join(p for p in parts if p)
 
-    def get_short_name(self):
-        return self.first_name
-
     @property
-    def call_name(self):
-        return self.first_name or self.first_name
+    def display_name(self):
+        return self.first_name
 
     def get_address(self):
         if self.street:

src/open_inwoner/accounts/tests/test_profile_views.py

@@ -137,7 +137,7 @@ def test_user_information_profile_page(self):
         response = self.app.get(self.url, user=self.user)
 
         self.assertContains(response, self.user.first_name)
-        self.assertContains(response, f"Welkom, {self.user.first_name}")
+        self.assertContains(response, f"Welkom, {self.user.display_name}")
         self.assertContains(response, f"{self.user.infix} {self.user.last_name}")
         self.assertContains(response, self.user.email)
         self.assertContains(response, self.user.phonenumber)
@@ -355,6 +355,7 @@ def test_save_filled_form(self):
         self.user.refresh_from_db()
         self.assertEqual(self.user.first_name, "First name")
         self.assertEqual(self.user.last_name, "Last name")
+        self.assertEqual(self.user.display_name, "First name")
         self.assertEqual(self.user.email, "[email protected]")
         self.assertEqual(self.user.street, "Keizersgracht")
         self.assertEqual(self.user.housenumber, "17 d")
@@ -385,6 +386,7 @@ def test_name_validation(self):
                     "first_name": [error_msg],
                     "infix": [error_msg],
                     "last_name": [error_msg],
+                    "display_name": [error_msg],
                     "city": [error_msg],
                     "street": [error_msg],
                 }
@@ -442,6 +444,7 @@ def test_form_for_digid_brp_user_saves_data(self):
 
         user.refresh_from_db()
 
+        self.assertEqual(user.display_name, "name")
         self.assertEqual(user.email, "[email protected]")
         self.assertEqual(user.phonenumber, "0612345678")
 
@@ -821,6 +824,7 @@ def setUp(self):
             infix="de",
             last_name="Kooyman",
             login_type=LoginTypeChoices.digid,
+            display_name="Meertje",
         )
         self.url = reverse("profile:data")
 
@@ -838,6 +842,7 @@ def setUp(self):
             self.expected_response.city,
             # self.expected_response.country,
             self.user.bsn,
+            self.user.display_name,
             self.user.email,
             self.user.phonenumber,
         ]

src/open_inwoner/accounts/tests/test_user.py

@@ -22,6 +22,10 @@ def test_get_full_name(self):
         user = User(first_name="", infix="", last_name="Bar")
         self.assertEqual(user.get_full_name(), "Bar")
 
+        # use display_name instead of first_name
+        user = User(first_name="Foo", infix="de", last_name="Bar")
+        self.assertEqual(user.get_full_name(), "Foo de Bar")
+
         # spaces everywhere
         user = User(first_name="Foo", infix="de", last_name="Bar")
         self.assertEqual(user.get_full_name(), "Foo de Bar")

src/open_inwoner/components/templates/components/Header/Header.html

@@ -88,7 +88,7 @@
 
                         {% if request.user.is_authenticated %}
                             <p class="utrecht-paragraph">
-                                {% icon icon="person" icon_position="before" outlined=True %}{% trans "Ingelogd als" %} {{ request.user.first_name }}
+                                {% icon icon="person" icon_position="before" outlined=True %}{% trans "Ingelogd als" %} {{ request.user.display_name }}
                             </p>
                             <ul class="header__list">
                                 <li class="header__list-item">

src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html

@@ -7,7 +7,7 @@
     <nav class="primary-navigation primary-navigation--desktop primary-navigation__authenticated" aria-label="Navigatie na inloggen">
         <ul class="primary-navigation__list">
             <li class="primary-navigation__list-item">
-            {% button text=_('Welkom ')|addstr:request.user.get_short_name type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
+            {% button text=_('Welkom ')|addstr:request.user.display_name type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
 
                 {% if request.user.num_indicators %}
                     {# num_indicators is set from a modifier in show_menu_below_id #}

src/open_inwoner/plans/tests/test_views.py

@@ -115,7 +115,7 @@ def test_plan_detail_contacts(self):
 
         response = self.app.get(self.detail_url, user=self.contact)
         self.assertContains(response, self.user.get_full_name())
-        self.assertContains(response, self.contact.first_name)
+        self.assertContains(response, self.contact.display_name)
 
         # Contact for one user, but not the other
         # Check if all users can see eachother in the plan
@@ -130,12 +130,12 @@ def test_plan_detail_contacts(self):
 
         response = self.app.get(self.detail_url, user=self.contact)
         self.assertContains(response, self.user.get_full_name())
-        self.assertContains(response, self.contact.first_name)
+        self.assertContains(response, self.contact.display_name)
         self.assertContains(response, new_contact.get_full_name())
 
         response = self.app.get(self.detail_url, user=new_contact)
         self.assertContains(response, self.user.get_full_name())
-        self.assertContains(response, new_contact.first_name)
+        self.assertContains(response, new_contact.display_name)
         self.assertContains(response, self.contact.get_full_name())
 
         new_contact.delete()

src/open_inwoner/templates/pages/profile/me.html

@@ -12,7 +12,7 @@
 {% get_solo 'configurations.SiteConfiguration' as siteconfig %}
 
 <section class="tabled tabled--flexible">
-    <h1 class="utrecht-heading-1" id="title">{% trans "Welkom" %}{% if not user.is_eherkenning_user %}, {{ user.call_name }}{% endif %}</h1>
+    <h1 class="utrecht-heading-1" id="title">{% trans "Welkom" %}{% if not user.is_eherkenning_user %}, {{ user.display_name }}{% endif %}</h1>
     <p class="tabled__key">
     {% trans "voor het laatst ingelogd op" %}: <span
     class="tabled__value">{{ user.last_login|date:"j F Y" }} om {{ user.last_login|date:"G:i" }} uur</span>
@@ -72,7 +72,7 @@ <h2 class="utrecht-heading-2 " id="personal-overview">{% trans "Persoonlijke geg
         </div>
         <div class="tabled__row tabled__row--blank">
             <div class="tabled__item tabled__key">{% trans "Voornaam" %}</div>
-            <div class="tabled__item tabled__value">{{ user.first_name }}</div>
+            <div class="tabled__item tabled__value">{{ user.display_name }}</div>
         </div>
         <div class="tabled__row tabled__row--blank">
             <div class="tabled__item tabled__key">{% trans "Achternaam" %}</div>