[#311] Add country dict

[#311] Update models + migrations [#311] Create Tests
maykinmedia · Jan 30, 2025 · e92eae5 · e92eae5
1 parent f778cd5
commit e92eae5
Show file tree

Hide file tree

Showing 26 changed files with 1,266 additions and 264 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -2,3 +2,5 @@ open-api-framework
 
 django-setup-configuration
 mozilla-django-oidc-db[setup-configuration]
+
+django-localflavor
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -81,6 +81,7 @@ django==4.2.17
     #   django-filter
     #   django-formtools
     #   django-jsonform
+    #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
@@ -126,6 +127,8 @@ django-jsonform==2.22.0
     # via
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-localflavor==4.0
+    # via -r requirements/base.in
 django-log-outgoing-requests==0.6.1
     # via open-api-framework
 django-markup==1.8.1
@@ -279,6 +282,8 @@ python-dotenv==1.0.1
     # via
     #   open-api-framework
     #   pydantic-settings
+python-stdnum==1.20
+    # via django-localflavor
 pytz==2024.1
     # via flower
 pyyaml==6.0.1

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -162,6 +162,7 @@ django==4.2.17
     #   django-filter
     #   django-formtools
     #   django-jsonform
+    #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
@@ -229,6 +230,8 @@ django-jsonform==2.22.0
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-localflavor==4.0
+    # via -r requirements/base.txt
 django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/base.txt
@@ -619,6 +622,10 @@ python-dotenv==1.0.1
     #   -r requirements/base.txt
     #   open-api-framework
     #   pydantic-settings
+python-stdnum==1.20
+    # via
+    #   -r requirements/base.txt
+    #   django-localflavor
 pytz==2024.1
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -197,6 +197,7 @@ django==4.2.17
     #   django-filter
     #   django-formtools
     #   django-jsonform
+    #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
@@ -268,6 +269,8 @@ django-jsonform==2.22.0
     #   -r requirements/ci.txt
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-localflavor==4.0
+    # via -r requirements/base.txt
 django-log-outgoing-requests==0.6.1
     # via
     #   -c requirements/ci.txt
@@ -731,6 +734,10 @@ python-dotenv==1.0.1
     #   -r requirements/ci.txt
     #   open-api-framework
     #   pydantic-settings
+python-stdnum==1.20
+    # via
+    #   -r requirements/base.txt
+    #   django-localflavor
 pytz==2024.1
     # via
     #   -c requirements/ci.txt

diff --git a/src/openklant/components/contactgegevens/api/tests/test_apis.py b/src/openklant/components/contactgegevens/api/tests/test_apis.py
@@ -21,8 +21,8 @@ def test_persoon_detail(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:persoon-detail",
@@ -34,7 +34,7 @@ def test_persoon_detail(self):
             "adresregel1": "adresregel1",
             "adresregel2": "adresregel2",
             "adresregel3": "adresregel3",
-            "land": "5001",
+            "land": "CA",
         }
         expected_data = {
             "uuid": str(persoon.uuid),
@@ -46,7 +46,7 @@ def test_persoon_detail(self):
             "voorvoegsel": "",
             "voornamen": "John",
             "adres": expected_adres,
-            "land": "5001",
+            "land": "CA",
         }
 
         response = self.client.get(detail_url)
@@ -68,9 +68,9 @@ def test_create_persoon(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
-            "land": "5001",
+            "land": "CA",
         }
 
         response = self.client.post(list_url, data)
@@ -92,10 +92,10 @@ def test_create_persoon(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
     def test_update_persoon(self):
         persoon = PersoonFactory.create(
@@ -109,8 +109,8 @@ def test_update_persoon(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:persoon-detail",
@@ -136,10 +136,10 @@ def test_update_persoon(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
         data = {
             "geboortedatum": "1972-05-06",
@@ -153,12 +153,13 @@ def test_update_persoon(self):
                 "adresregel1": "changed",
                 "adresregel2": "changed",
                 "adresregel3": "changed",
-                "land": "6713",
+                "land": "FR",
             },
-            "land": "6713",
+            "land": "FR",
         }
         response = self.client.put(detail_url, data)
         data = response.json()
+
         self.assertEqual(data["geboortedatum"], "1972-05-06")
         self.assertEqual(data["overlijdensdatum"], "2023-11-22")
         self.assertEqual(data["geslachtsnaam"], "changed")
@@ -172,10 +173,10 @@ def test_update_persoon(self):
                 "adresregel1": "changed",
                 "adresregel2": "changed",
                 "adresregel3": "changed",
-                "land": "6713",
+                "land": "FR",
             },
         )
-        self.assertEqual(data["land"], "6713")
+        self.assertEqual(data["land"], "FR")
 
     def test_update_partial_persoon(self):
         persoon = PersoonFactory.create(
@@ -189,8 +190,8 @@ def test_update_partial_persoon(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:persoon-detail",
@@ -216,10 +217,10 @@ def test_update_partial_persoon(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
         data = {
             "overlijdensdatum": "2023-11-22",
@@ -240,10 +241,10 @@ def test_update_partial_persoon(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
     def test_list_pagination_pagesize_param(self):
         list_url = reverse("contactgegevens:persoon-list")
@@ -269,8 +270,8 @@ def test_organisatie_detail(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:organisatie-detail",
@@ -282,7 +283,7 @@ def test_organisatie_detail(self):
             "adresregel1": "adresregel1",
             "adresregel2": "adresregel2",
             "adresregel3": "adresregel3",
-            "land": "5001",
+            "land": "CA",
         }
         expected_data = {
             "uuid": str(organisatie.uuid),
@@ -291,7 +292,7 @@ def test_organisatie_detail(self):
             "opheffingsdatum": "2020-09-05",
             "handelsnaam": "Devin Townsend",
             "adres": expected_adres,
-            "land": "5001",
+            "land": "CA",
         }
 
         response = self.client.get(detail_url)
@@ -311,9 +312,9 @@ def test_create_organisatie(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
-            "land": "5001",
+            "land": "CA",
         }
 
         response = self.client.post(list_url, data)
@@ -332,10 +333,10 @@ def test_create_organisatie(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
     def test_update_organisatie(self):
         organisatie = OrganisatieFactory.create(
@@ -346,8 +347,8 @@ def test_update_organisatie(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:organisatie-detail",
@@ -370,10 +371,10 @@ def test_update_organisatie(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
         data = {
             "handelsnaam": "changed",
@@ -384,9 +385,9 @@ def test_update_organisatie(self):
                 "adresregel1": "changed",
                 "adresregel2": "changed",
                 "adresregel3": "changed",
-                "land": "6713",
+                "land": "FR",
             },
-            "land": "6713",
+            "land": "FR",
         }
         response = self.client.put(detail_url, data)
         data = response.json()
@@ -400,10 +401,10 @@ def test_update_organisatie(self):
                 "adresregel1": "changed",
                 "adresregel2": "changed",
                 "adresregel3": "changed",
-                "land": "6713",
+                "land": "FR",
             },
         )
-        self.assertEqual(data["land"], "6713")
+        self.assertEqual(data["land"], "FR")
 
     def test_update_partial_organisatie(self):
         organisatie = OrganisatieFactory.create(
@@ -414,8 +415,8 @@ def test_update_partial_organisatie(self):
             adres_adresregel1="adresregel1",
             adres_adresregel2="adresregel2",
             adres_adresregel3="adresregel3",
-            adres_land="5001",
-            land="5001",
+            adres_land="CA",
+            land="CA",
         )
         detail_url = reverse(
             "contactgegevens:organisatie-detail",
@@ -438,10 +439,10 @@ def test_update_partial_organisatie(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
         data = {
             "opheffingsdatum": "2023-11-22",
@@ -460,10 +461,10 @@ def test_update_partial_organisatie(self):
                 "adresregel1": "adresregel1",
                 "adresregel2": "adresregel2",
                 "adresregel3": "adresregel3",
-                "land": "5001",
+                "land": "CA",
             },
         )
-        self.assertEqual(data["land"], "5001")
+        self.assertEqual(data["land"], "CA")
 
     def test_list_pagination_pagesize_param(self):
         list_url = reverse("contactgegevens:organisatie-list")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@ open-api-framework

		django-setup-configuration
		mozilla-django-oidc-db[setup-configuration]

		django-localflavor