[#311] Fix merge conflicts

Author: danielmursa-dev

src/openklant/components/klantinteracties/migrations/0024_alter_betrokkene_bezoekadres_land_and_more.py src/openklant/components/klantinteracties/migrations/0026_alter_betrokkene_bezoekadres_land_and_more.py

@@ -1,81 +1,20 @@
-# Generated by Django 4.2.15 on 2025-01-09 15:19
+# Generated by Django 4.2.17 on 2025-01-27 14:35
 
-import logging
 import django.core.validators
-import openklant.utils.validators
 from django.db import migrations, models
 import openklant.utils.validators
-from django.core.management import CommandError
-from openklant.utils.constants import COUNTRIES_DICT
-
-logger = logging.getLogger(__name__)
-
-FIELDS = ["bezoekadres_land", "correspondentieadres_land"]
-
-
-def _check_records(records, model_name):
-    total_failed_records = 0
-    for record in records:
-        record_failed = False
-        for field_name in FIELDS:
-            field_value = getattr(record, field_name, None)
-            iso_code = COUNTRIES_DICT.get(field_value, "")
-            if field_value and not iso_code:
-                record_failed = True
-                logger.warning(
-                    "%s(pk=%s, uuid=%s) Field: '%s'. No match found for nl_code: '%s'",
-                    model_name,
-                    record.pk,
-                    record.uuid,
-                    field_name,
-                    field_value,
-                )
-
-        if record_failed:
-            total_failed_records += 1
-    return total_failed_records
-
-
-def _update_records(records):
-    for record in records:
-        updated = False
-        for field_name in FIELDS:
-            if field_value := getattr(record, field_name, None):
-                iso_code = COUNTRIES_DICT.get(field_value, "")
-                setattr(record, field_name, iso_code)
-                updated = True
-
-        if updated:
-            record.save()
-
-
-def _check_and_update_records(apps, schema_editor):
-    Betrokkene = apps.get_model("klantinteracties", "Betrokkene")
-    Partij = apps.get_model("klantinteracties", "Partij")
-
-    for model_name, model in [("Betrokkene", Betrokkene), ("Partij", Partij)]:
-        records = model.objects.all()
-        if total_failed_records := _check_records(records, model_name):
-            raise CommandError(
-                "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)
-            )
-        else:
-            _update_records(records)
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("klantinteracties", "0023_alter_digitaaladres_omschrijving"),
+        (
+            "klantinteracties",
+            "0025_alter_partijidentificator_partij_identificator_code_objecttype_and_more",
+        ),
     ]
 
     operations = [
-        migrations.RunPython(
-            code=_check_and_update_records,
-            reverse_code=migrations.RunPython.noop,
-        ),
         migrations.AlterField(
             model_name="betrokkene",
             name="bezoekadres_land",