[#2035] Remove user birthday field

maykinmedia · Jan 29, 2024 · a3438b6 · a3438b6
1 parent 165c8b0
commit a3438b6
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 60 deletions.
diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
@@ -157,7 +157,6 @@ class Meta:
             "display_name",
             "email",
             "phonenumber",
-            "birthday",
             "street",
             "housenumber",
             "postcode",

diff --git a/src/open_inwoner/accounts/migrations/0071_remove_user_birthday.py b/src/open_inwoner/accounts/migrations/0071_remove_user_birthday.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.23 on 2024-01-22 15:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0070_auto_20231205_1657"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="user",
+            name="birthday",
+        ),
+    ]
diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
@@ -145,7 +145,6 @@ class User(AbstractBaseUser, PermissionsMixin):
         default=LoginTypeChoices.default,
         max_length=250,
     )
-    birthday = models.DateField(verbose_name=_("Birthday"), null=True, blank=True)
     street = models.CharField(
         verbose_name=_("Street"),
         default="",
@@ -340,18 +339,6 @@ def get_full_name(self):
     def get_short_name(self):
         return self.first_name
 
-    def get_age(self):
-        if self.birthday:
-            today = date.today()
-            age = (
-                today.year
-                - self.birthday.year
-                - ((today.month, today.day) < (self.birthday.month, self.birthday.day))
-            )
-
-            return age
-        return None
-
     def get_address(self):
         if self.street:
             return f"{self.street} {self.housenumber}, {self.postcode} {self.city}"

diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py
@@ -306,7 +306,6 @@ def test_first_digid_login_updates_brp_fields(self, m):
 
         self.assertEqual(user.first_name, "Merel")
         self.assertEqual(user.last_name, "Kooyman")
-        self.assertEqual(user.birthday, date(1982, 4, 10))
         self.assertEqual(user.street, "King Olivereiland")
         self.assertEqual(user.housenumber, "64")
         self.assertEqual(user.city, "'s-Gravenhage")

diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -320,7 +320,6 @@ def test_save_empty_form_fails(self):
         form["display_name"] = ""
         form["email"] = ""
         form["phonenumber"] = ""
-        form["birthday"] = ""
         form["street"] = ""
         form["housenumber"] = ""
         form["postcode"] = ""
@@ -337,7 +336,6 @@ def test_save_filled_form(self):
         form["display_name"] = "a nickname"
         form["email"] = "user@example.com"
         form["phonenumber"] = "0612345678"
-        form["birthday"] = "21-01-1992"
         form["street"] = "Keizersgracht"
         form["housenumber"] = "17 d"
         form["postcode"] = "1013 RM"
@@ -351,7 +349,6 @@ def test_save_filled_form(self):
         self.assertEquals(self.user.last_name, "Last name")
         self.assertEquals(self.user.display_name, "a nickname")
         self.assertEquals(self.user.email, "user@example.com")
-        self.assertEquals(self.user.birthday.strftime("%d-%m-%Y"), "21-01-1992")
         self.assertEquals(self.user.street, "Keizersgracht")
         self.assertEquals(self.user.housenumber, "17 d")
         self.assertEquals(self.user.postcode, "1013 RM")

diff --git a/src/open_inwoner/accounts/tests/test_user.py b/src/open_inwoner/accounts/tests/test_user.py
@@ -43,30 +43,6 @@ def test_get_full_name(self):
         )
         self.assertEqual(user.get_full_name(), "")
 
-    @freeze_time("2021-07-07 12:00:00")
-    def test_get_age_same_day(self):
-        with freeze_time("1990-07-07"):
-            user = User(birthday=date.today())
-        self.assertEqual(user.get_age(), 31)
-
-    @freeze_time("2021-07-07 12:00:00")
-    def test_get_age_day_before(self):
-        with freeze_time("1990-07-08"):
-            user = User(birthday=date.today())
-        self.assertEqual(user.get_age(), 30)
-
-    @freeze_time("2021-07-07 12:00:00")
-    def test_get_age_day_after(self):
-        with freeze_time("1990-07-06"):
-            user = User(birthday=date.today())
-        self.assertEqual(user.get_age(), 31)
-
-    @freeze_time("2021-07-07 12:00:00")
-    def test_get_age_young(self):
-        with freeze_time("2014-01-07"):
-            user = User(birthday=date.today())
-        self.assertEqual(user.get_age(), 7)
-
     def test_require_necessary_fields(self):
         user = UserFactory()
         self.assertFalse(user.require_necessary_fields())

