fixup tests for moved _create_dandiset_draft_doi

Author: asmacdo

dandiapi/api/tests/test_dandiset.py

@@ -8,7 +8,7 @@
 
 from dandiapi.api.asset_paths import add_asset_paths, add_version_asset_paths
 from dandiapi.api.models import Dandiset, Version
-from dandiapi.api.services.dandiset import _create_dandiset_draft_doi, update_draft_version_doi
+from dandiapi.api.services.dandiset import update_draft_version_doi
 from dandiapi.api.services.permissions.dandiset import (
     add_dandiset_owner,
     get_dandiset_owners,
@@ -353,21 +353,18 @@ def test_dandiset_rest_embargo_access(
 
 
 @pytest.mark.django_db
-def test_dandiset_rest_create(api_client, user, mocker):
+def test_dandiset_rest_create(api_client, user):
     user.first_name = 'John'
     user.last_name = 'Doe'
     user.save()
     api_client.force_authenticate(user=user)
     name = 'Test Dandiset'
     metadata = {'foo': 'bar'}
 
-    mock_create_doi = mocker.patch('dandiapi.api.services.dandiset._create_dandiset_draft_doi')
-
     response = api_client.post(
         '/api/dandisets/', {'name': name, 'metadata': metadata}, format='json'
     )
 
-    mock_create_doi.assert_called_once()
     assert response.data == {
         'identifier': DANDISET_ID_RE,
         'created': TIMESTAMP_RE,
@@ -640,12 +637,10 @@ def test_dandiset_rest_create_embargoed(api_client, user, mocker):
     api_client.force_authenticate(user=user)
     name = 'Test Dandiset'
     metadata = {'foo': 'bar'}
-    mock_create_doi = mocker.patch('dandiapi.api.services.dandiset._create_dandiset_draft_doi')
 
     response = api_client.post(
         '/api/dandisets/?embargo=true', {'name': name, 'metadata': metadata}, format='json'
     )
-    mock_create_doi.assert_not_called()
     assert response.data == {
         'identifier': DANDISET_ID_RE,
         'created': TIMESTAMP_RE,
@@ -1363,31 +1358,6 @@ def test_dandiset_list_starred_unauthenticated(api_client):
     assert response.status_code == 401
 
 
-@pytest.mark.django_db
-def test__create_dandiset_draft_doi(draft_version, mocker):
-    """Test the _create_dandiset_draft_doi function directly."""
-    # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
-    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
-
-    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
-    mock_create_doi.return_value = '10.48324/dandi.000123'
-
-    # Call the function directly
-    _create_dandiset_draft_doi(draft_version)
-
-    # Verify the mocks were called correctly
-    mock_generate_doi.assert_called_once_with(
-        draft_version,
-        version_doi=False,
-        event=None  # Draft DOI
-    )
-    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
-
-    # Verify the DOI was stored in the draft version
-    assert draft_version.doi == '10.48324/dandi.000123'
-
-
 @pytest.mark.django_db
 def test_update_draft_version_doi_no_previous_doi(draft_version, mocker):
     """Test updating a draft DOI when none exists yet."""

dandiapi/api/tests/test_doi.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+import pytest
+
+from dandiapi.api.doi import _create_dandiset_draft_doi
+
+
+@pytest.mark.django_db
+def test__create_dandiset_draft_doi(draft_version, mocker):
+    """Test the _create_dandiset_draft_doi function directly."""
+    # Set up mocks
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
+
+    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
+    mock_create_doi.return_value = '10.48324/dandi.000123'
+
+    # Call the function directly
+    _create_dandiset_draft_doi(draft_version)
+
+    # Verify the mocks were called correctly
+    mock_generate_doi.assert_called_once_with(
+        draft_version,
+        version_doi=False,
+        event=None  # Draft DOI
+    )
+    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
+
+    # Verify the DOI was stored in the draft version
+    assert draft_version.doi == '10.48324/dandi.000123'

dandiapi/api/tests/test_unembargo.py

@@ -313,7 +313,6 @@ 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')
 
@@ -322,7 +321,6 @@ 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