diff --git a/specifyweb/attachment_gw/__init__.py b/specifyweb/backend/attachment_gw/__init__.py similarity index 100% rename from specifyweb/attachment_gw/__init__.py rename to specifyweb/backend/attachment_gw/__init__.py diff --git a/specifyweb/attachment_gw/dataset_views.py b/specifyweb/backend/attachment_gw/dataset_views.py similarity index 100% rename from specifyweb/attachment_gw/dataset_views.py rename to specifyweb/backend/attachment_gw/dataset_views.py diff --git a/specifyweb/attachment_gw/migrations/0001_initial.py b/specifyweb/backend/attachment_gw/migrations/0001_initial.py similarity index 100% rename from specifyweb/attachment_gw/migrations/0001_initial.py rename to specifyweb/backend/attachment_gw/migrations/0001_initial.py diff --git a/specifyweb/attachment_gw/migrations/__init__.py b/specifyweb/backend/attachment_gw/migrations/__init__.py similarity index 100% rename from specifyweb/attachment_gw/migrations/__init__.py rename to specifyweb/backend/attachment_gw/migrations/__init__.py diff --git a/specifyweb/attachment_gw/models.py b/specifyweb/backend/attachment_gw/models.py similarity index 94% rename from specifyweb/attachment_gw/models.py rename to specifyweb/backend/attachment_gw/models.py index 6d5573b4f4d..49f5ac69b5a 100644 --- a/specifyweb/attachment_gw/models.py +++ b/specifyweb/backend/attachment_gw/models.py @@ -1,7 +1,7 @@ from django.db import models from functools import partialmethod from specifyweb.specify.models import datamodel, custom_save -from ..workbench.models import Dataset +from specifyweb.workbench.models import Dataset class Spattachmentdataset(Dataset): specify_model = datamodel.get_table('spattachmentdataset') diff --git a/specifyweb/attachment_gw/tests.py b/specifyweb/backend/attachment_gw/tests.py similarity index 100% rename from specifyweb/attachment_gw/tests.py rename to specifyweb/backend/attachment_gw/tests.py diff --git a/specifyweb/attachment_gw/urls.py b/specifyweb/backend/attachment_gw/urls.py similarity index 100% rename from specifyweb/attachment_gw/urls.py rename to specifyweb/backend/attachment_gw/urls.py diff --git a/specifyweb/attachment_gw/views.py b/specifyweb/backend/attachment_gw/views.py similarity index 100% rename from specifyweb/attachment_gw/views.py rename to specifyweb/backend/attachment_gw/views.py diff --git a/specifyweb/businessrules/rules/attachment_rules.py b/specifyweb/businessrules/rules/attachment_rules.py index f4f13b78946..5e2b54dd77d 100644 --- a/specifyweb/businessrules/rules/attachment_rules.py +++ b/specifyweb/businessrules/rules/attachment_rules.py @@ -48,7 +48,7 @@ def attachment_save(attachment): @orm_signal_handler('post_delete', 'Attachment') def attachment_deletion(attachment): - from specifyweb.attachment_gw.views import delete_attachment_file + from specifyweb.backend.attachment_gw.views import delete_attachment_file if attachment.attachmentlocation is not None: delete_attachment_file(attachment.attachmentlocation) diff --git a/specifyweb/context/urls.py b/specifyweb/context/urls.py index 4bc9b15240e..18e479b7a19 100644 --- a/specifyweb/context/urls.py +++ b/specifyweb/context/urls.py @@ -6,7 +6,7 @@ from django.urls import path from . import views, user_resources, collection_resources -from ..attachment_gw.views import get_settings as attachment_settings +from ..backend.attachment_gw.views import get_settings as attachment_settings from ..report_runner.views import get_status as report_runner_status urlpatterns = [ diff --git a/specifyweb/settings/__init__.py b/specifyweb/settings/__init__.py index 1ab7bdcd255..e6b57993c1a 100644 --- a/specifyweb/settings/__init__.py +++ b/specifyweb/settings/__init__.py @@ -215,7 +215,7 @@ def get_sa_db_url(db_name): 'specifyweb.businessrules', 'specifyweb.express_search', 'specifyweb.context', - 'specifyweb.attachment_gw', + 'specifyweb.backend.attachment_gw', 'specifyweb.frontend', 'specifyweb.barvis', 'specifyweb.patches', diff --git a/specifyweb/specify/models_by_table_id.py b/specifyweb/specify/models_by_table_id.py index ddb660e5496..ddb70ecd9b1 100644 --- a/specifyweb/specify/models_by_table_id.py +++ b/specifyweb/specify/models_by_table_id.py @@ -470,7 +470,7 @@ def import_model(model_name): if model_name in model_names: def get_model(): from importlib import import_module - if app_name in ['accounts', 'permissions']: + if app_name in ['accounts', 'permissions', 'attachment_gw']: module = import_module(f"specifyweb.backend.{app_name}.models") else: module = import_module(f"specifyweb.{app_name}.models") diff --git a/specifyweb/specify/tests/test_record_merging.py b/specifyweb/specify/tests/test_record_merging.py index 37d59f9e5d0..8d605f62392 100644 --- a/specifyweb/specify/tests/test_record_merging.py +++ b/specifyweb/specify/tests/test_record_merging.py @@ -560,7 +560,7 @@ def test_ordering_fix_on_agent_specialty(self): self.assertEqual(models.Agentspecialty.objects.filter(specialtyname__in=['test_name_1', 'test_name_3']).count(), 2) - @patch('specifyweb.attachment_gw.views.delete_attachment_file') + @patch('specifyweb.backend.attachment_gw.views.delete_attachment_file') def test_attachment_preserved(self, delete_attachment_mock): c = Client() c.force_login(self.specifyuser) diff --git a/specifyweb/specify/tests/test_utils/test_get_app_model.py b/specifyweb/specify/tests/test_utils/test_get_app_model.py index de5f2dcfdca..eb8669ccea2 100644 --- a/specifyweb/specify/tests/test_utils/test_get_app_model.py +++ b/specifyweb/specify/tests/test_utils/test_get_app_model.py @@ -4,7 +4,7 @@ # These are done as part of tests. from specifyweb.backend.accounts import models as acccounts_models -from specifyweb.attachment_gw import models as attachment_gw_models +from specifyweb.backend.attachment_gw import models as attachment_gw_models from specifyweb.businessrules import models as businessrules_models from specifyweb.context import models as context_models from specifyweb.notifications import models as notifications_models diff --git a/specifyweb/specify/utils.py b/specifyweb/specify/utils.py index 1b7a60ea720..523320b9e51 100644 --- a/specifyweb/specify/utils.py +++ b/specifyweb/specify/utils.py @@ -2,7 +2,7 @@ import logging from specifyweb.backend.accounts import models as acccounts_models -from specifyweb.attachment_gw import models as attachment_gw_models +from specifyweb.backend.attachment_gw import models as attachment_gw_models from specifyweb.businessrules import models as businessrules_models from specifyweb.context import models as context_models from specifyweb.notifications import models as notifications_models diff --git a/specifyweb/urls.py b/specifyweb/urls.py index 2be583d9a3f..e315fb6c392 100644 --- a/specifyweb/urls.py +++ b/specifyweb/urls.py @@ -2,7 +2,7 @@ from django.views.generic.base import RedirectView from specifyweb.backend.accounts import urls as accounts_urls -from .attachment_gw import urls as attachment_urls +from specifyweb.backend.attachment_gw import urls as attachment_urls from .barvis import urls as tt_urls from .businessrules import urls as bus_urls from .context import urls as context_urls