From fb09b326d7d7a86bf4726c6449624e1431a63eba Mon Sep 17 00:00:00 2001
From: Fatimah <fatimah.zulfiqar@cern.ch>
Date: Mon, 22 Apr 2024 14:06:58 +0200
Subject: [PATCH] tests: updated dcat and datacite tests

---
 .../serializers/dcat/datacite-to-dcat-ap.xsl     |  5 ++++-
 .../serializers/test_datacite_serializer.py      | 16 ++++++++++++++--
 .../serializers/test_dcat_serializer.py          |  9 +++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/invenio_rdm_records/resources/serializers/dcat/datacite-to-dcat-ap.xsl b/invenio_rdm_records/resources/serializers/dcat/datacite-to-dcat-ap.xsl
index 94b24da045..acfbdb405a 100644
--- a/invenio_rdm_records/resources/serializers/dcat/datacite-to-dcat-ap.xsl
+++ b/invenio_rdm_records/resources/serializers/dcat/datacite-to-dcat-ap.xsl
@@ -1655,7 +1655,10 @@
         <xsl:otherwise>
 <!--
           <rdf:type rdf:resource="{$foaf}Agent"/>
--->
+-->       
+          <xsl:if test="$uri != ''">
+            <dct:identifier rdf:datatype="{$xsd}string"><xsl:value-of select="$nameIdentifier"/></dct:identifier>
+          </xsl:if>
           <xsl:if test="$agentName != ''">
             <foaf:name><xsl:value-of select="$agentName"/></foaf:name>
           </xsl:if>
diff --git a/tests/resources/serializers/test_datacite_serializer.py b/tests/resources/serializers/test_datacite_serializer.py
index 12a7432c95..01f2d73c2c 100644
--- a/tests/resources/serializers/test_datacite_serializer.py
+++ b/tests/resources/serializers/test_datacite_serializer.py
@@ -121,6 +121,7 @@ def test_datacite43_serializer(running_app, full_record_to_dict):
                     {
                         "nameIdentifier": "0000-0001-8135-3489",
                         "nameIdentifierScheme": "ORCID",
+                        "schemeUri": "http://orcid.org/",
                     }
                 ],
                 "nameType": "Personal",
@@ -144,6 +145,7 @@ def test_datacite43_serializer(running_app, full_record_to_dict):
                     {
                         "nameIdentifier": "0000-0001-8135-3489",
                         "nameIdentifierScheme": "ORCID",
+                        "schemeUri": "http://orcid.org/",
                     }
                 ],
                 "nameType": "Personal",
@@ -167,6 +169,10 @@ def test_datacite43_serializer(running_app, full_record_to_dict):
                 "descriptionType": "Abstract",
             },
             {"description": "Bla bla bla", "descriptionType": "Methods", "lang": "eng"},
+            {
+                "description": '{"references": ["Nielsen et al,.."]}',
+                "descriptionType": "Other",
+            },
         ],
         "formats": ["application/pdf"],
         "fundingReferences": [
@@ -224,6 +230,10 @@ def test_datacite43_serializer(running_app, full_record_to_dict):
                 "rightsUri": "https://creativecommons.org/licenses/by/4.0/legalcode",
             },
             {"rights": "No rightsUri license"},
+            {
+                "rights": "Embargoed Access",
+                "rightsUri": "info:eu-repo/semantics/embargoedAccess",
+            },
         ],
         "schemaVersion": "http://datacite.org/schema/kernel-4",
         "sizes": ["11 pages"],
@@ -275,7 +285,7 @@ def test_datacite43_xml_serializer(running_app, full_record_to_dict):
         "      <givenName>Lars Holm</givenName>\n"
         "      <familyName>Nielsen</familyName>\n"
         "      <nameIdentifier "
-        'nameIdentifierScheme="ORCID">0000-0001-8135-3489</nameIdentifier>\n'
+        'nameIdentifierScheme="ORCID" schemeURI="http://orcid.org/">0000-0001-8135-3489</nameIdentifier>\n'
         "      <affiliation>CERN</affiliation>\n"
         "      <affiliation>free-text</affiliation>\n"
         "    </creator>\n"
@@ -303,7 +313,7 @@ def test_datacite43_xml_serializer(running_app, full_record_to_dict):
         "      <givenName>Lars Holm</givenName>\n"
         "      <familyName>Nielsen</familyName>\n"
         "      <nameIdentifier "
