[#2920] Fix check for natural keys duplicates in ZGW imports

    - The check for natural keys duplicates produced false positives
      because the same `omschrijving` can be used for different types
      of ZGW objects (e.g. "Afgehandel" for status and resulaat).
      The check for duplicate natural keys is now scoped to the type
      of ZGW configuration.

Author: pi-sigma

src/open_inwoner/openzaak/import_export.py

@@ -334,7 +334,7 @@ def from_jsonl_stream_or_string(cls, stream_or_string: IO | str) -> Self:
 
         rows_successfully_processed = 0
         import_errors = []
-        natural_keys_seen = set()
+        natural_keys_seen = defaultdict(set)
         for line in cls._lines_iter_from_jsonl_stream_or_string(stream_or_string):
             try:
                 (deserialized_object,) = serializers.deserialize(
@@ -351,10 +351,11 @@ def from_jsonl_stream_or_string(cls, stream_or_string: IO | str) -> Self:
                 import_errors.append(error)
             else:
                 source_config = deserialized_object.object
-                if (natural_key := source_config.natural_key()) in natural_keys_seen:
+                natural_key = source_config.natural_key()
+                if natural_key in natural_keys_seen[source_config.__class__.__name__]:
                     import_errors.append(ZGWImportError.from_jsonl(line))
                     continue
-                natural_keys_seen.add(natural_key)
+                natural_keys_seen[source_config.__class__.__name__].add(natural_key)
                 try:
                     match source_config:
                         case CatalogusConfig():

src/open_inwoner/openzaak/tests/test_import_export.py

@@ -26,7 +26,7 @@
 
 
 class ZGWExportImportMockData:
-    def __init__(self, count=0):
+    def __init__(self, count=0, with_dupes=False):
         self.original_url = f"https://foo.{count}.maykinmedia.nl"
         self.original_uuid = "a1591906-3368-470a-a957-4b8634c275a1"
         self.service = ServiceFactory(slug=f"service-{count}")
@@ -78,6 +78,14 @@ def __init__(self, count=0):
             omschrijving="informatieobject",
             zaaktype_uuids=[self.original_uuid],
         )
+        if with_dupes:
+            self.ztc_resultaat_2 = ZaakTypeResultaatTypeConfigFactory(
+                zaaktype_config=self.ztc,
+                resultaattype_url=self.original_url,
+                omschrijving="status omschrijving",  # test dupes across models
+                zaaktype_uuids=[self.original_uuid],
+                description="",
+            )
 
 
 class ExportObjectTests(TestCase):
@@ -344,6 +352,7 @@ def setUp(self):
         ]
         self.json_dupes = [
             '{"model": "openzaak.zaaktypestatustypeconfig", "fields": {"zaaktype_config": ["ztc-id-a-0", "DM-0", "123456789"], "statustype_url": "https://bar.maykinmedia.nl", "omschrijving": "status omschrijving", "statustekst": "statustekst nieuw", "zaaktype_uuids": "[]", "status_indicator": "", "status_indicator_text": "", "document_upload_description": "", "description": "status", "notify_status_change": true, "action_required": false, "document_upload_enabled": true, "call_to_action_url": "", "call_to_action_text": "", "case_link_text": ""}}',
+            '{"model": "openzaak.zaaktyperesultaattypeconfig", "fields": {"zaaktype_config": ["ztc-id-a-0", "DM-0", "123456789"], "resultaattype_url": "https://bar.maykinmedia.nl", "omschrijving": "status omschrijving", "zaaktype_uuids": "[]", "description": "description new"}}',
         ]
         self.jsonl = "\n".join(self.json_lines)
         self.jsonl_with_dupes = "\n".join(self.json_lines + self.json_dupes)
@@ -557,7 +566,7 @@ def test_import_jsonl_update_reports_duplicate_db_records(self):
         self.assertEqual(import_result, import_expected)
 
     def test_import_jsonl_update_reports_duplicate_natural_keys_in_upload_file(self):
-        mocks = ZGWExportImportMockData()
+        mocks = ZGWExportImportMockData(with_dupes=True)
 
         self.storage.save("import.jsonl", io.StringIO(self.jsonl_with_dupes))
 
@@ -574,12 +583,13 @@ def test_import_jsonl_update_reports_duplicate_natural_keys_in_upload_file(self)
         )
         import_expected = dataclasses.asdict(
             ZGWConfigImport(
-                total_rows_processed=6,
+                total_rows_processed=7,
                 catalogus_configs_imported=1,
                 zaaktype_configs_imported=1,
                 zaak_informatie_object_type_configs_imported=1,
                 zaak_status_type_configs_imported=1,
-                zaak_resultaat_type_configs_imported=1,
+                # resultaat_type_config with "status omschrijving" should be imported
+                zaak_resultaat_type_configs_imported=2,
                 import_errors=[expected_error],
             ),
         )