fixed format issues

Author: oneeb-nhs

tests/fixtures/builders/model/rule.py

@@ -256,6 +256,7 @@ class ICBNonActionableActionRuleFactory(IterationRuleFactory):
     comparator = RuleComparator("QE1")
     comms_routing = CommsRouting("ActionCode1")
 
+
 class PostcodeNonActionableRuleFactory(IterationRuleFactory):
     type = RuleType.not_actionable_actions
     name = RuleName("Excluded postcode In SW19")

tests/integration/in_process/test_status_text_override.py

@@ -5,17 +5,16 @@
 from brunns.matchers.data import json_matching as is_json_that
 from brunns.matchers.werkzeug import is_werkzeug_response as is_response
 from flask.testing import FlaskClient
-from hamcrest import assert_that, has_entries, has_item, has_key, is_not, none, equal_to, is_
+from hamcrest import assert_that, equal_to, has_entries, has_item, has_key, is_, is_not, none
 
 from eligibility_signposting_api.model.consumer_mapping import ConsumerId, ConsumerMapping
 from eligibility_signposting_api.model.eligibility_status import NHSNumber
-from tests.integration.conftest import UNIQUE_CONSUMER_HEADER, bridge_latest_kinesis_record_to_firehose
-
 from eligibility_signposting_api.repos.campaign_repo import BucketName
+from tests.integration.conftest import UNIQUE_CONSUMER_HEADER, bridge_latest_kinesis_record_to_firehose
 
 
 class TestStatusTextOverride:
