New fixes

Author: danielmursa-dev

src/openklant/components/contactgegevens/migrations/0005_alter_organisatie_adres_nummeraanduiding_id_and_more.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _check_records(records, model_name):
+def _check_records(records):
     total_failed_records = 0
     for record in records:
         if record.adres_nummeraanduiding_id:
@@ -19,7 +19,7 @@ def _check_records(records, model_name):
             except ValidationError:
                 logger.warning(
                     "%s(pk=%s, uuid=%s) Field: 'adres_nummeraanduiding_id'. Invalid BAG ID: %s",
-                    model_name,
+                    type(record).__qualname__,
                     record.pk,
                     record.uuid,
                     record.adres_nummeraanduiding_id,
@@ -32,13 +32,13 @@ def _check_records_field_length(apps, schema_editor):
     Organisatie = apps.get_model("contactgegevens", "Organisatie")
     Persoon = apps.get_model("contactgegevens", "Persoon")
 
-    for model_name, model in [("Organisatie", Organisatie), ("Persoon", Persoon)]:
+    for model in [Organisatie, Persoon]:
         records = model.objects.all()
-        if total_failed_records := _check_records(records, model_name):
+        if total_failed_records := _check_records(records):
             raise IntegrityError(
                 "The migration cannot proceed due to %s records that don't comply with the %s model's requirements. "
                 "Possible data inconsistency or mapping error."
-                % (total_failed_records, model_name)
+                % (total_failed_records, model.__qualname__)
             )
 
 

src/openklant/components/klantinteracties/migrations/0027_alter_betrokkene_bezoekadres_nummeraanduiding_id_and_more.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _check_records(records, model_name):
+def _check_records(records):
     total_failed_records = 0
     for record in records:
         record_failed = False
@@ -25,7 +25,7 @@ def _check_records(records, model_name):
                 except ValidationError:
                     logger.warning(
                         "%s(pk=%s, uuid=%s) Field: '%s'. Invalid BAG ID: %s",
-                        model_name,
+                        type(record).__qualname__,
                         record.pk,
                         record.uuid,
                         field_name,
@@ -42,13 +42,13 @@ def _check_records_field_length(apps, schema_editor):
     Betrokkene = apps.get_model("klantinteracties", "Betrokkene")
     Partij = apps.get_model("klantinteracties", "Partij")
 
-    for model_name, model in [("Betrokkene", Betrokkene), ("Partij", Partij)]:
+    for model in [Betrokkene, Partij]:
         records = model.objects.all()
-        if total_failed_records := _check_records(records, model_name):
+        if total_failed_records := _check_records(records):
             raise IntegrityError(
                 "The migration cannot proceed due to %s records that don't comply with the %s model's requirements. "
                 "Possible data inconsistency or mapping error."
-                % (total_failed_records, model_name)
+                % (total_failed_records, model.__qualname__)
             )
 
 

src/openklant/utils/tests/test_validators.py

@@ -172,8 +172,8 @@ def test_validate_bag_id(self):
                 bag_id,
             )
 
-        self.assertIsNone(validate_bag_id("1234567890000001"))
-        self.assertIsNone(validate_bag_id("1111111111111111"))
+        validate_bag_id("1234567890000001")
+        validate_bag_id("1111111111111111")
 
     def test_validate_country(self):
         invalid_codes = [