Clean up tests and make parent optional

Author: tmorrell

caltechdata_api/customize_schema.py

@@ -373,7 +373,8 @@ def customize_schema_rdm(json_record):
     if "community" in json_record:
         com = json_record.pop("community")
         parent["communities"] = {"ids": [com], "default": com}
-    final["parent"] = parent
+    if parent != {}:
+        final["parent"] = parent
     # Not technically datacite, but transfer pids information
     if "pids" in json_record:
         final["pids"] = json_record.pop("pids")

tests/conftest.py

@@ -147,7 +147,10 @@ def full_rdm_record():
                             {"scheme": "orcid", "identifier": "0000-0001-8135-3489"}
                         ],
                     },
-                    "affiliations": [{"name": "free-text"}, {"id": "01ggx4157"}],
+                    "affiliations": [
+                        {"name": "free-text"},
+                        {"name": "CERN", "id": "01ggx4157"},
+                    ],
                 }
             ],
             "title": "InvenioRDM",
@@ -176,7 +179,7 @@ def full_rdm_record():
                         ],
                     },
                     "role": {"id": "other"},
-                    "affiliations": [{"id": "01ggx4157"}],
+                    "affiliations": [{"name": "CERN", "id": "01ggx4157"}],
                 }
             ],
             "dates": [
@@ -227,7 +230,9 @@ def full_rdm_record():
             "funding": [
                 {
                     "funder": {
-                        "name": "European Commission",
+                        "title": {
+                            "en": "OpenAIRE",
+                        },
                         "identifier": "00k4n6c32",
                         "scheme": "ror",
                     },

tests/test_rdm.py

@@ -9,6 +9,15 @@
 
 
 def test_datacite_rdm_conversion(full_datacite43_record, full_rdm_record):
+
+    # Remove DOI from full_datacite43_record
+    # since it's prcessed by caltechdata_write or caltechdata_edit
+    identifiers = []
+    for identifier in full_datacite43_record["identifiers"]:
+        if identifier[identifierType] != "DOI":
+            identifiers.append(identifier)
+    full_datacite43_record["identifiers"] = identifiers
+
     converted = customize_schema(full_datacite43_record, schema="43")
 
     assert converted == full_rdm_record