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

ref: #756 closes #755

app/settings/forms/admin_settings_global.py

@@ -1,8 +1,6 @@
 from django import forms
 from django.db.models import Q
 
-from django.contrib.auth.models import User
-
 from access.models.organization import Organization
 from access.models.team_user import TeamUsers
 

app/settings/forms/app_settings.py

@@ -1,8 +1,6 @@
 from django import forms
 from django.db.models import Q
 
-from django.contrib.auth.models import User
-
 from access.models.organization import Organization
 from access.models.team_user import TeamUsers
 

app/settings/forms/external_links.py

@@ -1,6 +1,5 @@
 
 from django import forms
-# from django.contrib.auth.models import User
 from django.urls import reverse
 
 from access.models.organization import Organization

app/settings/forms/user_settings.py

@@ -1,8 +1,6 @@
 from django import forms
 from django.db.models import Q
 
-from django.contrib.auth.models import User
-
 from access.models.organization import Organization
 from access.models.team_user import TeamUsers
 

app/settings/models/user_settings.py

@@ -1,8 +1,8 @@
+import django
 import zoneinfo
 
 from rest_framework.reverse import reverse
 
-from django.contrib.auth.models import User
 from django.conf import settings
 from django.db import models
 from django.db.models.signals import post_save
@@ -20,6 +20,8 @@ TIMEZONES = tuple(zip(
     sorted_timezones
 ))
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class UserSettingsCommonFields(models.Model):
@@ -64,7 +66,7 @@ class UserSettings(UserSettingsCommonFields):
 
 
     user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= False,
         help_text = 'User this Setting belongs to',
         on_delete=models.CASCADE,

app/settings/tests/functional/app_settings/test_app_settings_viewset.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
@@ -25,6 +26,8 @@ from api.tests.abstract.test_metadata_functional import (
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/settings/tests/functional/external_links/test_external_link_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 TestCase
 
@@ -18,6 +19,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 
 from settings.models.external_link import ExternalLink
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/settings/tests/functional/user_settings/test_user_settings_viewset.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
@@ -26,6 +27,8 @@ from api.tests.abstract.test_metadata_functional import (
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

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

@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-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
@@ -17,6 +18,8 @@ from api.tests.abstract.api_fields import APICommonFields
 from settings.models.app_settings import AppSettings
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class AppSettingsAPI(

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

@@ -1,23 +1,25 @@
-# from django.conf import settings
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
-from django.contrib.contenttypes.models import ContentType
-from django.shortcuts import reverse
-from django.test import TestCase, Client
-
+import django
 import pytest
 import unittest
 import requests
 
+from django.contrib.auth import get_user_model
+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
+
 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
 
-
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class AppSettingsPermissions(TestCase, ModelPermissionsView):
 

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

@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-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
@@ -17,6 +18,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 from settings.models.external_link import ExternalLink
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ExternalLinkAPI(

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

@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 import requests
 
-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
@@ -15,6 +16,8 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from settings.models.external_link import ExternalLink
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ExternalLinkPermissions(TestCase, ModelPermissions):

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

@@ -1,10 +1,10 @@
-
+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 TestCase, Client
@@ -15,6 +15,10 @@ from access.models.team_user import TeamUsers
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
+
+
 class UserSettings(TestCase):
 
 

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

@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-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
@@ -17,6 +18,8 @@ from api.tests.abstract.api_fields import APICommonFields
 from settings.models.app_settings import AppSettings
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class UserSettingsAPI(

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

@@ -1,10 +1,10 @@
-
+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 TestCase, Client
@@ -17,6 +17,10 @@ from app.tests.abstract.model_permissions import ModelPermissionsView
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
+
+
 class UserSettingsPermissions(TestCase, ModelPermissionsView):