legacy: fix name parsing in API

zenodo · Sep 18, 2023 · accaf1a · accaf1a
1 parent 5a3a565
commit accaf1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/migrator/zenodo_rdm_migrator/transform/entries/records/metadata.py b/migrator/zenodo_rdm_migrator/transform/entries/records/metadata.py
@@ -11,7 +11,6 @@
 
 from idutils import detect_identifier_schemes
 from invenio_rdm_migrator.transform import Entry, drop_nones
-from nameparser import HumanName
 from zenodo_legacy.funders import FUNDER_DOI_TO_ROR
 from zenodo_legacy.licenses import LEGACY_LICENSES, legacy_to_rdm
 
@@ -32,11 +31,20 @@ def _person_or_org(cls, creatibutor):
             r["identifiers"] = [
                 {"scheme": "orcid", "identifier": creatibutor["orcid"]},
             ]
-        name = HumanName(creatibutor["name"])
-        r["given_name"] = name.first
-        r["family_name"] = name.surnames
-        # autocompleted by RDM Metadata schema
-        r["name"] = f"{name.surnames}, {name.first}"
+
+        name = creatibutor["name"]
+
+        # We only split if users have strictly followed the input format.
+        if name.count(",") == 1:
+            family, given = name.split(",")
+            r["given_name"] = given.strip()
+            r["family_name"] = family.strip()
+            # autocompleted by RDM Metadata schema
+            r["name"] = name
+        else:
+            r["family_name"] = name
+            # autocompleted by RDM Metadata schema
+            r["name"] = name
 
         return r
 

diff --git a/site/zenodo_rdm/legacy/deserializers/metadata.py b/site/zenodo_rdm/legacy/deserializers/metadata.py
@@ -50,9 +50,12 @@ def load_names(self, result, original, **kwargs):
         name = original.get("name")
 
         if name:
-            human_name = HumanName(name)
-            result["given_name"] = human_name.first
-            result["family_name"] = human_name.surnames
+            if name.count(",") == 1:
+                family, given = name.split(",")
+                result["given_name"] = given.strip()
+                result["family_name"] = family.strip()
+            else:
+                result["family_name"] = name
 
         return result