Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/eligibility_signposting_api/model/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class CampaignConfig(BaseModel):
approver: str | None = Field(None, alias="Approver")
reviewer: str | None = Field(None, alias="Reviewer")
iteration_frequency: Literal["X", "D", "W", "M", "Q", "A"] = Field(..., alias="IterationFrequency")
iteration_type: Literal["A", "M", "S"] = Field(..., alias="IterationType")
iteration_type: Literal["A", "M", "S", "O"] = Field(..., alias="IterationType")
iteration_time: str | None = Field(None, alias="IterationTime")
default_comms_routing: str | None = Field(None, alias="DefaultCommsRouting")
start_date: StartDate = Field(..., alias="StartDate")
Expand Down
31 changes: 30 additions & 1 deletion tests/unit/services/calculators/test_eligibility_calculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pytest
from faker import Faker
from freezegun import freeze_time
from hamcrest import assert_that, contains_exactly, contains_inanyorder, equal_to, has_item, has_items
from hamcrest import assert_that, contains_exactly, contains_inanyorder, equal_to, has_item, has_items, is_in

from eligibility_signposting_api.model import rules
from eligibility_signposting_api.model import rules as rules_model
Expand Down Expand Up @@ -153,6 +153,35 @@ def test_only_live_campaigns_considered(faker: Faker):
)


@pytest.mark.parametrize(
"iteration_type",
["A", "M", "S", "O"],
)
def test_campaigns_with_applicable_iteration_types_considered(iteration_type: str, faker: Faker):
# Given
nhs_number = NHSNumber(faker.nhs_number())

person_rows = person_rows_builder(nhs_number)
campaign_configs = [rule_builder.CampaignConfigFactory.build(target="RSV", iteration_type=iteration_type)]

calculator = EligibilityCalculator(person_rows, campaign_configs)

# When
actual = calculator.evaluate_eligibility()

# Then
assert_that(
actual,
is_eligibility_status().with_conditions(
has_item(
is_condition()
.with_condition_name(ConditionName("RSV"))
.and_status(is_in([Status.actionable, Status.not_actionable, Status.not_eligible]))
),
),
)


def test_base_eligible_and_simple_rule_includes(faker: Faker):
# Given
nhs_number = NHSNumber(faker.nhs_number())
Expand Down