legacy: fix alternate identifiers

zenodo · Sep 17, 2023 · 4e99f80 · 4e99f80
1 parent d4411dc
commit 4e99f80
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 43 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/site/tests/legacy/deposits/conftest.py b/site/tests/legacy/deposits/conftest.py
@@ -17,8 +17,7 @@ def test_data():
     return dict(
         metadata=dict(
             access_right="embargoed",
-            # TODO uncomment when communities are implemented
-            # communities=[{"identifier": "c1"}],
+            communities=[{"identifier": "c1"}],
             conference_acronym="Some acronym",
             conference_dates="Some dates",
             conference_place="Some place",
@@ -41,7 +40,7 @@ def test_data():
             grants=[
                 dict(id="10.13039/501100001665::755021"),
             ],
-            # TODO changed previous string ("Some isbn") to a valid isbn
+            # NOTE: changed previous string ("Some isbn") to a valid isbn
             imprint_isbn="978-3-16-148410-0",
             imprint_place="Some place",
             # TODO changed previous string ("Some publisher") to "Zenodo" which is the hardcoded publisher for now.
@@ -74,13 +73,11 @@ def test_data():
                     scheme="doi",
                     resource_type="dataset",
                 ),
-                # TODO commented since scheme ads not supported in rdm
-                # dict(
-                #     identifier="2011ApJS..192...18K",
-                #     relation="isAlternateIdentifier",
-                #     scheme="ads",
-                #     resource_type="publication-article",
-                # ),
+                dict(
+                    identifier="2011ApJS..192...18K",
+                    relation="isAlternateIdentifier",
+                    scheme="ads",
+                ),
             ],
             thesis_supervisors=[
                 dict(name="Doe, John", affiliation="Atlantis"),
@@ -122,8 +119,7 @@ def expected_record_metadata():
     """Return expected rdm draft metadata."""
     return dict(
         access_right="embargoed",
-        # TODO uncomment when communities are implemented
-        # communities=[{"identifier": "c1"}],
+        communities=[{"identifier": "c1"}],
         conference_acronym="Some acronym",
         conference_dates="Some dates",
         conference_place="Some place",
@@ -177,6 +173,11 @@ def expected_record_metadata():
                 scheme="doi",
                 resource_type="dataset",
             ),
+            dict(
+                identifier="2011ApJS..192...18K",
+                relation="isAlternateIdentifier",
+                scheme="ads",
+            ),
         ],
         thesis_university="Some thesis_university",
         contributors=[

diff --git a/site/tests/legacy/deposits/test_rest_api_metadata.py b/site/tests/legacy/deposits/test_rest_api_metadata.py
@@ -47,7 +47,7 @@ def test_input_output(
     client = client_with_login
 
     # Create
-    res = client.post(deposit_url, data=json.dumps(test_data), headers=headers)
+    res = client.post(deposit_url, json=test_data, headers=headers)
     assert res.status_code == 201
     links = res.json["links"]
 
@@ -66,13 +66,13 @@ def test_input_output(
         }
     )
 
-    ignored_keys = set()
-
-    # doi is returned as a top level key (and not inside metadata)
-    ignored_keys.add("doi")
-
     differences = list(
-        dictdiffer.diff(data["metadata"], expected_record_metadata, ignore=ignored_keys)
+        dictdiffer.diff(
+            data["metadata"],
+            expected_record_metadata,
+            # doi is returned as a top level key (and not inside metadata)
+            ignore={"doi"},
+        )
     )
 
     assert not differences
diff --git a/site/zenodo_rdm/legacy/deserializers/metadata.py b/site/zenodo_rdm/legacy/deserializers/metadata.py
@@ -121,10 +121,6 @@ class Meta:
 
         unknown = EXCLUDE
 
-    # TODO add later
-    # if not data:
-    #     raise ValidationError("Empty metadata is not accepted")
-
     @pre_load
     def split_identifiers(self, data, **kwargs):
         """Splits alternate and related identifiers."""
@@ -133,7 +129,7 @@ def split_identifiers(self, data, **kwargs):
         alternate_identifiers = []
         related_identifiers = []
         for identifier in input_identifiers:
-            if identifier.get("relation", "") == "isAlternateIdentifier":
+            if identifier.get("relation") == "isAlternateIdentifier":
                 alternate_identifiers.append(identifier)
             else:
                 related_identifiers.append(identifier)
@@ -162,7 +158,10 @@ def split_identifiers(self, data, **kwargs):
     references = fields.Method(deserialize="load_references")
     language = fields.Method(deserialize="load_language")
     related_identifiers = fields.Method(deserialize="load_related_identifiers")
-    identifiers = fields.Method(deserialize="load_alternate_identifiers")
+    identifiers = fields.Method(
+        deserialize="load_alternate_identifiers",
+        data_key="alternate_identifiers",
+    )
 
     @post_load(pass_original=True)
     def load_upload_type(self, result, original, **kwargs):
@@ -434,9 +433,7 @@ def load_alternate_identifiers(self, obj):
 
         for legacy_identifier in obj:
             rdm_identifier = identifier_schema.load(
-                {
-                    "identifier": legacy_identifier["identifier"],
-                }
+                {"identifier": legacy_identifier["identifier"]}
             )
 
             alternate_identifiers.append(rdm_identifier)

diff --git a/site/zenodo_rdm/legacy/serializers/schemas/common.py b/site/zenodo_rdm/legacy/serializers/schemas/common.py
@@ -55,6 +55,7 @@ def to_camel_case(string, split_char=" "):
     "requires": "requires",
     "isobsoletedby": "isObsoletedBy",
     "obsoletes": "obsoletes",
+    "isalternateidentifier": "isAlternateIdentifier",
 }
 
 

diff --git a/site/zenodo_rdm/legacy/serializers/schemas/legacyjson.py b/site/zenodo_rdm/legacy/serializers/schemas/legacyjson.py
@@ -86,8 +86,9 @@ def hook_alternate_identifiers(self, data, **kwargs):
         related_identifiers = data.get("related_identifiers", [])
         for identifier in alternate_identifiers:
             related_identifier = {
-                "relation_type": {"id": "isAlternateIdentifier"},
+                "relation_type": {"id": "isalternateidentifier"},
                 "identifier": identifier["identifier"],
+                "scheme": identifier["scheme"],
             }
             related_identifiers.append(related_identifier)
         if related_identifiers: