Use Don_Code for country identification in ingest_ns_directory job

Author: szabozoltan69

api/management/commands/ingest_ns_directory.py

@@ -47,37 +47,44 @@ def postprocessor(path, key, value):
         created_country_directory_ids = []
         dict_data = xmltodict.parse(response.content, postprocessor=postprocessor)
         for data in dict_data["ArrayOfNationalSocietiesContacts"]["NationalSocietiesContacts"]:
-            country_name = data["CON_country"] if isinstance(data["CON_country"], str) else None
-            if country_name is not None:
+            Don_Code = data.get("Don_Code") if isinstance(data.get("Don_Code"), str) else None
+            country_name = data.get("CON_country") if isinstance(data.get("CON_country"), str) else None
+            country = None
+            if Don_Code:
+                # Prefer matching country by Don_Code via fdrs field.
+                country = Country.objects.filter(fdrs=Don_Code).first()
+                if not country:
+                    logger.info("No country matched Don_Code %s; falling back to CON_country", Don_Code)
+            if not country and country_name is not None:
                 country = Country.objects.filter(name__icontains=country_name).first()
-                if country:
-                    added += 1
-                    data = {
-                        "first_name": (
-                            data["CON_firstName"]
-                            if isinstance(data["CON_firstName"], str) and data["CON_firstName"] is not None
-                            else None
-                        ),
-                        "last_name": (
-                            data["CON_lastName"]
-                            if isinstance(data["CON_lastName"], str) and data["CON_lastName"] is not None
-                            else None
-                        ),
-                        "position": data["CON_title"],
-                        "country": country,
-                    }
-                    country_directory, _ = CountryDirectory.objects.get_or_create(
-                        country=country,
-                        first_name__iexact=data["first_name"],
-                        last_name__iexact=data["last_name"],
-                        position__iexact=data["position"],
-                        defaults={
-                            "first_name": data["first_name"],
-                            "last_name": data["last_name"],
-                            "position": data["position"],
-                        },
-                    )
-                    created_country_directory_ids.append(country_directory.pk)
+            if country:
+                added += 1
+                data = {
+                    "first_name": (
+                        data["CON_firstName"]
+                        if isinstance(data["CON_firstName"], str) and data["CON_firstName"] is not None
+                        else None
+                    ),
+                    "last_name": (
+                        data["CON_lastName"]
+                        if isinstance(data["CON_lastName"], str) and data["CON_lastName"] is not None
+                        else None
+                    ),
+                    "position": data["CON_title"],
+                    "country": country,
+                }
+                country_directory, _ = CountryDirectory.objects.get_or_create(
+                    country=country,
+                    first_name__iexact=data["first_name"],
+                    last_name__iexact=data["last_name"],
+                    position__iexact=data["position"],
+                    defaults={
+                        "first_name": data["first_name"],
+                        "last_name": data["last_name"],
+                        "position": data["position"],
+                    },
+                )
+                created_country_directory_ids.append(country_directory.pk)
         # NOTE: Deleting the country directory which are not available in the source
         CountryDirectory.objects.exclude(id__in=created_country_directory_ids).delete()
         text_to_log = "%s Ns Directory added" % added