refactor(access): Update all references to User to use get_user_model()

ref: #754 #704 #755

app/access/admin.py

@@ -1,5 +1,6 @@
+import django
 from django.contrib import admin
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import Group
 from django.contrib.auth.admin import UserAdmin
 
 
@@ -7,6 +8,8 @@ from access.models.organization import Organization
 from access.models.team import Team
 from access.models.team_user import TeamUsers
 
+User = django.contrib.auth.get_user_model()
+
 admin.site.unregister(Group)
 
 class TeamInline(admin.TabularInline):

app/access/middleware/request.py

@@ -1,9 +1,11 @@
+import django
+
 from django.contrib.auth.middleware import (
     AuthenticationMiddleware,
     SimpleLazyObject,
     partial,
 )
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 from django.utils.deprecation import MiddlewareMixin
 
 
@@ -13,6 +15,8 @@ from access.models.team import Team
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 class RequestTenancy(MiddlewareMixin):
     """Access Middleware

app/access/mixins/organization.py

@@ -1,9 +1,13 @@
-from django.contrib.auth.models import User, Group
+import django
+
+from django.contrib.auth.models import Group
 from django.db import models
 
 from access.models.organization import Organization
 from access.models.team import Team
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class OrganizationMixin:

app/access/models/organization.py

@@ -1,5 +1,7 @@
+import django
+
+from django.conf import settings
 from django.db import models
-from django.contrib.auth.models import User
 
 from rest_framework.reverse import reverse
 
@@ -11,6 +13,8 @@ from access.fields import (
 
 from core.mixin.history_save import SaveHistory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class Organization(SaveHistory):
@@ -44,7 +48,7 @@ class Organization(SaveHistory):
     )
 
     manager = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank = False,
         help_text = 'Manager for this organization',
         null = True,

app/access/models/team_user.py

@@ -1,6 +1,8 @@
+import django
+
 from django.conf import settings
 from django.db import models
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 
 from rest_framework.reverse import reverse
 
@@ -15,6 +17,8 @@ from access.models.team import Team
 from core.lib.feature_not_used import FeatureNotUsed
 from core.mixin.history_save import SaveHistory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamUsers(SaveHistory):

app/access/models/tenancy.py

@@ -1,11 +1,10 @@
+import django
 import logging
+
 from django.db import models
-# from django.contrib.auth.models import User, Group
 
 from rest_framework.reverse import reverse
 
-# from .fields import *
-
 from access.models.organization import Organization
 
 from core import exceptions as centurion_exceptions

app/access/tests/functional/entity/test_functional_entity_viewset.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import Permission, User
+import django
+
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -11,6 +13,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/access/tests/functional/organization/test_organization_serializer.py

@@ -1,6 +1,6 @@
+import django
 import pytest
 
-from django.contrib.auth.models import User
 from django.test import TestCase
 
 from rest_framework.exceptions import ValidationError
@@ -10,6 +10,8 @@ from access.serializers.organization import (
     OrganizationModelSerializer
 )
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class OrganizationValidationAPI(

app/access/tests/functional/organization/test_organization_viewset.py

@@ -1,10 +1,11 @@
+import django
 import pytest
 import unittest
 import requests
 
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -17,6 +18,8 @@ from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional, MetaDataNavigationEntriesFunctional
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/access/tests/functional/role/test_functional_role_viewset.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import Permission, User
+import django
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client, TestCase
 
@@ -15,6 +16,8 @@ from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/access/tests/functional/team/test_team_permission_viewset.py

@@ -1,10 +1,11 @@
+import django
 import pytest
 import unittest
 import requests
 
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client, TestCase
 
@@ -19,6 +20,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/access/tests/functional/team/test_team_serializer.py

@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -17,6 +18,8 @@ from access.serializers.teams import (
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class MockView:

app/access/tests/functional/team_user/test_team_user_permission_viewset.py

@@ -1,10 +1,11 @@
+import django
 import pytest
 import unittest
 import requests
 
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import Client, TestCase
 
@@ -18,6 +19,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 from api.tests.abstract.api_permissions_viewset import APIPermissions
 from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/access/tests/functional/team_user/test_team_user_serializer.py

@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,8 @@ from access.serializers.team_user import (
     TeamUserModelSerializer
 )
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class MockView:

app/access/tests/unit/entity/test_unit_entity_api_v2.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import Permission, User
+import django
+
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -12,6 +14,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class APITestCases(

app/access/tests/unit/mixin/test_permission.py

@@ -1,7 +1,9 @@
+import django
+
 import pytest
 from unittest.mock import Mock, patch
 
-from django.contrib.auth.models import User, Permission, AnonymousUser
+from django.contrib.auth.models import Permission, AnonymousUser
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -23,6 +25,8 @@ from core.models.manufacturer import Manufacturer
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class MyMockView(

app/access/tests/unit/organization/test_organizaiton_api.py

@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -13,6 +14,8 @@ from access.models.organization import Organization
 from access.models.team import Team
 from access.models.team_user import TeamUsers
 
+User = django.contrib.auth.get_user_model()
+
 
 
 

app/access/tests/unit/organization/test_organizaiton_api_v2.py

@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -16,6 +17,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APICommonFields
 
+User = django.contrib.auth.get_user_model()
+
 
 class OrganizationAPI(
     TestCase,

app/access/tests/unit/organization/test_organizaiton_permission.py

@@ -1,6 +1,7 @@
-# from django.conf import settings
+import django
+
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -16,6 +17,8 @@ from access.tests.abstract.model_permissions_organization_manager import Organiz
 
 from app.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange
 
+User = django.contrib.auth.get_user_model()
+
 
 class OrganizationPermissions(
     TestCase,

app/access/tests/unit/organization/test_organizaiton_permission_api.py

@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -13,6 +14,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_permissions import APIPermissionChange, APIPermissionView
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class OrganizationPermissionsAPI(TestCase, APIPermissionChange, APIPermissionView):

app/access/tests/unit/role/test_unit_role_api_v2.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import Permission, User
+import django
+
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -12,6 +14,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class APITestCases(

app/access/tests/unit/team/test_team_api.py

@@ -1,10 +1,11 @@
+import django
 import pytest
 import unittest
 import requests
 
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -17,6 +18,8 @@ from access.models.team_user import TeamUsers
 
 # from api.tests.abstract.api_permissions import APIPermissions
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamAPI(TestCase):

app/access/tests/unit/team/test_team_api_v2.py

@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -13,6 +14,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamAPI(

app/access/tests/unit/team/test_team_permission.py

@@ -1,6 +1,6 @@
-# from django.conf import settings
+import django
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -16,6 +16,8 @@ from access.tests.abstract.model_permissions_organization_manager import Organiz
 
 from app.tests.abstract.model_permissions import ModelPermissions
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamPermissions(

app/access/tests/unit/team/test_team_permission_api.py

@@ -1,10 +1,11 @@
+import django
 import pytest
 import unittest
 import requests
 
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_permissions import APIPermissions
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamPermissionsAPI(TestCase, APIPermissions):

app/access/tests/unit/team_user/test_team_user_api_v2.py

@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -13,6 +14,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APICommonFields
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamUserAPI(

app/access/tests/unit/team_user/test_team_user_permission.py

@@ -1,6 +1,6 @@
-# from django.conf import settings
+import django
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -17,6 +17,8 @@ from access.tests.abstract.model_permissions_organization_manager import Organiz
 
 from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamUserPermissions(

app/access/tests/unit/team_user/test_unit_team_user_model.py

@@ -1,5 +1,5 @@
+import django
 from django.test import TestCase
-from django.contrib.auth.models import User
 
 from access.models.organization import Organization
 from access.models.team import Team
@@ -7,6 +7,8 @@ from access.models.team_user import TeamUsers
 
 from app.tests.unit.test_unit_models import NonTenancyObjectInheritedCases
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TeamUsersModel(