Include @id in JSON-LD output

ref SAEON/mims-catalog#1
SAEON · Nov 7, 2023 · 6f396e4 · 6f396e4
1 parent 3b06ac6
commit 6f396e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/odp/catalog/mims.py b/odp/catalog/mims.py
@@ -85,6 +85,7 @@ def create_published_record(self, record_model: RecordModel) -> PublishedRecordM
                 metadata={
                     '@context': 'https://schema.org/',
                     '@type': 'Dataset',
+                    '@id': url,
                     'name': title,
                     'description': abstract,
                     'identifier': identifier,

diff --git a/test/api/test_catalog.py b/test/api/test_catalog.py
@@ -218,6 +218,7 @@ def test_redirect_to(
     'SchemaOrg.Dataset': {
         '@context': 'https://schema.org/',
         '@type': 'Dataset',
+        # '@id': dynamic,
         'name': metadata_examples['SAEON.ISO19115']['title'],
         'description': metadata_examples['SAEON.ISO19115']['abstract'],
         'license': metadata_examples['SAEON.ISO19115']['constraints'][0]['rightsURI'],
@@ -255,8 +256,10 @@ def assert_metadata_record(schema_id):
                 expected_metadata['keywords'] = [
                     s['subject'] for s in metadata_examples['SAEON.DataCite4']['subjects']
                 ]
-            expected_metadata['url'] = ('http://odp.catalog/mims/'
-                                        f'{example_record.doi if example_record.doi else example_record.id}')
+            expected_metadata['@id'] = expected_metadata['url'] = (
+                'http://odp.catalog/mims/'
+                f'{example_record.doi if example_record.doi else example_record.id}'
+            )
         else:
             if example_record.doi:
                 expected_metadata |= {'doi': example_record.doi}