fix more tests by mocking doi handling

Author: asmacdo

dandiapi/api/services/publish/__init__.py

@@ -233,11 +233,11 @@ def _publish_dandiset(dandiset_id: int, user_id: int) -> None:
         new_version.metadata['doi'] = '10.80507/dandi.123456/0.123456.1234'
 
         validate(new_version.metadata, schema_key='PublishedDandiset', json_validation=True)
-        _handle_publication_dois(new_version.id)
 
         # Write updated manifest files and create DOI after
         # published version has been committed to DB.
         transaction.on_commit(lambda: write_manifest_files.delay(new_version.id))
+        transaction.on_commit(lambda: _handle_publication_dois.delay(new_version.id))
 
 
         user = User.objects.get(id=user_id)

dandiapi/api/tests/test_asset_paths.py

@@ -298,7 +298,7 @@ def test_asset_path_search_asset_paths(draft_version_factory, asset_factory):
 
 
 @pytest.mark.django_db
-def test_asset_path_publish_version(draft_version_factory, asset_factory, user):
+def test_asset_path_publish_version(draft_version_factory, asset_factory, user, mocker):
     version: Version = draft_version_factory()
     asset = asset_factory(path='foo/bar.txt', status=Asset.Status.VALID)
     version.assets.add(asset)

dandiapi/api/tests/test_audit.py

@@ -118,11 +118,12 @@ def user_info(u):
 
 
 @pytest.mark.django_db
-def test_audit_update_metadata(api_client, draft_version, user):
+def test_audit_update_metadata(api_client, draft_version, user, mocker):
     # Create a Dandiset.
     dandiset = draft_version.dandiset
     add_dandiset_owner(dandiset, user)
 
+    mock_update_doi = mocker.patch('dandiapi.api.views.version.update_draft_version_doi')
     # Edit its metadata.
     metadata = draft_version.metadata
     metadata['foo'] = 'bar'
@@ -144,6 +145,7 @@ def test_audit_update_metadata(api_client, draft_version, user):
     metadata = rec.details['metadata']
     assert metadata['name'] == 'baz'
     assert metadata['foo'] == 'bar'
+    mock_update_doi.assert_called_once()
 
 
 @pytest.mark.django_db
@@ -275,7 +277,7 @@ def test_audit_remove_asset(
 
 @pytest.mark.django_db(transaction=True)
 def test_audit_publish_dandiset(
-    api_client, user, dandiset_factory, draft_version_factory, draft_asset_factory
+    api_client, user, dandiset_factory, draft_version_factory, draft_asset_factory, mocker
 ):
     # Create a Dandiset whose draft version has one asset.
     dandiset = dandiset_factory()
@@ -289,6 +291,7 @@ def test_audit_publish_dandiset(
     # through the API).
     validate_asset_metadata(asset=draft_asset)
     validate_version_metadata(version=draft_version)
+    mock_handle_dois = mocker.patch('dandiapi.api.services.publish._handle_publication_dois')
 
     # Publish the Dandiset.
     api_client.force_authenticate(user=user)
@@ -301,6 +304,7 @@ def test_audit_publish_dandiset(
     rec = get_latest_audit_record(dandiset=dandiset, record_type='publish_dandiset')
     verify_model_properties(rec, user)
     assert rec.details['version'] == dandiset.most_recent_published_version.version
+    mock_handle_dois.delay.assert_called_once()
 
 
 @pytest.mark.django_db

dandiapi/api/tests/test_tasks.py

@@ -386,7 +386,9 @@ def test_publish_task(
     published_asset_factory,
     draft_version_factory,
     django_capture_on_commit_callbacks,
+    mocker,
 ):
+    mock_handle_dois = mocker.patch('dandiapi.api.services.publish._handle_publication_dois')
     # Create a draft_version in PUBLISHING state
     draft_version: Version = draft_version_factory(status=Version.Status.PUBLISHING)
 
@@ -444,7 +446,7 @@ def test_publish_task(
             f'/{published_version.version}'
         ),
         'citation': published_version.citation(published_version.metadata),
-        'doi': f'10.80507/dandi.{draft_version.dandiset.identifier}/{published_version.version}',
+        # We have mocked the doi generation, so we will not have a DOI on the model.
         # Once the assets are linked, assetsSummary should be computed properly
         'assetsSummary': {
             'schemaKey': 'AssetsSummary',
@@ -501,3 +503,4 @@ def test_publish_task(
     assert new_published_asset.path == old_published_asset.path
     assert new_published_asset.blob == old_published_asset.blob
     assert new_published_asset.metadata == old_published_asset.metadata
+    mock_handle_dois.delay.assert_called_once()

dandiapi/api/tests/test_unembargo.py

@@ -313,6 +313,7 @@ def test_unembargo_dandiset_validate_version_metadata(
     draft_version.save()
     draft_version.assets.add(asset_factory())
 
+    mock_create_doi = mocker.patch('dandiapi.api.services.embargo._create_dandiset_draft_doi')
     # Spy on the imported function in the embargo service
     validate_version_spy = mocker.spy(embargo_service, 'validate_version_metadata')
 
@@ -321,6 +322,7 @@ def test_unembargo_dandiset_validate_version_metadata(
     assert validate_version_spy.call_count == 1
     draft_version.refresh_from_db()
     assert not draft_version.validation_errors
+    mock_create_doi.assert_called_once()
 
 
 @pytest.mark.django_db