Rearrange embargo exceptions

dandi · Jun 17, 2024 · 6ae94fc · 6ae94fc
1 parent b789645
commit 6ae94fc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/dandiapi/api/services/dandiset/__init__.py b/dandiapi/api/services/dandiset/__init__.py
@@ -4,10 +4,8 @@
 
 from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.models.version import Version
-from dandiapi.api.services.dandiset.exceptions import (
-    DandisetAlreadyExistsError,
-    DandisetUnEmbargoInProgressError,
-)
+from dandiapi.api.services.dandiset.exceptions import DandisetAlreadyExistsError
+from dandiapi.api.services.embargo.exceptions import DandisetUnEmbargoInProgressError
 from dandiapi.api.services.exceptions import AdminOnlyOperationError, NotAllowedError
 from dandiapi.api.services.version.metadata import _normalize_version_metadata
 

diff --git a/dandiapi/api/services/dandiset/exceptions.py b/dandiapi/api/services/dandiset/exceptions.py
@@ -7,15 +7,3 @@
 
 class DandisetAlreadyExistsError(DandiError):
     http_status_code = status.HTTP_400_BAD_REQUEST
-
-
-class UnauthorizedEmbargoAccessError(DandiError):
-    http_status_code = status.HTTP_401_UNAUTHORIZED
-    message = (
-        'Authentication credentials must be provided when attempting to access embargoed dandisets'
-    )
-
-
-class DandisetUnEmbargoInProgressError(DandiError):
-    http_status_code = status.HTTP_400_BAD_REQUEST
-    message = 'Dandiset modification not allowed during un-embargo'
diff --git a/dandiapi/api/services/embargo/exceptions.py b/dandiapi/api/services/embargo/exceptions.py
@@ -18,3 +18,15 @@ class DandisetNotEmbargoedError(DandiError):
 class DandisetActiveUploadsError(DandiError):
     http_status_code = status.HTTP_400_BAD_REQUEST
     message = 'Dandiset un-embargo not allowed with active uploads'
+
+
+class DandisetUnEmbargoInProgressError(DandiError):
+    http_status_code = status.HTTP_400_BAD_REQUEST
+    message = 'Dandiset modification not allowed during un-embargo'
+
+
+class UnauthorizedEmbargoAccessError(DandiError):
+    http_status_code = status.HTTP_401_UNAUTHORIZED
+    message = (
+        'Authentication credentials must be provided when attempting to access embargoed dandisets'
+    )
diff --git a/dandiapi/api/views/asset.py b/dandiapi/api/views/asset.py
@@ -9,7 +9,7 @@
     remove_asset_from_version,
 )
 from dandiapi.api.services.asset.exceptions import DraftDandisetNotModifiableError
-from dandiapi.api.services.dandiset.exceptions import DandisetUnEmbargoInProgressError
+from dandiapi.api.services.embargo.exceptions import DandisetUnEmbargoInProgressError
 from dandiapi.zarr.models import ZarrArchive
 
 try:

diff --git a/dandiapi/api/views/dandiset.py b/dandiapi/api/views/dandiset.py
@@ -25,11 +25,11 @@
 from dandiapi.api.mail import send_ownership_change_emails
 from dandiapi.api.models import Dandiset, Version
 from dandiapi.api.services.dandiset import create_dandiset, delete_dandiset
-from dandiapi.api.services.dandiset.exceptions import (
+from dandiapi.api.services.embargo import unembargo_dandiset
+from dandiapi.api.services.embargo.exceptions import (
     DandisetUnEmbargoInProgressError,
     UnauthorizedEmbargoAccessError,
 )
-from dandiapi.api.services.embargo import unembargo_dandiset
 from dandiapi.api.views.common import DANDISET_PK_PARAM
 from dandiapi.api.views.pagination import DandiPagination
 from dandiapi.api.views.serializers import (

diff --git a/dandiapi/api/views/upload.py b/dandiapi/api/views/upload.py
@@ -17,7 +17,7 @@
 
 from dandiapi.api.models import AssetBlob, Dandiset, Upload
 from dandiapi.api.permissions import IsApproved
-from dandiapi.api.services.dandiset.exceptions import DandisetUnEmbargoInProgressError
+from dandiapi.api.services.embargo.exceptions import DandisetUnEmbargoInProgressError
 from dandiapi.api.tasks import calculate_sha256
 from dandiapi.api.views.serializers import AssetBlobSerializer
 

diff --git a/dandiapi/api/views/version.py b/dandiapi/api/views/version.py
@@ -14,7 +14,7 @@
 from rest_framework_extensions.mixins import DetailSerializerMixin, NestedViewSetMixin
 
 from dandiapi.api.models import Dandiset, Version
-from dandiapi.api.services.dandiset.exceptions import DandisetUnEmbargoInProgressError
+from dandiapi.api.services.embargo.exceptions import DandisetUnEmbargoInProgressError
 from dandiapi.api.services.publish import publish_dandiset
 from dandiapi.api.tasks import delete_doi_task
 from dandiapi.api.views.common import DANDISET_PK_PARAM, VERSION_PARAM