move orgsite app

server/conftest.py

@@ -16,11 +16,11 @@
 from faker.providers import BaseProvider
 from rest_framework.test import APIClient
 
-from apps.orgsite.models import Site, SiteAccess
 from core.models import (
     TrakUser,
 )
 from org.models import Org, OrgAccess
+from orgsite.models import Site, SiteAccess
 from rcrasite.models import (
     Address,
     Contact,

server/core/exceptions.py

@@ -6,7 +6,7 @@
 from rest_framework.serializers import as_serializer_error
 from rest_framework.views import exception_handler
 
-from apps.orgsite.services import SiteServiceError
+from orgsite.services import SiteServiceError
 
 
 class InternalServer500(APIException):

server/haztrak/settings/base.py

@@ -56,7 +56,7 @@
     "manifest",
     "wasteline",
     "org",
-    "apps.orgsite",
+    "orgsite",
     "profile",
 ]
 

server/haztrak/urls.py

@@ -33,7 +33,7 @@
                 path("", include("rcrasite.urls", namespace="rcrasite")),
                 path("", include("core.urls", namespace="core")),
                 path("", include("org.urls", namespace="org")),
-                path("", include("apps.orgsite.urls", namespace="site")),
+                path("", include("orgsite.urls", namespace="site")),
                 path("", include("profile.urls", namespace="profile")),
                 path("schema/", SpectacularAPIView.as_view(), name="schema"),
                 path(

server/manifest/services/manifest.py

@@ -4,10 +4,10 @@
 from django.db import transaction
 from django.db.models import Q, QuerySet
 
-from apps.orgsite.models import Site
 from manifest.models import Manifest
 from manifest.services import EManifest, EManifestError, TaskResponse
 from manifest.tasks import save_to_emanifest as save_to_emanifest_task
+from orgsite.models import Site
 
 logger = logging.getLogger(__name__)
 

server/manifest/tasks.py

@@ -60,8 +60,8 @@ def sign_manifest(
 def sync_site_manifests(self, *, site_id: str, username: str):
     """asynchronous task to sync an EPA site's manifests"""
 
-    from apps.orgsite.services import get_user_site, update_emanifest_sync_date
     from manifest.services.emanifest import sync_manifests
+    from orgsite.services import get_user_site, update_emanifest_sync_date
 
     try:
         client = get_rcra_client(username=username)

server/manifest/views.py

@@ -7,7 +7,6 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from apps.orgsite.services import sync_site_manifest_with_rcrainfo
 from handler.serializers import QuickerSignSerializer
 from manifest.models import Manifest
 from manifest.serializers import ManifestSerializer, MtnSerializer
@@ -19,6 +18,7 @@
     save_emanifest,
     update_manifest,
 )
+from orgsite.services import sync_site_manifest_with_rcrainfo
 
 logger = logging.getLogger(__name__)
 

server/org/admin.py

@@ -3,8 +3,8 @@
 from django.contrib.contenttypes.models import ContentType
 from guardian.admin import GuardedModelAdmin
 
-from apps.orgsite.models import Site
 from org.models import Org, OrgAccess, OrgGroupObjectPermission, OrgUserObjectPermission
+from orgsite.models import Site
 
 admin.site.register(OrgAccess)
 

server/apps/orgsite/admin.py → server/orgsite/admin.py

@@ -3,7 +3,7 @@
 from django.contrib.contenttypes.models import ContentType
 from guardian.admin import GuardedModelAdmin
 
-from apps.orgsite.models import Site, SiteGroupObjectPermission, SiteUserObjectPermission
+from orgsite.models import Site, SiteGroupObjectPermission, SiteUserObjectPermission
 
 
 @admin.register(Site)

server/apps/orgsite/apps.py → server/orgsite/apps.py

@@ -3,4 +3,4 @@
 
 class FooConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "apps.orgsite"
+    name = "orgsite"

server/apps/orgsite/serializers.py → server/orgsite/serializers.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
 
-from apps.orgsite.models import Site, SiteAccess
+from orgsite.models import Site, SiteAccess
 from rcrasite.serializers import RcraSiteSerializer
 from rcrasite.serializers.base_serializer import SitesBaseSerializer
 

server/apps/orgsite/services.py → server/orgsite/services.py

@@ -5,9 +5,9 @@
 from django.db import transaction
 from django.db.models import QuerySet
 
-from apps.orgsite.models import Site
 from manifest.services import TaskResponse
 from manifest.tasks import sync_site_manifests
+from orgsite.models import Site
 
 logger = logging.getLogger(__name__)
 

server/apps/orgsite/tests/conftest.py → server/orgsite/tests/conftest.py

@@ -2,8 +2,8 @@
 
 import pytest
 
-from apps.orgsite.models import Site
 from org.models import Org
+from orgsite.models import Site
 from rcrasite.models import RcraSite
 
 

server/apps/orgsite/tests/test_models.py → server/orgsite/tests/test_models.py

@@ -1,7 +1,7 @@
 import pytest
 from django.db.models import QuerySet
 
-from apps.orgsite.models import Site
+from orgsite.models import Site
 
 
 @pytest.mark.django_db

server/apps/orgsite/tests/test_services.py → server/orgsite/tests/test_services.py

@@ -3,8 +3,8 @@
 
 import pytest
 
-from apps.orgsite.models import Site
-from apps.orgsite.services import filter_sites_by_org, get_user_site, update_emanifest_sync_date
+from orgsite.models import Site
+from orgsite.services import filter_sites_by_org, get_user_site, update_emanifest_sync_date
 
 
 class TestFilterOrgSites:
@@ -17,29 +17,29 @@ def test_get_org_sites(self, org_factory, site_factory):
 
 class TestGetUserSite:
     def test_returns_site_by_epa_id(self, site_class_factory):
-        with patch("apps.orgsite.services.Site.objects.get_by_username_and_epa_id") as mock_query:
+        with patch("orgsite.services.Site.objects.get_by_username_and_epa_id") as mock_query:
             mock_site = site_class_factory()
             mock_query.return_value = mock_site
             result = get_user_site(username="test", epa_id="test")
             assert result == mock_site
 
     def test_raises_error_when_site_not_found(self, site_class_factory):
-        with patch("apps.orgsite.services.Site.objects.get_by_username_and_epa_id") as mock_query:
+        with patch("orgsite.services.Site.objects.get_by_username_and_epa_id") as mock_query:
             mock_query.side_effect = Site.DoesNotExist
             with pytest.raises(Site.DoesNotExist):
                 get_user_site(username="test", epa_id="test")
 
 
 class TestFilterSitesByUser:
     def test_returns_array_of_sites(self, site_factory, user_factory):
-        with patch("apps.orgsite.services.Site.objects.filter_by_user") as mock_query:
+        with patch("orgsite.services.Site.objects.filter_by_user") as mock_query:
             site = site_factory()
             mock_query.return_value = [site]
             result = Site.objects.filter_by_user("username")
             assert site in result
 
     def test_returns_empty_list_when_no_sites_found(self, site_factory, user_factory):
-        with patch("apps.orgsite.services.Site.objects.filter_by_user") as mock_query:
+        with patch("orgsite.services.Site.objects.filter_by_user") as mock_query:
             mock_query.return_value = []
             result = Site.objects.filter_by_user("username")
             assert isinstance(result, list)
@@ -52,7 +52,7 @@ def test_updates_the_last_sync_field(self, site_factory):
         assert site.last_rcrainfo_manifest_sync is not None
 
     def test_uses_datetime_now_by_default(self, site_factory):
-        with patch("apps.orgsite.services.datetime") as mock_datetime:
+        with patch("orgsite.services.datetime") as mock_datetime:
             mock_datetime.now.return_value = datetime.datetime(2021, 1, 1)
             site = site_factory(last_rcrainfo_manifest_sync=None)
             update_emanifest_sync_date(site=site)

server/apps/orgsite/tests/test_views.py → server/orgsite/tests/test_views.py

@@ -3,7 +3,7 @@
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient, APIRequestFactory, force_authenticate
 
-from apps.orgsite.views import SiteDetailsView
+from orgsite.views import SiteDetailsView
 
 
 class TestSiteListView:

server/apps/orgsite/views.py → server/orgsite/views.py

@@ -7,9 +7,9 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from apps.orgsite.models import Site
-from apps.orgsite.serializers import SiteSerializer
-from apps.orgsite.services import filter_sites_by_org, filter_sites_by_username, get_user_site
+from orgsite.models import Site
+from orgsite.serializers import SiteSerializer
+from orgsite.services import filter_sites_by_org, filter_sites_by_username, get_user_site
 
 logger = logging.getLogger(__name__)
 

server/profile/serializers/profile.py

@@ -3,8 +3,8 @@
 from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
 
-from apps.orgsite.serializers import SiteAccessSerializer
 from org.serializers import OrgSerializer
+from orgsite.serializers import SiteAccessSerializer
 
 
 class ProfileSerializer(ModelSerializer):

server/profile/services.py

@@ -7,9 +7,9 @@
 from django.conf import settings
 from django.db import transaction
 
-from apps.orgsite.services import SiteServiceError
 from core.models import TrakUser
 from core.services import RcraClient, get_rcra_client
+from orgsite.services import SiteServiceError
 from rcrasite.models import RcraSite
 from rcrasite.services import RcraSiteService