lint fixes

Karthikeyannhs · Karthikeyannhs · commit f9f99ab653e5 · 2025-08-01T14:13:56.000+01:00
diff --git a/src/rules_validation_api/app.py b/src/rules_validation_api/app.py
@@ -1,20 +1,19 @@
 import json
+from pathlib import Path
 
 from pydantic import ValidationError
 
 from rules_validation_api.validators.campaign_config_validator import CampaignConfigValidation
 
 
 def main() -> None:
-    print("Starting rules validation")
-    with open("campaign_config.json") as file:
+    with Path.open(Path("campaign_config.json")) as file:
         json_data = json.load(file)  # this validates json
 
     try:
-        user = CampaignConfigValidation(**json_data["CampaignConfig"])
-        print("validation successful")
+        CampaignConfigValidation(**json_data["CampaignConfig"])
     except ValidationError as e:
-        print(e)
+        print(e)  # noqa: T201
 
 
 if __name__ == "__main__":
diff --git a/src/rules_validation_api/validators/campaign_config_validator.py b/src/rules_validation_api/validators/campaign_config_validator.py
@@ -1,21 +1,8 @@
-from pydantic import Field, field_validator
+from pydantic import Field
 
 from eligibility_signposting_api.model.campaign_config import CampaignConfig
 from rules_validation_api.validators.iteration_validator import IterationValidation
 
 
 class CampaignConfigValidation(CampaignConfig):
     iterations: list[IterationValidation] = Field(..., min_length=1, alias="Iterations")
-
-    # @field_validator("id")
-    # def validate_name(cls, value: str) -> str:
-    #     if not value.strip():
-    #         raise ValueError("campaign ID must not be empty")
-    #     return value
-    #
-    # @field_validator("type")
-    # def validate_type(cls, value: str) -> str:
-    #     allowed_values = {"V", "S"}
-    #     if value not in allowed_values:
-    #         raise ValueError(f"type must be one of {allowed_values}")
-    #     return value
diff --git a/src/rules_validation_api/validators/iteration_rules_validator.py b/src/rules_validation_api/validators/iteration_rules_validator.py
@@ -1,11 +1,5 @@
-from pydantic import field_validator
-
 from eligibility_signposting_api.model.campaign_config import IterationRule
 
 
 class IterationRuleValidation(IterationRule):
-    @field_validator("type")
-    def validate_type(cls, value: str) -> str:
-        if not value.strip():
-            raise ValueError("type must not be empty")
-        return value
+    pass
diff --git a/src/rules_validation_api/validators/iteration_validator.py b/src/rules_validation_api/validators/iteration_validator.py
@@ -1,3 +1,5 @@
+import typing
+
 from pydantic import Field, ValidationError, model_validator
 from pydantic_core import InitErrorDetails
 
@@ -11,21 +13,17 @@ class IterationValidation(Iteration):
     actions_mapper: ActionsMapperValidator = Field(..., alias="ActionsMapper")
 
     @model_validator(mode="after")
-    def validate_default_comms_routing_in_actions_mapper(self):
+    def validate_default_comms_routing_in_actions_mapper(self) -> typing.Self:
         default_routing = self.default_comms_routing
         actions_mapper = self.actions_mapper.root.keys()
 
-        if default_routing:
-            if not actions_mapper or default_routing not in actions_mapper:
-                error = InitErrorDetails(
-                    type='value_error',
-                    loc=('actions_mapper',),
-                    input=actions_mapper,
-                    ctx={'error': f"Missing entry for DefaultCommsRouting '{default_routing}' in ActionsMapper"}
-                )
-                raise ValidationError.from_exception_data(
-                    title='IterationValidation',
-                    line_errors=[error]
-                )
+        if default_routing and (not actions_mapper or default_routing not in actions_mapper):
+            error = InitErrorDetails(
+                type="value_error",
+                loc=("actions_mapper",),
+                input=actions_mapper,
+                ctx={"error": f"Missing entry for DefaultCommsRouting '{default_routing}' in ActionsMapper"},
+            )
+            raise ValidationError.from_exception_data(title="IterationValidation", line_errors=[error])
 
         return self
diff --git a/tests/unit/validation/conftest.py b/tests/unit/validation/conftest.py
@@ -28,17 +28,15 @@ def valid_campaign_config_with_only_mandatory_fields():
                 "DefaultNotActionableRouting": "RouteC",
                 "IterationCohorts": [],
                 "IterationRules": [],