-    def test_status_text_override_replaces_iteration_status_text_and_is_not_returned_as_action(
+    def test_status_text_override_replaces_iteration_status_text_and_is_not_returned_as_action(  # noqa: PLR0913
         self,
         client: FlaskClient,
         audit_bucket: BucketName,
@@ -87,7 +86,7 @@ def test_status_text_override_replaces_iteration_status_text_and_is_not_returned
         assert_that(audit_data["response"]["condition"][0].get("statusTextOverride"), equal_to(status_text_override))
         assert_that(audit_data["response"]["condition"][0].get("statusText"), equal_to(status_text))
 
-    def test_no_status_text_override_as_no_action(
+    def test_no_status_text_override_as_no_action(  # noqa: PLR0913
         self,
         client: FlaskClient,
         audit_bucket: BucketName,
@@ -128,7 +127,7 @@ def test_no_status_text_override_as_no_action(
 
         actions = covid_suggestion.get("actions", [])
 
-        assert_that(actions,is_([]))
+        assert_that(actions, is_([]))
 
         assert all(action.get("actionType") != "norender_StatusTextOverride" for action in actions)
 
@@ -150,4 +149,4 @@ def test_no_status_text_override_as_no_action(
 
         assert_that(len(audit_data["response"]["condition"]), equal_to(1))
         assert_that(audit_data["response"]["condition"][0].get("statusTextOverride"), equal_to(status_text_override))
-        assert_that(audit_data["response"]["condition"][0].get("statusText"), equal_to(status_text))
+        assert_that(audit_data["response"]["condition"][0].get("statusText"), equal_to(status_text))

tests/unit/audit/test_audit_context.py

@@ -551,4 +551,4 @@ def test_duplicates_are_removed():
 def test_empty_list_returns_empty_list():
     reasons = []
     expected = []
-    assert AuditContext.deduplicate_reasons(reasons) == expected
+    assert AuditContext.deduplicate_reasons(reasons) == expected

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -15,14 +15,15 @@
 from eligibility_signposting_api.model.campaign_config import (
     AvailableAction,
     CohortLabel,
+    CommsRouting,
     Description,
     RuleAttributeLevel,
     RuleAttributeName,
     RuleAttributeTarget,
     RuleComparator,
     RuleName,
     RuleOperator,
-    RuleType, CommsRouting,
+    RuleType,
 )
 from eligibility_signposting_api.model.eligibility_status import (
     ActionCode,
@@ -2354,7 +2355,6 @@ def test_build_condition_results_single_cohort(self, reason_2, expected_reasons)
 @pytest.mark.parametrize(
     ("status", "status_text", "action_rule", "action_status_text", "iteration_status_text"),
     [
-
         # Scenario: Patient is actionable, no Status Text, no override present
         # Expected: Hardcoded value
         pytest.param(
@@ -2515,7 +2515,7 @@ def test_build_condition_results_single_cohort(self, reason_2, expected_reasons)
         ),
     ],
 )
-def test_configureable_status_text(
+def test_configureable_status_text(  # noqa: PLR0913
     faker: Faker,
     status: Status,
     status_text: str,
@@ -2528,11 +2528,7 @@ def test_configureable_status_text(
     date_of_birth = DateOfBirth(faker.date_of_birth(minimum_age=85, maximum_age=85))
 
     person_rows = person_rows_builder(
-        nhs_number,
-        date_of_birth=date_of_birth,
-        cohorts=["rsv_cohort_1"],
-        icb="QE1",
-        postcode="SW19"
+        nhs_number, date_of_birth=date_of_birth, cohorts=["rsv_cohort_1"], icb="QE1", postcode="SW19"
     )
 
     if status == Status.actionable:
@@ -2547,25 +2543,25 @@ def test_configureable_status_text(
 
     scenario_rules = [
         rule_builder.PersonAgeSuppressionRuleFactory.build(
-                                type=RuleType.filter,
-                                name=RuleName("NotEligible Reason 1"),
-                                description=RuleText("NotEligible Description 1"),
-                                priority=RulePriority("100"),
-                                operator=RuleOperator.year_lte,
-                                attribute_level=RuleAttributeLevel.PERSON,
-                                attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
-                                comparator=RuleComparator(filter_comparator),
-                            ),
+            type=RuleType.filter,
+            name=RuleName("NotEligible Reason 1"),
+            description=RuleText("NotEligible Description 1"),
+            priority=RulePriority("100"),
+            operator=RuleOperator.year_lte,
+            attribute_level=RuleAttributeLevel.PERSON,
+            attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
+            comparator=RuleComparator(filter_comparator),
+        ),
         rule_builder.PersonAgeSuppressionRuleFactory.build(
-                                type=RuleType.suppression,
-                                name=RuleName("NotActionable Reason 1"),
-                                description=RuleText("NotActionable Description 1"),
-                                priority=RulePriority("110"),
-                                operator=RuleOperator.year_lte,
-                                attribute_level=RuleAttributeLevel.PERSON,
-                                attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
-                                comparator=RuleComparator(suppression_comparator),
-                            ),
+            type=RuleType.suppression,
+            name=RuleName("NotActionable Reason 1"),
+            description=RuleText("NotActionable Description 1"),
+            priority=RulePriority("110"),
+            operator=RuleOperator.year_lte,
+            attribute_level=RuleAttributeLevel.PERSON,
+            attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
+            comparator=RuleComparator(suppression_comparator),
+        ),
         action_rule,
     ]
     campaign_configs = [
@@ -2574,16 +2570,15 @@ def test_configureable_status_text(
             iterations=[
                 rule_builder.IterationFactory.build(
                     status_text=iteration_status_text,
-
                     iteration_cohorts=[
                         rule_builder.IterationCohortFactory.build(
                             cohort_label="rsv_cohort_1", cohort_group="rsv_cohort_group", priority=0
                         ),
                     ],
                     iteration_rules=scenario_rules,
-
                     actions_mapper=rule_builder.ActionsMapperFactory.build(
-                        root={"STATUS_TEXT_OVERRIDE": action_status_text}),
+                        root={"STATUS_TEXT_OVERRIDE": action_status_text}
+                    ),
                 )
             ],
         )
@@ -2603,11 +2598,9 @@ def test_configureable_status_text(
                 .and_status(status)
                 .and_status_text(StatusText(status_text))
             )
-        )
+        ),
     )
-    assert_that(
-        actual.conditions[0].actions,
-        is_([]))
+    assert_that(actual.conditions[0].actions, is_([]))
 
 
 def test_configureable_status_text_exclude_actions(faker: Faker):
@@ -2639,7 +2632,6 @@ def test_configureable_status_text_exclude_actions(faker: Faker):
                         NotActionable="Orignal you are not actionable status text",
                         Actionable="Orignal you are actionable status text",
                     ),
-
                     iteration_cohorts=[
                         rule_builder.IterationCohortFactory.build(
                             cohort_label="rsv_cohort_1", cohort_group="rsv_cohort_group", priority=0
@@ -2656,7 +2648,6 @@ def test_configureable_status_text_exclude_actions(faker: Faker):
                             attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
                             comparator=RuleComparator("-90"),
                         ),
-
                         rule_builder.PersonAgeSuppressionRuleFactory.build(
                             type=RuleType.suppression,
                             name=RuleName("NotActionable Reason 1"),
@@ -2670,11 +2661,10 @@ def test_configureable_status_text_exclude_actions(faker: Faker):
                         rule_builder.ICBRedirectRuleFactory.build(
                             comms_routing=CommsRouting("STATUS_TEXT_OVERRIDE_ACTIONABLE")
                         ),
-
                     ],
-
                     actions_mapper=rule_builder.ActionsMapperFactory.build(
-                        root={"STATUS_TEXT_OVERRIDE_ACTIONABLE": action_status_text_override_actionable}),
+                        root={"STATUS_TEXT_OVERRIDE_ACTIONABLE": action_status_text_override_actionable}
+                    ),
                 )
             ],
         )
@@ -2693,13 +2683,15 @@ def test_configureable_status_text_exclude_actions(faker: Faker):
                 .with_condition_name(ConditionName("RSV"))
                 .and_status(Status.actionable)
                 .and_status_text(StatusText("Orignal you are actionable status text"))
-
-            )))
+            )
+        ),
+    )
     assert_that(
         actual.conditions[0].actions,
         is_(None),
     )
 
