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

ref: #754 #755

app/core/models/history.py

@@ -1,8 +1,13 @@
-from django.contrib.auth.models import User
+import django
+
+from django.conf import settings
 from django.db import models
 
 from access.fields import *
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class HistoryCommonFields(models.Model):
 
@@ -70,7 +75,7 @@ class History(HistoryCommonFields):
 
 
     user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= False,
         help_text = 'User whom performed the action this history relates to',
         null = True,

app/core/models/manufacturer.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import User
+import django
+
 from django.db import models
 
 from access.fields import *
@@ -8,6 +9,8 @@ from core.mixin.history_save import SaveHistory
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ManufacturerCommonFields(models.Model):

app/core/models/model_history.py

@@ -1,4 +1,7 @@
-from django.contrib.auth.models import ContentType, User
+import django
+
+from django.conf import settings
+from django.contrib.auth.models import ContentType
 from django.db import models
 
 from rest_framework.reverse import reverse
@@ -9,6 +12,8 @@ from access.models.tenancy import TenancyObject
 
 from core.lib.feature_not_used import FeatureNotUsed
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelHistory(
@@ -77,7 +82,7 @@ class ModelHistory(
     )
 
     user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= False,
         help_text = 'User whom performed the action this history relates to',
         null = True,

app/core/models/model_notes.py

@@ -1,4 +1,7 @@
-from django.contrib.auth.models import User, ContentType
+import django
+
+from django.conf import settings
+from django.contrib.auth.models import ContentType
 from django.db import models
 
 from rest_framework.reverse import reverse
@@ -16,6 +19,8 @@ from itam.models.operating_system import OperatingSystem
 
 from itim.models.services import Service
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelNotes(TenancyObject):
@@ -63,7 +68,7 @@ class ModelNotes(TenancyObject):
 
 
     created_by = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank = True,
         help_text = 'User whom added the Note',
         null = False,
@@ -73,7 +78,7 @@ class ModelNotes(TenancyObject):
     )
 
     modified_by = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         default = None,
         help_text = 'User whom modified the note',

app/core/models/notes.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import User
+import django
+
+from django.conf import settings
 from django.db import models
 
 from rest_framework.reverse import reverse
@@ -14,6 +16,8 @@ from itam.models.operating_system import OperatingSystem
 
 from itim.models.services import Service
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class NotesCommonFields(TenancyObject, models.Model):
@@ -65,7 +69,7 @@ class Notes(NotesCommonFields):
 
 
     usercreated = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         default = None,
         help_text = 'User whom added Note',
@@ -76,7 +80,7 @@ class Notes(NotesCommonFields):
     )
 
     usermodified = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         default = None,
         help_text = 'User whom modified the note',

app/core/models/ticket/ticket.py

@@ -1,6 +1,7 @@
 import difflib
+import django
 
-from django.contrib.auth.models import User
+from django.conf import settings
 from django.db import models
 from django.db.models import Q, signals, Sum
 from django.forms import ValidationError
