more tests in IT

Author: Karthikeyannhs

tests/fixtures/matchers/eligibility.py

@@ -1,6 +1,6 @@
 from hamcrest.core.matcher import Matcher
 
-from eligibility_signposting_api.model.eligibility import Condition, EligibilityStatus, CohortResult, Reason
+from eligibility_signposting_api.model.eligibility import CohortResult, Condition, EligibilityStatus, Reason
 from eligibility_signposting_api.model.rules import IterationCohort
 
 from .meta import BaseAutoMatcher
@@ -14,6 +14,7 @@ class ConditionMatcher(BaseAutoMatcher[Condition]): ...
 
 class CohortResultMatcher(BaseAutoMatcher[CohortResult]): ...
 
+
 class ReasonMatcher(BaseAutoMatcher[Reason]): ...
 
 
@@ -31,12 +32,10 @@ def is_condition() -> Matcher[Condition]:
 def is_cohort_result() -> Matcher[CohortResult]:
     return CohortResultMatcher()
 
+
 def is_reason() -> Matcher[Reason]:
     return ReasonMatcher()
 
 
 def is_iteration_cohort() -> Matcher[IterationCohort]:
     return IterationCohortMatcher()
-
-
-

tests/integration/conftest.py

@@ -241,6 +241,31 @@ def persisted_77yo_person(person_table: Any, faker: Faker) -> Generator[eligibil
         person_table.delete_item(Key={"NHS_NUMBER": row["NHS_NUMBER"], "ATTRIBUTE_TYPE": row["ATTRIBUTE_TYPE"]})
 
 
+@pytest.fixture
+def persisted_person_no_cohorts(person_table: Any, faker: Faker) -> Generator[eligibility.NHSNumber]:
+    nhs_number = eligibility.NHSNumber(faker.nhs_number())
+
+    for row in (rows := person_rows_builder(nhs_number)):
+        person_table.put_item(Item=row)
+
+    yield nhs_number
+
+    for row in rows:
+        person_table.delete_item(Key={"NHS_NUMBER": row["NHS_NUMBER"], "ATTRIBUTE_TYPE": row["ATTRIBUTE_TYPE"]})
+
+
+@pytest.fixture
+def persisted_person_pc_sw19(person_table: Any, faker: Faker) -> Generator[eligibility.NHSNumber]:
+    nhs_number = eligibility.NHSNumber(faker.nhs_number())
+    for row in (rows := person_rows_builder(nhs_number, postcode="SW19")):
+        person_table.put_item(Item=row)
+
+    yield nhs_number
+
+    for row in rows:
+        person_table.delete_item(Key={"NHS_NUMBER": row["NHS_NUMBER"], "ATTRIBUTE_TYPE": row["ATTRIBUTE_TYPE"]})
+
+
 @pytest.fixture(scope="session")
 def bucket(s3_client: BaseClient) -> Generator[BucketName]:
     bucket_name = BucketName(os.getenv("RULES_BUCKET_NAME", "test-rules-bucket"))
@@ -255,7 +280,10 @@ def campaign_config(s3_client: BaseClient, bucket: BucketName) -> Generator[rule
         target="RSV",
         iterations=[
             rule.IterationFactory.build(
-                iteration_rules=[rule.PersonAgeSuppressionRuleFactory.build()],
+                iteration_rules=[
+                    rule.PostcodeSuppressionRuleFactory.build(type=rules.RuleType.filter),
+                    rule.PersonAgeSuppressionRuleFactory.build()
+                ],
                 iteration_cohorts=[rule.IterationCohortFactory.build(cohort_label="cohort1")],
             )
         ],
@@ -266,3 +294,5 @@ def campaign_config(s3_client: BaseClient, bucket: BucketName) -> Generator[rule
     )
     yield campaign
     s3_client.delete_object(Bucket=bucket, Key=f"{campaign.name}.json")
+
+

tests/integration/in_process/test_eligibility_endpoint.py

@@ -37,19 +37,42 @@ def test_no_nhs_number_given(client: FlaskClient):
     )
 
 
-def test_actionable_by_rule(client: FlaskClient, persisted_77yo_person: NHSNumber, campaign_config: CampaignConfig):  # noqa: ARG001
+def test_not_base_eligible(client: FlaskClient, persisted_person_no_cohorts: NHSNumber, campaign_config: CampaignConfig):  # noqa: ARG001
     # Given
 
     # When
-    response = client.get(f"/patient-check/{persisted_77yo_person}")
+    response = client.get(f"/patient-check/{persisted_person_no_cohorts}")
+
+    print("here is the respose")
+    print(response.text)
 
     # Then
     assert_that(
         response,
         is_response()
         .with_status_code(HTTPStatus.OK)
         .and_text(
-            is_json_that(has_entry("processedSuggestions", has_item(has_entries(condition="RSV", status="Actionable"))))
+            is_json_that(
+                has_entry("processedSuggestions", has_item(has_entries(condition="RSV", status="NotEligible")))
+            )
+        ),
+    )
+
+def test_not_eligible_by_rule(client: FlaskClient, persisted_person_pc_sw19: NHSNumber, campaign_config: CampaignConfig):  # noqa: ARG001
+    # Given
+
+    # When
+    response = client.get(f"/patient-check/{persisted_person_pc_sw19}")
+
+    # Then
+    assert_that(
+        response,
+        is_response()
+        .with_status_code(HTTPStatus.OK)
+        .and_text(
+            is_json_that(
+                has_entry("processedSuggestions", has_item(has_entries(condition="RSV", status="NotEligible")))
+            )
         ),
     )
 
@@ -71,3 +94,23 @@ def test_not_actionable_by_rule(client: FlaskClient, persisted_person: NHSNumber
             )
         ),
     )
