Merge pull request #2236 from uktrade/uat

PROD Release
uktrade · Oct 17, 2024 · c282cc4 · c282cc4
2 parents ac42546 + 490299a
commit c282cc4
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 836 deletions.
diff --git a/.circleci/.github/CODEOWNERS → .github/CODEOWNERS b/.circleci/.github/CODEOWNERS → .github/CODEOWNERS
diff --git a/api/applications/views/applications.py b/api/applications/views/applications.py
@@ -97,7 +97,7 @@
 from api.staticdata.statuses.models import CaseSubStatus
 from api.users.libraries.notifications import get_case_notifications
 from api.users.models import ExporterUser
-from api.workflow.flagging_rules_automation import apply_flagging_rules_to_case
+from lite_routing.routing_rules_internal.flagging_engine import apply_flagging_rules_to_case
 
 from lite_routing.routing_rules_internal.routing_engine import run_routing_rules
 

diff --git a/api/applications/views/tests/test_parties.py b/api/applications/views/tests/test_parties.py
@@ -84,85 +84,6 @@ def setUp(self):
 
         self.party_on_application = PartyOnApplicationFactory(application=self.application)
 
-    @parameterized.expand(
-        [
-            (
-                {"name": "end_user", "address": "1 Example Street"},
-                True,
-                {
-                    "name": [
-                        "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ]
-                },
-            ),
-            (
-                {"name": "end\auser", "address": "1 Example Street"},
-                True,
-                {
-                    "name": [
-                        "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ]
-                },
-            ),
-            (
-                {"name": "end£user", "address": "1 Example Street"},
-                True,
-                {
-                    "name": [
-                        "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ]
-                },
-            ),
-            (
-                {"name": "end user", "address": "1_Example Street"},
-                True,
-                {
-                    "address": [
-                        "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ]
-                },
-            ),
-            (
-                {"name": "end user", "address": "1\aExample Street"},
-                True,
-                {
-                    "address": [
-                        "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ]
-                },
-            ),
-            (
-                {"name": "end_user", "address": "1\aExample Street"},
-                True,
-                {
-                    "name": [
-                        "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ],
-                    "address": [
-                        "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-                    ],
-                },
-            ),
-        ]
-    )
-    def test_party_post_invalid(self, data, error, error_message):
-        data["country"] = {"id": "FR", "name": "France"}
-        self.url = reverse(
-            "applications:party",
-            kwargs={"pk": str(self.application.pk), "party_pk": str(self.party_on_application.party.pk)},
-        )
-        party = Party.objects.get(id=self.party_on_application.party.pk)
-        versions = Version.objects.get_for_object(party)
-        self.assertEqual(versions.count(), 0)
-
-        self.application.status = CaseStatus.objects.get(status="draft")
-        self.application.save()
-
-        response = self.client.put(self.url, **self.exporter_headers, data=data)
-        if error:
-            self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-            self.assertEqual(response.json()["errors"], error_message)
-
     @parameterized.expand(
         [
             ({"name": "end user", "address": "1 Example Street"},),

diff --git a/api/cases/signals.py b/api/cases/signals.py
@@ -5,7 +5,7 @@
 from api.cases.models import Case
 from api.staticdata.statuses.enums import CaseStatusEnum
 from api.staticdata.statuses.libraries.get_case_status import get_case_status_by_status
-from api.workflow.flagging_rules_automation import apply_flagging_rules_to_case
+from lite_routing.routing_rules_internal.flagging_engine import apply_flagging_rules_to_case
 
 
 @receiver(pre_save)

diff --git a/api/core/tests/test_validators.py b/api/core/tests/test_validators.py
diff --git a/api/core/validators.py b/api/core/validators.py
@@ -1,6 +1,5 @@
 from django.utils.deconstruct import deconstructible
 from rest_framework.exceptions import ValidationError
-import re
 from api.staticdata.control_list_entries.models import ControlListEntry
 
 
@@ -22,27 +21,3 @@ def __call__(self, value):
             ControlListEntry.objects.get(rating=value)
         except ControlListEntry.DoesNotExist:
             raise ValidationError(self.message, code=self.code)
-
-
-class EdifactStringValidator:
-    message = "Undefined Error"
-    regex_string = r"^[a-zA-Z0-9 .,\-\)\(\/'+:=\?\!\"%&\*;\<\>]+$"
-
-    def __call__(self, value):
-        match_regex = re.compile(self.regex_string)
-        is_value_valid = bool(match_regex.match(value))
-        if not is_value_valid:
-            raise ValidationError(self.message)
-
-
-class GoodNameValidator(EdifactStringValidator):
-    message = "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-
-
-class PartyAddressValidator(EdifactStringValidator):
-    regex_string = re.compile(r"^[a-zA-Z0-9 .,\-\)\(\/'+:=\?\!\"%&\*;\<\>\r\n]+$")
-    message = "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
-
-
-class PartyNameValidator(EdifactStringValidator):
-    message = "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes"
diff --git a/api/flags/views.py b/api/flags/views.py
@@ -43,7 +43,10 @@
 from api.queries.end_user_advisories.models import EndUserAdvisoryQuery
 from api.queries.goods_query.models import GoodsQuery
 
-from api.workflow.flagging_rules_automation import apply_flagging_rule_to_all_open_cases, apply_flagging_rule_for_flag
+from lite_routing.routing_rules_internal.flagging_engine import (
+    apply_flagging_rule_to_all_open_cases,
+    apply_flagging_rule_for_flag,
+)
 
 from lite_content.lite_api import strings
 

diff --git a/api/goods/serializers.py b/api/goods/serializers.py
@@ -2,7 +2,6 @@
 from rest_framework.relations import PrimaryKeyRelatedField
 from api.core.helpers import str_to_bool
 from api.core.serializers import KeyValueChoiceField, ControlListEntryField, GoodControlReviewSerializer
-from api.core.validators import GoodNameValidator
 from api.documents.libraries.process_document import process_document
 from api.goods.enums import (
     FirearmCategory,
@@ -308,7 +307,7 @@ def update(self, instance, validated_data):
 
 class GoodListSerializer(serializers.Serializer):
     id = serializers.UUIDField()
-    name = serializers.CharField(validators=[GoodNameValidator()])
+    name = serializers.CharField()
     description = serializers.CharField()
     control_list_entries = ControlListEntrySerializer(many=True, allow_null=True)
     part_number = serializers.CharField()
@@ -357,7 +356,7 @@ class GoodCreateSerializer(serializers.ModelSerializer):
     Because of this, each 'get' override must check the instance type before creating queries
     """
 
-    name = serializers.CharField(error_messages={"blank": "Enter a product name"}, validators=[GoodNameValidator()])
+    name = serializers.CharField(error_messages={"blank": "Enter a product name"})
     description = serializers.CharField(max_length=280, allow_blank=True, required=False)
     is_good_controlled = KeyValueChoiceField(choices=GoodControlled.choices, allow_null=True)
     control_list_entries = ControlListEntryField(required=False, many=True, allow_null=True, allow_empty=True)
@@ -690,7 +689,7 @@ def create(self, validated_data):
 class GoodDocumentViewSerializer(serializers.Serializer):
     id = serializers.UUIDField()
     created_at = serializers.DateTimeField()
-    name = serializers.CharField(validators=[GoodNameValidator()])
+    name = serializers.CharField()
     description = serializers.CharField()
     user = ExporterUserSimpleSerializer()
     s3_key = serializers.SerializerMethodField()
@@ -788,7 +787,7 @@ class Meta:
 
 class GoodSerializerInternal(serializers.Serializer):
     id = serializers.UUIDField()
-    name = serializers.CharField(validators=[GoodNameValidator()])
+    name = serializers.CharField()
     description = serializers.CharField()
     part_number = serializers.CharField()
     no_part_number_comments = serializers.CharField()
@@ -871,7 +870,7 @@ def get_user(self, instance):
 
 class GoodSerializerExporter(serializers.Serializer):
     id = serializers.UUIDField()
-    name = serializers.CharField(validators=[GoodNameValidator()])
+    name = serializers.CharField()
     description = serializers.CharField()
     control_list_entries = ControlListEntryField(many=True)
     part_number = serializers.CharField()

diff --git a/api/goods/tests/test_serializers.py b/api/goods/tests/test_serializers.py
@@ -170,30 +170,6 @@ def test_validate_good_internal_name_valid(self, name):
         [
             ("", "This field may not be blank."),
             ("\r\n", "This field may not be blank."),
-            (
-                "good\rname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good\nname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good\r\nname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good_name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good$name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good@name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
         ]
     )
     def test_validate_good_internal_name_invalid(self, name, error_message):
@@ -258,30 +234,6 @@ def test_validate_good_exporter_name_valid(self, address):
         [
             ("", "This field may not be blank."),
             ("\r\n", "This field may not be blank."),
-            (
-                "good\rname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good\nname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good\r\nname",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good_name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good$name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "good@name",
-                "Product name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
         ]
     )
     def test_validate_good_exporter_name_invalid(self, name, error_message):

diff --git a/api/organisations/views/organisations.py b/api/organisations/views/organisations.py
@@ -37,7 +37,7 @@
 from api.staticdata.statuses.libraries.get_case_status import get_case_status_by_status
 from api.staticdata.statuses.models import CaseStatus
 from api.users.enums import UserType
-from api.workflow.flagging_rules_automation import apply_flagging_rules_to_case
+from lite_routing.routing_rules_internal.flagging_engine import apply_flagging_rules_to_case
 
 
 class OrganisationsList(generics.ListCreateAPIView):

diff --git a/api/parties/serializers.py b/api/parties/serializers.py
@@ -3,7 +3,6 @@
 
 from api.cases.enums import CaseTypeSubTypeEnum
 from api.core.serializers import KeyValueChoiceField, CountrySerializerField
-from api.core.validators import PartyAddressValidator, PartyNameValidator
 from api.documents.libraries.process_document import process_document
 from api.flags.serializers import FlagSerializer
 from api.goods.enums import PvGrading
@@ -15,8 +14,8 @@
 
 
 class PartySerializer(serializers.ModelSerializer):
-    name = serializers.CharField(error_messages=PartyErrors.NAME, validators=[PartyNameValidator()])
-    address = serializers.CharField(error_messages=PartyErrors.ADDRESS, validators=[PartyAddressValidator()])
+    name = serializers.CharField(error_messages=PartyErrors.NAME)
+    address = serializers.CharField(error_messages=PartyErrors.ADDRESS)
     country = CountrySerializerField()
     website = serializers.CharField(required=False, allow_blank=True)
     signatory_name_euu = serializers.CharField(allow_blank=True)

diff --git a/api/parties/tests/test_serializers.py b/api/parties/tests/test_serializers.py
@@ -58,26 +58,6 @@ def test_validate_party_address_valid(self, address):
     @parameterized.expand(
         [
             ("\r\n", "Enter an address"),
-            (
-                "party\address",
-                "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party-\waddress",
-                "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party_address",
-                "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party$address",
-                "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party@address",
-                "Address must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
         ]
     )
     def test_validate_party_address_invalid(self, address, error_message):
@@ -107,40 +87,3 @@ def test_validate_party_name_valid(self, name):
             partial=True,
         )
         self.assertTrue(serializer.is_valid())
-
-    @parameterized.expand(
-        [
-            (
-                "party\aname",
-                "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party-\wname",
-                "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party_name",
-                "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party$name",
-                "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-            (
-                "party@name",
-                "Party name must only include letters, numbers, and common special characters such as hyphens, brackets and apostrophes",
-            ),
-        ]
-    )
-    def test_party_name_invalid(self, name, error_message):
-        serializer = PartySerializer(
-            data={"name": name},
-            partial=True,
-        )
-        self.assertFalse(serializer.is_valid())
-        serializer_error = serializer.errors["name"]
-        self.assertEqual(len(serializer_error), 1)
-        self.assertEqual(
-            str(serializer_error[0]),
-            error_message,
-        )
diff --git a/api/queries/end_user_advisories/views.py b/api/queries/end_user_advisories/views.py
@@ -13,7 +13,7 @@
 from api.queries.end_user_advisories.models import EndUserAdvisoryQuery
 from api.queries.end_user_advisories.serializers import EndUserAdvisoryViewSerializer, EndUserAdvisoryListSerializer
 from api.users.libraries.notifications import get_case_notifications
-from api.workflow.flagging_rules_automation import apply_flagging_rules_to_case
+from lite_routing.routing_rules_internal.flagging_engine import apply_flagging_rules_to_case
 
 
 class EndUserAdvisoriesList(ListAPIView):