test: update tests for the PublishActivity metadata changes

Author: candleindark

dandiapi/api/tests/test_asset.py

@@ -3,13 +3,15 @@
 import json
 from uuid import uuid4
 
+from dandischema.conf import get_instance_config
 from dandischema.models import AccessType
 from django.conf import settings
 from django.db.utils import IntegrityError
 from django.urls import reverse
 import pytest
 import requests
 
+from dandiapi import __version__
 from dandiapi.api.asset_paths import add_asset_paths, extract_paths
 from dandiapi.api.models import Asset, Version
 from dandiapi.api.models.asset_paths import AssetPath
@@ -24,6 +26,8 @@
 
 from .fuzzy import HTTP_URL_RE, TIMESTAMP_RE, URN_RE, UTC_ISO_TIMESTAMP_RE, UUID_RE
 
+_SCHEMA_INSTANCE_CONFIG = get_instance_config()
+
 # Model tests
 
 
@@ -111,6 +115,9 @@ def test_publish_asset(draft_asset: Asset):
     published_asset = draft_asset
     published_asset.refresh_from_db()
 
+    instance_name = _SCHEMA_INSTANCE_CONFIG.instance_name
+    instance_identifier = _SCHEMA_INSTANCE_CONFIG.instance_identifier
+
     assert published_asset.blob == draft_blob
     assert published_asset.full_metadata == {
         **draft_metadata,
@@ -123,10 +130,10 @@ def test_publish_asset(draft_asset: Asset):
             'wasAssociatedWith': [
                 {
                     'id': URN_RE,
-                    'identifier': 'RRID:SCR_017571',
-                    'name': 'DANDI API',
+                    **({'identifier': instance_identifier} if instance_identifier else {}),
+                    'name': f'{instance_name} API Server',
                     # TODO: version the API
-                    'version': '0.1.0',
+                    'version': __version__,
                     'schemaKey': 'Software',
                 }
             ],

dandiapi/api/tests/test_tasks.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from dandischema.conf import get_instance_config
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.forms.models import model_to_dict
@@ -15,6 +16,7 @@
 from zarr_checksum.checksum import EMPTY_CHECKSUM
 from zarr_checksum.generators import ZarrArchiveFile
 
+from dandiapi import __version__
 from dandiapi.api import tasks
 from dandiapi.api.models import Asset, Version
 from dandiapi.api.services.permissions.dandiset import add_dandiset_owner
@@ -27,6 +29,9 @@
     from rest_framework.test import APIClient
 
 
+_SCHEMA_INSTANCE_CONFIG = get_instance_config()
+
+
 @pytest.mark.django_db
 def test_calculate_checksum_task(asset_blob_factory):
     asset_blob = asset_blob_factory(blob__data=b'known-content', size=13, sha256=None)
@@ -382,6 +387,9 @@ def test_publish_task(
 
     published_version = draft_version.dandiset.versions.latest('created')
 
+    instance_name = _SCHEMA_INSTANCE_CONFIG.instance_name
+    instance_identifier = _SCHEMA_INSTANCE_CONFIG.instance_identifier
+
     assert published_version.metadata == {
         **draft_version.metadata,
         'publishedBy': {
@@ -392,10 +400,10 @@ def test_publish_task(
             'wasAssociatedWith': [
                 {
                     'id': URN_RE,
-                    'identifier': 'RRID:SCR_017571',
-                    'name': 'DANDI API',
+                    **({'identifier': instance_identifier} if instance_identifier else {}),
+                    'name': f'{instance_name} API Server',
                     # TODO: version the API
-                    'version': '0.1.0',
+                    'version': __version__,
                     'schemaKey': 'Software',
                 }
             ],
@@ -452,9 +460,9 @@ def test_publish_task(
             'wasAssociatedWith': [
                 {
                     'id': URN_RE,
-                    'identifier': 'RRID:SCR_017571',
-                    'name': 'DANDI API',
-                    'version': '0.1.0',
+                    **({'identifier': instance_identifier} if instance_identifier else {}),
+                    'name': f'{instance_name} API Server',
+                    'version': __version__,
                     'schemaKey': 'Software',
                 }
             ],

dandiapi/api/tests/test_version.py

@@ -4,11 +4,13 @@
 from time import sleep
 from typing import TYPE_CHECKING
 
+from dandischema.conf import get_instance_config
 from dandischema.models import AccessType
 from django.conf import settings
 from freezegun import freeze_time
 import pytest
 
+from dandiapi import __version__
 from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.services.metadata import version_aggregate_assets_summary
 from dandiapi.api.services.metadata.exceptions import VersionMetadataConcurrentlyModifiedError
@@ -26,6 +28,8 @@
 
 from .fuzzy import HTTP_URL_RE, TIMESTAMP_RE, URN_RE, UTC_ISO_TIMESTAMP_RE, VERSION_ID_RE
 
+_SCHEMA_INSTANCE_CONFIG = get_instance_config()
+
 
 @pytest.mark.django_db
 def test_version_next_published_version_nosave(dandiset):
@@ -302,6 +306,9 @@ def test_version_publish_version(draft_version, asset):
     publish_version.doi = fake_doi
     publish_version.save()
 
+    instance_name = _SCHEMA_INSTANCE_CONFIG.instance_name
+    instance_identifier = _SCHEMA_INSTANCE_CONFIG.instance_identifier
+
     assert publish_version.dandiset == draft_version.dandiset
     assert publish_version.metadata == {
         **draft_version.metadata,
@@ -313,10 +320,10 @@ def test_version_publish_version(draft_version, asset):
             'wasAssociatedWith': [
                 {
                     'id': URN_RE,
-                    'identifier': 'RRID:SCR_017571',
-                    'name': 'DANDI API',
+                    **({'identifier': instance_identifier} if instance_identifier else {}),
+                    'name': f'{instance_name} API Server',
                     # TODO: version the API
-                    'version': '0.1.0',
+                    'version': __version__,
                     'schemaKey': 'Software',
                 }
             ],