+
+
+def test_actionable_by_rule(client: FlaskClient, persisted_77yo_person: NHSNumber, campaign_config: CampaignConfig):  # noqa: ARG001
+    # Given
+
+    # When
+    response = client.get(f"/patient-check/{persisted_77yo_person}")
+
+    # Then
+    assert_that(
+        response,
+        is_response()
+        .with_status_code(HTTPStatus.OK)
+        .and_text(
+            is_json_that(has_entry("processedSuggestions", has_item(has_entries(condition="RSV", status="Actionable"))))
+        ),
+    )
+
+
+

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -18,8 +18,13 @@
 from eligibility_signposting_api.services.calculators.eligibility_calculator import EligibilityCalculator
 from tests.fixtures.builders.model import rule as rule_builder
 from tests.fixtures.builders.repos.person import person_rows_builder
-from tests.fixtures.matchers.eligibility import is_condition, is_eligibility_status, is_cohort_result, is_reason, \
-    is_iteration_cohort
+from tests.fixtures.matchers.eligibility import (
+    is_cohort_result,
+    is_condition,
+    is_eligibility_status,
+    is_iteration_cohort,
+    is_reason,
+)
 
 
 def test_not_base_eligible(faker: Faker):
@@ -892,17 +897,13 @@ def test_rules_stop_behavior(
             has_items(
                 is_condition()
                 .with_condition_name(ConditionName("RSV"))
-                .and_status(
-                    equal_to(Status.not_actionable)
-                )
+                .and_status(equal_to(Status.not_actionable))
                 .and_cohort_results(
                     has_items(
-                        is_cohort_result()
-                        .with_reasons(
-                            contains_inanyorder(*[
-                                is_reason().with_rule_result(equal_to(result))
-                                for result in expected_reason_results
-                            ])
+                        is_cohort_result().with_reasons(
+                            contains_inanyorder(
+                                *[is_reason().with_rule_result(equal_to(result)) for result in expected_reason_results]
+                            )
                         )
                     )
                 )
@@ -991,10 +992,8 @@ def test_eligibility_results_when_multiple_cohorts(
                 .and_cohort_results(
                     contains_inanyorder(
                         *[
-                            is_cohort_result()
-                            .with_cohort(
-                                is_iteration_cohort()
-                                .with_cohort_label(equal_to(cohort_label))
+                            is_cohort_result().with_cohort(
+                                is_iteration_cohort().with_cohort_label(equal_to(cohort_label))
                             )
                             for cohort_label in expected_cohorts
                         ]
@@ -1003,4 +1002,3 @@ def test_eligibility_results_when_multiple_cohorts(
             )
         ),
     )
-