diff --git a/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po b/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po
@@ -549,11 +549,6 @@ msgstr "Bedrijfsnaam"
 msgid "Login type"
 msgstr "Logintype"
 
-#: src/open_inwoner/accounts/models.py:148
-#: src/open_inwoner/templates/export/profile/profile_export.html:14
-msgid "Birthday"
-msgstr "Geboortedatum"
-
 #: src/open_inwoner/accounts/models.py:150
 msgid "Street"
 msgstr "Straat"

diff --git a/src/open_inwoner/haalcentraal/tests/test_signal.py b/src/open_inwoner/haalcentraal/tests/test_signal.py
@@ -35,7 +35,6 @@ def test_signal_updates_users_data_when_logged_in_via_digid_v_2(self, m):
         self.assertEqual(user.first_name, "Merel")
         self.assertEqual(user.infix, "de")
         self.assertEqual(user.last_name, "Kooyman")
-        self.assertEqual(user.birthday, date(1982, 4, 10))
         self.assertEqual(user.street, "King Olivereiland")
         self.assertEqual(user.housenumber, "64")
         self.assertEqual(user.city, "'s-Gravenhage")
@@ -57,7 +56,6 @@ def test_signal_updates_users_data_when_logged_in_via_digid_v_1_3(self, m):
         self.assertEqual(user.first_name, "Merel")
         self.assertEqual(user.infix, "de")
         self.assertEqual(user.last_name, "Kooyman")
-        self.assertEqual(user.birthday, date(1982, 4, 10))
         self.assertEqual(user.street, "King Olivereiland")
         self.assertEqual(user.housenumber, "64")
         self.assertEqual(user.city, "'s-Gravenhage")
@@ -98,7 +96,6 @@ def test_user_is_not_updated_without_defining_service(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")
@@ -118,7 +115,6 @@ def test_user_is_not_updated_when_not_logged_in_via_digid(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")
@@ -148,7 +144,6 @@ def test_empty_response_from_haalcentraal(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")
@@ -190,7 +185,6 @@ def test_wrong_date_format_saves_birthday_none_brp_v_1_3(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")
@@ -220,7 +214,6 @@ def test_user_is_not_updated_when_http_404(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")
@@ -250,7 +243,6 @@ def test_user_is_not_updated_when_http_500(self, m):
         self.assertEqual(user.first_name, "")
         self.assertEqual(user.infix, "")
         self.assertEqual(user.last_name, "")
-        self.assertEqual(user.birthday, None)
         self.assertEqual(user.street, "")
         self.assertEqual(user.housenumber, "")
         self.assertEqual(user.city, "")

diff --git a/src/open_inwoner/templates/pages/profile/edit.html b/src/open_inwoner/templates/pages/profile/edit.html
@@ -29,7 +29,6 @@ <h1 class="h1" id="title">
                 {% input form.display_name %}
                 {% input form.email %}
                 {% input form.phonenumber %}
-                {% date_field form.birthday no_help=True %}
                 {% input form.street %}
                 {% input form.housenumber %}
                 {% input form.postcode %}

diff --git a/src/open_inwoner/templates/pages/profile/me.html b/src/open_inwoner/templates/pages/profile/me.html
@@ -62,10 +62,6 @@ <h2 class="h2 title" id="personal-overview">{% trans "Persoonlijke gegevens" %}
             <div class="tabled__item tabled__key">{% trans "Achternaam" %}</div>
             <div class="tabled__item tabled__value">{{ user.last_name }}</div>
         </div>
-        <div class="tabled__row tabled__row--blank">
-            <div class="tabled__item tabled__key">{% trans "Geboortedatum" %}</div>
-            <div class="tabled__item tabled__value">{{ user.birthday|date:"j F Y" }}</div>
-        </div>
         <div class="tabled__row tabled__row--blank">
             <div class="tabled__item tabled__key">{% trans "Adres" %}</div>
             <div class="tabled__item tabled__value">