refactor(settings): Update access imports to new path

ref: #640 #641

app/settings/forms/admin_settings_global.py

@@ -3,7 +3,8 @@ from django.db.models import Q
 
 from django.contrib.auth.models import User
 
-from access.models import Organization, TeamUsers
+from access.models.organization import Organization
+from access.models.team_user import TeamUsers
 
 from core.forms.common import CommonModelForm
 

app/settings/forms/app_settings.py

@@ -3,7 +3,8 @@ from django.db.models import Q
 
 from django.contrib.auth.models import User
 
-from access.models import Organization, TeamUsers
+from access.models.organization import Organization
+from access.models.team_user import TeamUsers
 
 from core.forms.common import CommonModelForm
 

app/settings/forms/external_links.py

@@ -3,7 +3,8 @@ from django import forms
 # from django.contrib.auth.models import User
 from django.urls import reverse
 
-from access.models import Organization, TeamUsers
+from access.models.organization import Organization
+from access.models.team_user import TeamUsers
 
 from app import settings
 

app/settings/forms/user_settings.py

@@ -3,7 +3,8 @@ from django.db.models import Q
 
 from django.contrib.auth.models import User
 
-from access.models import Organization, TeamUsers
+from access.models.organization import Organization
+from access.models.team_user import TeamUsers
 
 from core.forms.common import CommonModelForm
 

app/settings/models/app_settings.py

@@ -3,7 +3,7 @@ from django.db import models
 from rest_framework.reverse import reverse
 
 from access.fields import *
-from access.models import Organization
+from access.models.organization import Organization
 
 from core.mixin.history_save import SaveHistory
 

app/settings/models/external_link.py

@@ -1,7 +1,7 @@
 from django.template import Template
 
 from access.fields import *
-from access.models import TenancyObject
+from access.models.tenancy import TenancyObject
 
 
 

app/settings/models/user_settings.py

@@ -9,7 +9,7 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 
 from access.fields import *
-from access.models import Organization
+from access.models.organization import Organization
 
 sorted_timezones = sorted(zoneinfo.available_timezones())
 

app/settings/tests/functional/app_settings/test_app_settings_viewset.py

@@ -6,7 +6,9 @@ from django.shortcuts import reverse
 from django.test import Client, TestCase
 from django import urls
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import (
     APIPermissionChange,

app/settings/tests/functional/external_links/test_external_link_viewset.py

@@ -8,7 +8,9 @@ from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases

app/settings/tests/functional/external_links/test_external_links_serializer.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 
 from rest_framework.exceptions import ValidationError
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from app.tests.abstract.mock_view import MockView, User
 

app/settings/tests/functional/test_settings_viewset.py

@@ -4,7 +4,7 @@ from django.test import Client, TestCase
 
 from rest_framework.permissions import IsAuthenticated
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetCommon
 

app/settings/tests/functional/user_settings/test_user_settings_viewset.py

@@ -6,7 +6,9 @@ from django.shortcuts import reverse
 from django.test import Client, TestCase
 from django import urls
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_permissions_viewset import (
     APIPermissionChange,

app/settings/tests/unit/app_settings/test_app_settings_api_v2.py

@@ -8,7 +8,9 @@ from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APICommonFields
 

app/settings/tests/unit/app_settings/test_app_settings_permission.py

@@ -9,7 +9,9 @@ import pytest
 import unittest
 import requests
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissionsView
 

app/settings/tests/unit/app_settings/test_unit_app_settings_viewset.py

@@ -5,7 +5,7 @@ from django.test import Client, TestCase
 
 from rest_framework.reverse import reverse
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetModel
 

app/settings/tests/unit/external_links/test_external_links.py

@@ -4,7 +4,7 @@ import requests
 
 from django.test import TestCase, Client
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from app.tests.abstract.models import TenancyModel
 

app/settings/tests/unit/external_links/test_external_links_api_v2.py

@@ -8,7 +8,9 @@ from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 

app/settings/tests/unit/external_links/test_external_links_permission.py

@@ -7,7 +7,9 @@ from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissions
 

app/settings/tests/unit/external_links/test_unit_external_links_viewset.py

@@ -5,7 +5,7 @@ from django.test import Client, TestCase
 
 from rest_framework.reverse import reverse
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetModel
 

app/settings/tests/unit/external_links_notes/test_unit_external_links_notes_viewset.py

@@ -5,7 +5,7 @@ from django.test import Client, TestCase
 
 from rest_framework.reverse import reverse
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetModel
 

app/settings/tests/unit/user_settings/test_unit_user_settings_viewset.py

@@ -5,7 +5,7 @@ from django.test import Client, TestCase
 
 from rest_framework.reverse import reverse
 
-from access.models import Organization
+from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetModel
 

app/settings/tests/unit/user_settings/test_user_settings.py

@@ -9,7 +9,9 @@ from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from settings.models.user_settings import UserSettings
 

app/settings/tests/unit/user_settings/test_user_settings_api_v2.py

@@ -8,7 +8,9 @@ from django.test import Client, TestCase
 
 from rest_framework.relations import Hyperlink
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APICommonFields
 

app/settings/tests/unit/user_settings/test_user_settings_permissions.py

@@ -9,7 +9,9 @@ from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
 
-from access.models import Organization, Team, TeamUsers
+from access.models.organization import Organization
+from access.models.team import Team
+from access.models.team_user import TeamUsers
 
 from app.tests.abstract.model_permissions import ModelPermissionsView