Skip to content

Test/already vaccinated long ago #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karthikeyannhs merged 3 commits into from
May 21, 2025
Merged

Test/already vaccinated long ago #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a30a7fe
more test for already vaccinated scenarios | Simon
Karthikeyannhs May 21, 2025
11230ce
flask - CVE-2025-47278 - vulnerability fixes
Karthikeyannhs May 21, 2025
33d64c6
Merge branch 'main' into test/already_vaccinated_long_ago
Karthikeyannhs May 21, 2025
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
19 changes: 10 additions & 9 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry.dependencies]
python = "^3.13"
flask = {extras = ["async"], version = "^3.1.0"}
flask = {extras = ["async"], version = "^3.1.1"}
httpx = "^0.28.1"
yarl = "^1.18.3"
pydantic = "^2.10.6"
Expand Down
23 changes: 19 additions & 4 deletions tests/unit/services/calculators/test_eligibility_calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,11 @@ def test_base_eligible_and_icb_example(
@pytest.mark.parametrize(
("last_successful_date", "expected_status", "test_comment"),
[
("20240101", Status.not_actionable, "last_successful_date is a past date"),
("20240601", Status.not_actionable, "last_successful_date is a past date"),
("20250101", Status.not_actionable, "last_successful_date is today"),
# Below is a non-ideal situation (might be due to a data entry error), so considered as actionable.
("20260101", Status.actionable, "last_successful_date is a future date"),
("20230601", Status.actionable, "last_successful_date is a long past"),
("", Status.actionable, "last_successful_date is empty"),
(None, Status.actionable, "last_successful_date is none"),
],
Expand Down Expand Up @@ -658,14 +659,28 @@ def test_not_actionable_status_on_target_when_last_successful_date_lte_today(
iteration_rules=[
rule_builder.IterationRuleFactory.build(
type=rules.RuleType.suppression,
name=rules.RuleName("You have already been vaccinated against RSV"),
description=rules.RuleDescription("Exclude anyone Completed RSV Vaccination"),
name=rules.RuleName("You have already been vaccinated against RSV in the last year"),
description=rules.RuleDescription(
"Exclude anyone Completed RSV Vaccination in the last year"
),
priority=10,
operator=rules.RuleOperator.day_gte,
attribute_level=rules.RuleAttributeLevel.TARGET,
attribute_name=rules.RuleAttributeName("LAST_SUCCESSFUL_DATE"),
comparator=rules.RuleComparator("-365"),
attribute_target=rules.RuleAttributeTarget("RSV"),
),
rule_builder.IterationRuleFactory.build(
type=rules.RuleType.suppression,
name=rules.RuleName("You have a future booking to be vaccinated against RSV"),
description=rules.RuleDescription("Exclude anyone with future Completed RSV Vaccination"),
priority=10,
operator=rules.RuleOperator.day_lte,
attribute_level=rules.RuleAttributeLevel.TARGET,
attribute_name=rules.RuleAttributeName("LAST_SUCCESSFUL_DATE"),
comparator=rules.RuleComparator("0"),
attribute_target=rules.RuleAttributeTarget("RSV"),
)
),
],
iteration_cohorts=[rule_builder.IterationCohortFactory.build(cohort_label="cohort1")],
)
Expand Down
Loading