-                "ActionsMapper":
-                    {
-                        "BOOK_NBS":
-                            {
-                                "ExternalRoutingCode": "BookNBS",
-                                "ActionDescription": "",
-                                "ActionType": "ButtonWithAuthLink",
-                                "UrlLink": "http://www.nhs.uk/book-rsv",
-                                "UrlLabel": "Continue to booking"
-                            }
+                "ActionsMapper": {
+                    "BOOK_NBS": {
+                        "ExternalRoutingCode": "BookNBS",
+                        "ActionDescription": "",
+                        "ActionType": "ButtonWithAuthLink",
+                        "UrlLink": "http://www.nhs.uk/book-rsv",
+                        "UrlLabel": "Continue to booking",
                     }
+                },
             }
         ],
     }
@@ -67,5 +65,5 @@ def valid_available_action():
         "ActionDescription": "",
         "ActionType": "ButtonWithAuthLink",
         "UrlLink": "http://www.nhs.uk/book-rsv",
-        "UrlLabel": "Continue to booking"
+        "UrlLabel": "Continue to booking",
     }
diff --git a/tests/unit/validation/test_available_action_validator.py b/tests/unit/validation/test_available_action_validator.py
@@ -8,7 +8,6 @@
 
 # 🔍 Mandatory Fields
 class TestMandatoryFieldsSchemaValidations:
-
     def test_valid_minimal_input(self, valid_available_action):
         data = copy.deepcopy(valid_available_action)
         data.pop("ActionDescription")
@@ -34,7 +33,6 @@ def test_missing_required_fields(self, valid_available_action):
 
 # 🔍 Optional Fields
 class TestOptionalFieldsSchemaValidations:
-
     def test_valid_full_input(self, valid_available_action):
         action = AvailableActionValidation(**valid_available_action)
         assert action.action_type == "ButtonWithAuthLink"