-        'nameIdentifierScheme="ORCID">0000-0001-8135-3489</nameIdentifier>\n'
+        'nameIdentifierScheme="ORCID" schemeURI="http://orcid.org/">0000-0001-8135-3489</nameIdentifier>\n'
         "      <affiliation>CERN</affiliation>\n"
         "      <affiliation>TU Wien</affiliation>\n"
         "    </contributor>\n"
@@ -340,12 +350,14 @@ def test_datacite43_xml_serializer(running_app, full_record_to_dict):
         'rightsURI="https://creativecommons.org/licenses/by/4.0/legalcode" '
         'rightsIdentifierScheme="spdx" rightsIdentifier="cc-by-4.0">Creative Commons '
         "Attribution 4.0 International</rights>\n"
+        '    <rights rightsURI="info:eu-repo/semantics/embargoedAccess">Embargoed Access</rights>\n'
         "  </rightsList>\n"
         "  <descriptions>\n"
         '    <description descriptionType="Abstract">A description \n'
         "with HTML tags</description>\n"
         '    <description descriptionType="Methods" xml:lang="eng">Bla bla '
         "bla</description>\n"
+        '    <description descriptionType="Other">{"references": ["Nielsen et al,.."]}</description>\n'
         "  </descriptions>\n"
         "  <geoLocations>\n"
         "    <geoLocation>\n"
diff --git a/tests/resources/serializers/test_dcat_serializer.py b/tests/resources/serializers/test_dcat_serializer.py
index cc6137b069..bc9c23db2e 100644
--- a/tests/resources/serializers/test_dcat_serializer.py
+++ b/tests/resources/serializers/test_dcat_serializer.py
@@ -40,6 +40,7 @@ def test_dcat_serializer(running_app, full_record_to_dict):
         "    <dct:creator>\n"
         '      <rdf:Description rdf:about="https://orcid.org/0000-0001-8135-3489">\n'
         '        <rdf:type rdf:resource="http://xmlns.com/foaf/0.1/Person"/>\n'
+        '        <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">0000-0001-8135-3489</dct:identifier>\n'
         "        <foaf:name>Nielsen, Lars Holm</foaf:name>\n"
         "        <foaf:givenName>Lars Holm</foaf:givenName>\n"
         "        <foaf:familyName>Nielsen</foaf:familyName>\n"
@@ -107,6 +108,7 @@ def test_dcat_serializer(running_app, full_record_to_dict):
         "    <dct:contributor>\n"
         '      <rdf:Description rdf:about="https://orcid.org/0000-0001-8135-3489">\n'
         '        <rdf:type rdf:resource="http://xmlns.com/foaf/0.1/Person"/>\n'
+        '        <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">0000-0001-8135-3489</dct:identifier>\n'
         "        <foaf:name>Nielsen, Lars Holm</foaf:name>\n"
         "        <foaf:givenName>Lars Holm</foaf:givenName>\n"
         "        <foaf:familyName>Nielsen</foaf:familyName>\n"
@@ -181,6 +183,7 @@ def test_dcat_serializer(running_app, full_record_to_dict):
         "        <rdfs:label>Bla bla bla</rdfs:label>\n"
         "      </dct:ProvenanceStatement>\n"
         "    </dct:provenance>\n"
+        '    <dct:description>{"references": ["Nielsen et al,.."]}</dct:description>\n'
         "    <dct:spatial>\n"
         "      <dct:Location>\n"
         "        <rdf:type "
@@ -199,6 +202,12 @@ def test_dcat_serializer(running_app, full_record_to_dict):
         'rdf:datatype="http://www.opengis.net/ont/geosparql#geoJSONLiteral"><![CDATA[{"type":"Point","coordinates":[-32.94682,-60.63932]}]]></dcat:centroid>\n'
         "      </dct:Location>\n"
         "    </dct:spatial>\n"
+        '    <dct:accessRights rdf:resource="http://publications.europa.eu/resource/authority/access-right/NON_PUBLIC"/>\n'
+        "    <dct:accessRights>\n"
+        '      <dct:RightsStatement rdf:about="info:eu-repo/semantics/embargoedAccess">\n'
+        "        <rdfs:label>Embargoed Access</rdfs:label>\n"
+        "      </dct:RightsStatement>\n"
+        "    </dct:accessRights>\n"
         "    <dcat:distribution>\n"
         "      <dcat:Distribution>\n"
         "        <dct:extent>\n"