+
 def test_configureable_status_text_multiple_actions(faker: Faker):
     # Patient is actionable and there are multiple actions. Testing override does not change action
     # Given
@@ -2735,7 +2727,6 @@ def test_configureable_status_text_multiple_actions(faker: Faker):
                         NotActionable="Orignal you are not actionable status text",
                         Actionable="Orignal you are actionable status text",
                     ),
-
                     iteration_cohorts=[
                         rule_builder.IterationCohortFactory.build(
                             cohort_label="rsv_cohort_1", cohort_group="rsv_cohort_group", priority=0
@@ -2752,7 +2743,6 @@ def test_configureable_status_text_multiple_actions(faker: Faker):
                             attribute_name=RuleAttributeName("DATE_OF_BIRTH"),
                             comparator=RuleComparator("-90"),
                         ),
-
                         rule_builder.PersonAgeSuppressionRuleFactory.build(
                             type=RuleType.suppression,
                             name=RuleName("NotActionable Reason 1"),
@@ -2766,14 +2756,13 @@ def test_configureable_status_text_multiple_actions(faker: Faker):
                         rule_builder.ICBRedirectRuleFactory.build(
                             comms_routing=CommsRouting("STATUS_TEXT_OVERRIDE_ACTIONABLE|BOOK_NBS")
                         ),
-
                     ],
-
                     actions_mapper=rule_builder.ActionsMapperFactory.build(
                         root={
                             "STATUS_TEXT_OVERRIDE_ACTIONABLE": action_status_text_override_actionable,
                             "BOOK_NBS": action_book_nbs,
-                            }),
+                        }
+                    ),
                 )
             ],
         )
@@ -2792,8 +2781,9 @@ def test_configureable_status_text_multiple_actions(faker: Faker):
                 .with_condition_name(ConditionName("RSV"))
                 .and_status(Status.actionable)
                 .and_status_text(StatusText("Status Text Override Actionable"))
-
-            )))
+            )
+        ),
+    )
     assert_that(len(actual.conditions[0].actions), is_(1))
     assert_that(actual.conditions[0].actions[0].action_code, is_(ActionCode("BookNBS")))
-    assert_that(actual.conditions[0].actions[0].internal_action_code, is_(InternalActionCode("BOOK_NBS")))
+    assert_that(actual.conditions[0].actions[0].internal_action_code, is_(InternalActionCode("BOOK_NBS")))