diff --git a/tests/unit/validation/test_iteration_rules_validator.py b/tests/unit/validation/test_iteration_rules_validator.py
@@ -124,7 +124,7 @@ def test_invalid_comparator(self, comparator_value, valid_iteration_rule_with_on
 
 
 class TestOptionalFieldsSchemaValidations:
-    # AttributeName (Optional)
+    # AttributeName
     @pytest.mark.parametrize("attr_name", ["status", "user_type", None])
     def test_valid_attribute_name(self, attr_name, valid_iteration_rule_with_only_mandatory_fields):
         data = valid_iteration_rule_with_only_mandatory_fields.copy()
@@ -139,7 +139,7 @@ def test_invalid_attribute_name(self, attr_name, valid_iteration_rule_with_only_
         with pytest.raises(ValidationError):
             IterationRuleValidation(**data)
 
-    # CohortLabel (Optional)
+    # CohortLabel
     @pytest.mark.parametrize("label", ["Cohort_A", "Segment_2025", None, ""])
     def test_valid_cohort_label(self, label, valid_iteration_rule_with_only_mandatory_fields):
         data = valid_iteration_rule_with_only_mandatory_fields.copy()
@@ -154,7 +154,7 @@ def test_invalid_cohort_label(self, label, valid_iteration_rule_with_only_mandat
         with pytest.raises(ValidationError):
             IterationRuleValidation(**data)
 
-    # AttributeTarget (Optional)
+    # AttributeTarget
     @pytest.mark.parametrize("target", ["target_value", None])
     def test_valid_attribute_target(self, target, valid_iteration_rule_with_only_mandatory_fields):
         data = valid_iteration_rule_with_only_mandatory_fields.copy()
@@ -169,7 +169,7 @@ def test_invalid_attribute_target(self, target, valid_iteration_rule_with_only_m
         with pytest.raises(ValidationError):
             IterationRuleValidation(**data)
 
-    # RuleStop (Optional boolean with string "Y"/"N")
+    # RuleStop
     @pytest.mark.parametrize("rule_stop_value", [True, False, "Y", "N", "YES", "NO", "YEAH", "ONE"])
     def test_valid_rule_stop(self, rule_stop_value, valid_iteration_rule_with_only_mandatory_fields):
         data = valid_iteration_rule_with_only_mandatory_fields.copy()
@@ -184,7 +184,7 @@ def test_invalid_rule_stop(self, rule_stop_value, valid_iteration_rule_with_only
         with pytest.raises(ValidationError):
             IterationRuleValidation(**data)
 
-    # CommsRouting (Optional)
+    # CommsRouting
     @pytest.mark.parametrize("routing_value", ["route_A", None])
     def test_valid_comms_routing(self, routing_value, valid_iteration_rule_with_only_mandatory_fields):
         data = valid_iteration_rule_with_only_mandatory_fields.copy()
@@ -202,7 +202,7 @@ def test_invalid_comms_routing(self, routing_value, valid_iteration_rule_with_on
 
 class TestBUCValidations:
     @pytest.mark.parametrize(
-        "rule_stop_input, expected_bool",
+        ("rule_stop_input", "expected_bool"),
         [
             (True, True),
             (False, False),
diff --git a/tests/unit/validation/test_iteration_validator.py b/tests/unit/validation/test_iteration_validator.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import UTC, datetime
 
 import pytest
 from pydantic import ValidationError
@@ -64,7 +64,7 @@ def test_valid_name(self, name_value, valid_campaign_config_with_only_mandatory_
     def test_valid_iteration_date(self, date_value, valid_campaign_config_with_only_mandatory_fields):
         data = {**valid_campaign_config_with_only_mandatory_fields["Iterations"][0], "IterationDate": date_value}
         model = IterationValidation(**data)
-        expected_date = datetime.strptime(date_value, "%Y%m%d").date()
+        expected_date = datetime.strptime(str(date_value), "%Y%m%d").replace(tzinfo=UTC).date()
         assert model.iteration_date == expected_date, f"Expected {expected_date}, got {model.iteration_date}"
 
     # Type
@@ -143,34 +143,39 @@ def test_approval_maximum(self, approval_maximum, valid_campaign_config_with_onl
 
 
 class TestIterationCohortsSchemaValidations:
-    def test_valid_iteration_if_actions_mapper_has_entry_for_the_provided_default_routing_key(self, valid_campaign_config_with_only_mandatory_fields):
+    def test_valid_iteration_if_actions_mapper_has_entry_for_the_provided_default_routing_key(
+        self, valid_campaign_config_with_only_mandatory_fields
+    ):
         expected_action = {
             "ExternalRoutingCode": "BookLocal",
             "ActionDescription": "##Getting the vaccine\n"
-                                 "You can get an RSV vaccination at your GP surgery.\n"
-                                 "Your GP surgery may contact you about getting the RSV vaccine. "
-                                 "This may be by letter, text, phone call, email or through the NHS App. "
-                                 "You do not need to wait to be contacted before booking your vaccination.",
-            "ActionType": "InfoText"
+            "You can get an RSV vaccination at your GP surgery.\n"
+            "Your GP surgery may contact you about getting the RSV vaccine. "
+            "This may be by letter, text, phone call, email or through the NHS App. "
+            "You do not need to wait to be contacted before booking your vaccination.",
+            "ActionType": "InfoText",
         }
 
-        data = {**valid_campaign_config_with_only_mandatory_fields["Iterations"][0],
-                "DefaultCommsRouting": "BOOK_LOCAL", "ActionsMapper": {
-                "BOOK_LOCAL": expected_action
-            }}
+        data = {
+            **valid_campaign_config_with_only_mandatory_fields["Iterations"][0],
+            "DefaultCommsRouting": "BOOK_LOCAL",
+            "ActionsMapper": {"BOOK_LOCAL": expected_action},
+        }
         IterationValidation(**data)
 
-    def test_invalid_iteration_if_actions_mapper_has_no_entry_for_the_provided_default_routing_key(self, valid_campaign_config_with_only_mandatory_fields):
-        data = {**valid_campaign_config_with_only_mandatory_fields["Iterations"][0],
-                "DefaultCommsRouting": "BOOK_LOCAL", "ActionsMapper": {}} # Missing BOOK_LOCAL in ActionsMapper
+    def test_invalid_iteration_if_actions_mapper_has_no_entry_for_the_provided_default_routing_key(
+        self, valid_campaign_config_with_only_mandatory_fields
+    ):
+        data = {
+            **valid_campaign_config_with_only_mandatory_fields["Iterations"][0],
+            "DefaultCommsRouting": "BOOK_LOCAL",
+            "ActionsMapper": {},
+        }  # Missing BOOK_LOCAL in ActionsMapper
 
         with pytest.raises(ValidationError) as error:
             IterationValidation(**data)
 
         errors = error.value.errors()
-        assert any(
-            e["loc"][-1] == "actions_mapper" and "BOOK_LOCAL" in str(e["msg"])
-            for e in errors
-        ), "Expected validation error for missing BOOK_LOCAL entry in ActionsMapper"
-
-
+        assert any(e["loc"][-1] == "actions_mapper" and "BOOK_LOCAL" in str(e["msg"]) for e in errors), (
+            "Expected validation error for missing BOOK_LOCAL entry in ActionsMapper"
+        )
