Move the import into the class to avoid circular imports

api/applications/models.py

@@ -17,7 +17,6 @@
 from api.appeals.models import Appeal
 from api.applications.exceptions import AmendmentError
 from api.applications.managers import BaseApplicationManager
-from api.applications.validators import StandardApplicationValidator
 from api.applications.libraries.application_helpers import create_submitted_audit
 from api.audit_trail.models import AuditType
 from api.audit_trail import service as audit_trail_service
@@ -278,6 +277,8 @@ def create_amendment(self, user):
 
 # Licence     Applications
 class StandardApplication(BaseApplication, Clonable):
+    from api.applications.validators import StandardApplicationValidator
+
     GB = "GB"
     NI = "NI"
     GOODS_STARTING_POINT_CHOICES = [

api/applications/tests/test_models.py

@@ -43,7 +43,7 @@
     CaseStatusEnum,
 )
 from api.users.enums import SystemUser
-from api.users.models import ExporterUser
+from api.users.models import BaseUser, ExporterUser
 from api.users.tests.factories import BaseUserFactory
 
 
@@ -603,7 +603,8 @@ def test_clone_with_party_override(self):
 @pytest.mark.requires_transactions
 class TestStandardApplicationRaceConditions(TransactionTestCase):
     def test_create_amendment_race_condition_success(self):
-        BaseUserFactory(id=SystemUser.id)
+        if not BaseUser.objects.filter(id=SystemUser.id).exists():
+            BaseUserFactory(id=SystemUser.id)
 
         original_application = StandardApplicationFactory()
 

api/applications/validators.py

@@ -1,6 +1,7 @@
 from django.db.models import Q
 
 from api.applications.enums import ApplicationExportType
+from api.core.model_mixins import BaseApplicationValidator
 from api.goods.models import GoodDocument
 from api.parties.models import PartyDocument
 
@@ -161,23 +162,6 @@ def siel_temporary_export_details_validator(application):
     return None
 
 
-class BaseApplicationValidator:
-    config = {}
-
-    def __init__(self, application):
-        self.application = application
-
-    def validate(self):
-        all_errors = {}
-        for entity, func in self.config.items():
-            error = func(self.application)
-            if error:
-                entity_errors = {entity: [error]}
-                all_errors = {**entity_errors, **all_errors}
-
-        return all_errors
-
-
 class StandardApplicationValidator(BaseApplicationValidator):
     config = {
         "location": siel_locations_validator,

api/core/model_mixins.py

@@ -42,3 +42,20 @@ class Trackable:
 
     def get_history(self, field):
         raise NotImplementedError()
+
+
+class BaseApplicationValidator:
+    config = {}
+
+    def __init__(self, application):
+        self.application = application
+
+    def validate(self):
+        all_errors = {}
+        for entity, func in self.config.items():
+            error = func(self.application)
+            if error:
+                entity_errors = {entity: [error]}
+                all_errors = {**entity_errors, **all_errors}
+
+        return all_errors