@@ -21,6 +22,8 @@ from core.models.ticket.ticket_category import TicketCategory, KnowledgeBase
 
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCommonFields(models.Model):
@@ -470,7 +473,7 @@ class Ticket(
 
 
     opened_by = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= False,
         help_text = 'Who is the ticket for',
         null = False,
@@ -481,7 +484,7 @@ class Ticket(
 
 
     subscribed_users = models.ManyToManyField(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         help_text = 'Subscribe a User(s) to the ticket to receive updates',
         related_name = 'subscribed_users',
@@ -500,7 +503,7 @@ class Ticket(
     )
 
     assigned_users = models.ManyToManyField(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         help_text = 'Assign the ticket to a User(s)',
         related_name = 'assigned_users',

app/core/models/ticket/ticket_comment.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import User
+import django
+
+from django.conf import settings
 from django.db import models
 from django.forms import ValidationError
 
@@ -14,6 +16,8 @@ from core.lib.slash_commands import SlashCommands
 from .ticket import Ticket
 from .ticket_comment_category import TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketComment(
@@ -241,7 +245,7 @@ class TicketComment(
     ) 
 
     responsible_user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         default = None,
         help_text = 'User whom is responsible for the completion of comment',
@@ -263,7 +267,7 @@ class TicketComment(
     )
 
     user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= False,
         help_text = 'Who made the comment',
         null = True,

app/core/models/ticket_base.py

@@ -1,8 +1,9 @@
 import datetime
 import difflib
+import django
 
 from django.apps import apps
-from django.contrib.auth.models import User
+from django.conf import settings
 from django.db import models
 
 from rest_framework.reverse import reverse
@@ -21,6 +22,8 @@ from core.models.ticket.ticket_enum_values import TicketValues
 
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketBase(
@@ -444,7 +447,7 @@ class TicketBase(
 
 
     opened_by = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank = True,
         help_text = 'Who is the ticket for',
         null = True,

app/core/tests/abstract/history_permissions.py

@@ -1,7 +1,7 @@
+import django
 import pytest
 import unittest
 
-from django.contrib.auth.models import User
 from django.shortcuts import reverse
 from django.test import TestCase, Client
 
@@ -9,6 +9,8 @@ from core.models.history import History
 
 from itam.models.device import Device
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class HistoryPermissions:

app/core/tests/abstract/model_notes_api_fields.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
@@ -11,6 +13,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelNotesNotesAPIFields(

app/core/tests/abstract/test_functional_notes_viewset.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import AnonymousUser, Permission, User
+import django
+
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 
 from access.models.organization import Organization
@@ -12,6 +14,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 ModelNotesViewSetBase:

app/core/tests/abstract/test_item_ticket_api_v2.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import User, Permission
+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 TestCase
@@ -13,6 +15,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 
 from core.models.ticket.ticket_linked_items import Ticket, TicketLinkedItem
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ItemTicketAPI(

app/core/tests/abstract/test_ticket_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
@@ -16,6 +18,9 @@ from core.models.ticket.ticket_category import TicketCategory
 from project_management.models.projects import Project
 from project_management.models.project_milestone import ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketAPI(
     APITenancyObject

app/core/tests/abstract/test_ticket_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
 
@@ -20,6 +21,8 @@ from project_management.models.project_milestone import ProjectMilestone
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class MockView:

app/core/tests/abstract/test_ticket_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.shortcuts import reverse
 from django.test import Client
@@ -16,6 +18,8 @@ from project_management.models.projects import Project
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketViewSetBase:

app/core/tests/abstract/test_unit_model_history_api_v2.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import User
+import django
+
 from django.shortcuts import reverse
 from django.test import Client
 
@@ -10,6 +11,8 @@ from access.models.team_user import TeamUsers
 
 from api.tests.abstract.api_fields import APITenancyObject
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class BaseModelHistoryAPI(

app/core/tests/abstract/test_unit_model_notes_serializer.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import  User
+import django
+
 from django.contrib.contenttypes.models import ContentType
 
 from rest_framework.exceptions import ValidationError
@@ -7,6 +8,8 @@ from access.models.organization import Organization
 
 from app.tests.abstract.mock_view import MockView
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelNotesSerializerTestCases:

app/core/tests/functional/manufacturer/test_manufacturer_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
 
@@ -20,6 +21,8 @@ from core.models.manufacturer import Manufacturer
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 

app/core/tests/functional/related_ticket/test_related_ticket_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
@@ -15,6 +15,8 @@ from core.serializers.ticket_related import (
     RelatedTicketModelSerializer,
 )
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class RelatedTicketsValidationAPI(

app/core/tests/functional/related_ticket/test_related_ticket_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
@@ -23,6 +24,8 @@ from api.tests.abstract.test_metadata_functional import (
 
 from core.models.ticket.ticket import Ticket, RelatedTickets
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/core/tests/functional/slash_commands/test_slash_command_related.py

@@ -1,8 +1,8 @@
+import django
 import pytest
 import re
 import unittest
 
-from django.contrib.auth.models import User
 from django.test import TestCase
 
 from access.models.organization import Organization
@@ -18,6 +18,9 @@ from core.models.ticket_comment_base import TicketBase, TicketCommentBase
 from itam.models.device import Device
 from itam.models.software import Software
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class SlashCommandsCommon:
     """Slash Command Test cases

app/core/tests/functional/test_history/test_functional_history_viewset.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import ContentType, Permission, User
+import django
+
+from django.contrib.auth.models import ContentType, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -20,6 +22,8 @@ from itam.models.device_history import DeviceHistory
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/core/tests/functional/test_task_result/test_task_result_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
@@ -21,6 +22,9 @@ from api.tests.abstract.api_permissions_viewset import (
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TaskResultPermissionsAPI(
     TestCase,

app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.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
 
@@ -10,6 +12,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 
 from core.models.ticket_base import TicketBase
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class MetadataTestCases(

app/core/tests/functional/ticket_base/test_functional_ticket_base_serializer.py

@@ -1,7 +1,6 @@
+import django
 import pytest
 
-from django.contrib.auth.models import User
-
 from rest_framework.exceptions import (
     ValidationError
 )
@@ -16,6 +15,8 @@ from project_management.models.project_milestone import (
     ProjectMilestone,
 )
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketBaseSerializerTestCases:

app/core/tests/functional/ticket_base/test_functional_ticket_base_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
 
@@ -10,6 +12,8 @@ from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 
 from core.models.ticket_base import TicketBase
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/core/tests/functional/ticket_category/test_ticket_category_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
 
@@ -20,6 +21,8 @@ from core.models.ticket.ticket_category import TicketCategory
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 

app/core/tests/functional/ticket_comment/test_ticket_comment_serializer.py

@@ -1,7 +1,7 @@
+import django
 import pytest
 
 from django.test import TestCase
-from django.contrib.auth.models import User
 
 from rest_framework.exceptions import ValidationError
 
@@ -23,6 +23,9 @@ from core.serializers.ticket_comment_depreciated import (
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class MockView:
 

app/core/tests/functional/ticket_comment/test_ticket_comment_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.shortcuts import reverse
 from django.test import Client, TestCase
@@ -14,6 +16,8 @@ from core.models.ticket.ticket_comment import Ticket, TicketComment
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_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
 
@@ -20,6 +21,8 @@ from core.models.ticket.ticket_comment_category import TicketCommentCategory
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 

app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_serializer.py

@@ -1,7 +1,7 @@
+import django
 import pytest
 
 from django.test import TestCase
-from django.contrib.auth.models import User
 
 from rest_framework.exceptions import ValidationError
 
@@ -11,6 +11,9 @@ from core.serializers.ticket_linked_item import Ticket, TicketLinkedItem, Ticket
 
 from itam.models.device import Device
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketLinkedItemValidationAPI(
     TestCase,

app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_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.shortcuts import reverse
 from django.test import Client, TestCase
@@ -23,6 +25,8 @@ from core.models.ticket.ticket_linked_items import Ticket, TicketLinkedItem
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:

app/core/tests/unit/manufacturer/test_manufacturer_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
@@ -14,6 +15,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 
 from core.models.manufacturer import Manufacturer
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ManufacturerAPI(

app/core/tests/unit/manufacturer/test_manufacturer_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
@@ -17,6 +18,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from core.models.manufacturer import Manufacturer
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class ManufacturerPermissions(TestCase, ModelPermissions):
 

app/core/tests/unit/model_notes/test_unit_model_notes_model.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import  User
+import django
+
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -8,6 +9,8 @@ from app.tests.unit.test_unit_models import TenancyObjectInheritedCases
 
 from core.models.model_notes import ModelNotes
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelNotesTestCases(

app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py

@@ -1,6 +1,6 @@
-# import pytest
+import django
 
-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 +17,8 @@ from core.models.ticket.ticket import Ticket, RelatedTickets
 
 from itam.models.device import Device
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class RelatedTicketsLinkedItemAPI(

app/core/tests/unit/test_history/test_unit_history_model.py

@@ -1,4 +1,6 @@
-from django.contrib.auth.models import User, ContentType
+import django
+
+from django.contrib.auth.models import ContentType
 from django.test import TestCase
 
 from access.models.organization import Organization
@@ -8,6 +10,8 @@ from app.tests.unit.test_unit_models import TenancyObjectInheritedCases
 from core.models.manufacturer_history import Manufacturer
 from core.models.model_history import ModelHistory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ModelHistoryTestCases(

app/core/tests/unit/test_task_result/test_task_result.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
@@ -17,6 +18,8 @@ from app.tests.abstract.model_permissions import ModelPermissionsView
 
 from django_celery_results.models import TaskResult
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TaskResultPermissions(TestCase, ModelPermissionsView):

app/core/tests/unit/test_task_result/test_task_result_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
@@ -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 CeleryTaskResultAPI(

app/core/tests/unit/ticket_base/test_unit_ticket_base_model.py

@@ -1,7 +1,7 @@
-import pytest
 import datetime
+import django
+import pytest
 
-from django.contrib.auth.models import User
 from django.db.models.query import QuerySet
 from django.db import models
 from django.test import TestCase
@@ -22,6 +22,8 @@ from core.models.ticket_comment_base import TicketCommentBase
 
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketBaseModelTestCases(

app/core/tests/unit/ticket_category/test_ticket_category_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
@@ -14,6 +15,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 
 from core.models.ticket.ticket_category import TicketCategory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCategoryAPI(

app/core/tests/unit/ticket_category/test_ticket_category_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
@@ -17,6 +18,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from core.models.ticket.ticket_category import TicketCategory
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCategoryPermissions(TestCase, ModelPermissions):
 

app/core/tests/unit/ticket_category/test_ticket_category_permission_api.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.test import TestCase
 
@@ -14,6 +15,9 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from core.models.ticket.ticket_category import TicketCategory
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCategoryPermissionsAPI(TestCase, APIPermissions):
 

app/core/tests/unit/ticket_comment/test_ticket_comment_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
@@ -16,6 +17,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 from core.models.ticket.ticket import Ticket
 from core.models.ticket.ticket_comment import TicketComment, TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCommentAPI(

app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py

@@ -1,7 +1,8 @@
+import django
 import re
 
 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
@@ -21,6 +22,7 @@ from project_management.models.projects import Project
 from core.models.ticket.ticket import Ticket, RelatedTickets
 from core.models.ticket.ticket_comment import TicketComment
 
+User = django.contrib.auth.get_user_model()
 
 
 

app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.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 Client, TestCase
@@ -16,6 +17,9 @@ from api.tests.abstract.api_permissions import APIPermissions, APIPermissionAdd,
 from core.models.ticket.ticket import Ticket
 from core.models.ticket.ticket_comment import TicketComment
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCommentPermissionsAPI(
     # APIPermissions

app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py

@@ -1,6 +1,6 @@
+import django
 import pytest
 
-from django.contrib.auth.models import User
 from django.test import TestCase
 
 from access.models.organization import Organization
@@ -11,6 +11,8 @@ from app.tests.unit.test_unit_models import (
 
 from core.models.ticket.ticket_comment import Ticket, TicketComment
 
+User = django.contrib.auth.get_user_model()
+
 
 class TicketCommentModel(
     TenancyObjectInheritedCases,

app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py

@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import ContentType, Permission, User
+from django.contrib.auth.models import ContentType, Permission
 from django.shortcuts import reverse
 
 from rest_framework.relations import Hyperlink
@@ -18,6 +19,8 @@ from core.models.ticket_comment_base import (
     TicketCommentCategory
 )
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCommentBaseAPITestCases(

app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py

@@ -1,7 +1,7 @@
 import datetime
+import django
 import pytest
 
-from django.contrib.auth.models import User
 from django.db import models
 
 from rest_framework.exceptions import ValidationError
@@ -14,6 +14,8 @@ from app.tests.unit.test_unit_models import (
 
 from core.models.ticket_comment_base import TicketBase, TicketCommentBase, TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCommentBaseModelTestCases(

app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_viewset.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import User
+import django
+
 from django.test import Client, TestCase
 
 from rest_framework.reverse import reverse
@@ -12,6 +13,9 @@ from core.viewsets.ticket_comment import (
     ViewSet
 )
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCommentBaseViewsetTestCases(
     SubModelViewSetInheritedCases,

app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_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
@@ -14,6 +15,8 @@ from api.tests.abstract.api_fields import APITenancyObject
 
 from core.models.ticket.ticket_comment_category import TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketCategoryAPI(

app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_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,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from core.models.ticket.ticket_comment_category import TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCommentCategoryPermissions(TestCase, ModelPermissions):
 

app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.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.test import TestCase
 
@@ -14,6 +15,9 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from core.models.ticket.ticket_comment_category import TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCommentCategoryPermissionsAPI(TestCase, APIPermissions):
 

app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py

@@ -1,9 +1,10 @@
+import django
 import re
 
 from datetime import datetime
 
 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
@@ -28,6 +29,8 @@ from core.tests.unit.ticket_depreciated.ticket_permission.field_based_permission
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class SetUp:

app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission_api.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.test import TestCase
 
@@ -14,6 +15,9 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from core.models.ticket.ticket import Ticket
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketPermissionsAPI(APIPermissions):
 

app/core/tests/unit/ticket_depreciated/test_unit_ticket_depreciated_model.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import User
+import django
+
 from django.test import TestCase
 
 from app.tests.unit.test_unit_models import (
@@ -7,6 +8,8 @@ from app.tests.unit.test_unit_models import (
 
 from core.models.ticket.ticket import Ticket
 
+User = django.contrib.auth.get_user_model()
+
 
 class TicketModel(
     TenancyObjectInheritedCases,

app/core/tests/unit/ticket_depreciated/ticket_permission/field_based_permissions.py

@@ -1,7 +1,8 @@
+import django
 import pytest
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.models import AnonymousUser
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.shortcuts import reverse
@@ -9,6 +10,9 @@ from django.test import Client
 
 from core.models.ticket.ticket import Ticket
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketFieldPermissionsAddUser:
 

app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py

@@ -1,6 +1,6 @@
-# import pytest
+import django
 
-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 +17,8 @@ from core.models.ticket.ticket_linked_items import Ticket, TicketLinkedItem
 
 from itam.models.device import Device
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketLinkedItemAPI(

app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py

@@ -1,7 +1,8 @@
+import django
 import re
 
 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
@@ -27,6 +28,9 @@ from itam.models.device import Device
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketLinkedItemPermissions(
     ModelPermissionsAdd,

app/core/tests/unit/ticket_linked_item/test_unit_ticket_linked_item_model.py

@@ -1,4 +1,5 @@
-from django.contrib.auth.models import User
+import django
+
 from django.test import TestCase
 
 from access.models.organization import Organization
@@ -16,6 +17,8 @@ from itam.models.software import Software
 from itim.models.clusters import Cluster
 from itim.models.services import Service
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class TicketLinkedItemBase: