From 75969a406a0ef9c3e99208582d61a0eb1752ca9c Mon Sep 17 00:00:00 2001
From: Dan LaManna <dan.lamanna@kitware.com>
Date: Mon, 29 Aug 2022 17:07:16 -0400
Subject: [PATCH] Migrate zarr checksum code

---
 dandiapi/zarr/apps.py                                 | 1 +
 dandiapi/{api/zarr_checksums.py => zarr/checksums.py} | 0
 dandiapi/zarr/models.py                               | 2 +-
 dandiapi/zarr/tasks/__init__.py                       | 2 +-
 dandiapi/zarr/tests/test_ingest_zarr_archive.py       | 2 +-
 dandiapi/zarr/tests/test_zarr.py                      | 2 +-
 dandiapi/zarr/tests/test_zarr_checksums.py            | 2 +-
 dandiapi/zarr/views/__init__.py                       | 2 +-
 8 files changed, 7 insertions(+), 6 deletions(-)
 rename dandiapi/{api/zarr_checksums.py => zarr/checksums.py} (100%)

diff --git a/dandiapi/zarr/apps.py b/dandiapi/zarr/apps.py
index 949e62d90..c849386eb 100644
--- a/dandiapi/zarr/apps.py
+++ b/dandiapi/zarr/apps.py
@@ -4,3 +4,4 @@
 class ZarrConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'dandiapi.zarr'
+    verbose_name = 'DANDI: Zarr'
diff --git a/dandiapi/api/zarr_checksums.py b/dandiapi/zarr/checksums.py
similarity index 100%
rename from dandiapi/api/zarr_checksums.py
rename to dandiapi/zarr/checksums.py
diff --git a/dandiapi/zarr/models.py b/dandiapi/zarr/models.py
index b4a42190d..f79535f5f 100644
--- a/dandiapi/zarr/models.py
+++ b/dandiapi/zarr/models.py
@@ -15,7 +15,7 @@
 
 from dandiapi.api.models import Dandiset
 from dandiapi.api.storage import get_embargo_storage, get_storage
-from dandiapi.api.zarr_checksums import ZarrChecksum, ZarrChecksumFileUpdater
+from dandiapi.zarr.checksums import ZarrChecksum, ZarrChecksumFileUpdater
 
 logger = logging.Logger(name=__name__)
 
diff --git a/dandiapi/zarr/tasks/__init__.py b/dandiapi/zarr/tasks/__init__.py
index 185c05e2c..332fa56e2 100644
--- a/dandiapi/zarr/tasks/__init__.py
+++ b/dandiapi/zarr/tasks/__init__.py
@@ -11,7 +11,7 @@
 from django.db.transaction import atomic
 
 from dandiapi.api.storage import get_boto_client, yield_files
-from dandiapi.api.zarr_checksums import (
+from dandiapi.zarr.checksums import (
     ZarrChecksum,
     ZarrChecksumFileUpdater,
     ZarrChecksumListing,
diff --git a/dandiapi/zarr/tests/test_ingest_zarr_archive.py b/dandiapi/zarr/tests/test_ingest_zarr_archive.py
index 69ea469ee..bf9fe5e13 100644
--- a/dandiapi/zarr/tests/test_ingest_zarr_archive.py
+++ b/dandiapi/zarr/tests/test_ingest_zarr_archive.py
@@ -4,7 +4,7 @@
 import pytest
 
 from dandiapi.api.models import Dandiset
-from dandiapi.api.zarr_checksums import (
+from dandiapi.zarr.checksums import (
     ZarrChecksum,
     ZarrChecksumFileUpdater,
     ZarrChecksumListing,
diff --git a/dandiapi/zarr/tests/test_zarr.py b/dandiapi/zarr/tests/test_zarr.py
index 9212425fb..99ebb4c03 100644
--- a/dandiapi/zarr/tests/test_zarr.py
+++ b/dandiapi/zarr/tests/test_zarr.py
@@ -6,7 +6,7 @@
 
 from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.tests.fuzzy import UUID_RE
-from dandiapi.api.zarr_checksums import ZarrChecksumFileUpdater, ZarrChecksumUpdater
+from dandiapi.zarr.checksums import ZarrChecksumFileUpdater, ZarrChecksumUpdater
 from dandiapi.zarr.models import ZarrArchive, ZarrArchiveStatus, ZarrUploadFile
 from dandiapi.zarr.tasks import ingest_zarr_archive
 
diff --git a/dandiapi/zarr/tests/test_zarr_checksums.py b/dandiapi/zarr/tests/test_zarr_checksums.py
index 1a3e2923f..7fe789610 100644
--- a/dandiapi/zarr/tests/test_zarr_checksums.py
+++ b/dandiapi/zarr/tests/test_zarr_checksums.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from dandiapi.api.zarr_checksums import (
+from dandiapi.zarr.checksums import (
     ZarrChecksum,
     ZarrChecksumFileUpdater,
     ZarrChecksumListing,
diff --git a/dandiapi/zarr/views/__init__.py b/dandiapi/zarr/views/__init__.py
index 973f7da08..5a4f2f527 100644
--- a/dandiapi/zarr/views/__init__.py
+++ b/dandiapi/zarr/views/__init__.py
@@ -21,7 +21,7 @@
 
 from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.views.common import DandiPagination
-from dandiapi.api.zarr_checksums import ZarrChecksumFileUpdater
+from dandiapi.zarr.checksums import ZarrChecksumFileUpdater
 from dandiapi.zarr.models import ZarrArchive, ZarrArchiveStatus, ZarrUploadFile
 from dandiapi.zarr.tasks import cancel_zarr_upload, ingest_zarr_archive