Skip to content

Commit 2e5021f

Browse files
lint fixes
1 parent 2c87daf commit 2e5021f

3 files changed

Lines changed: 17 additions & 6 deletions

File tree

src/eligibility_signposting_api/model/eligibility.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
from datetime import date
55
from enum import Enum, StrEnum, auto
66
from functools import total_ordering
7-
from typing import NewType, Self
7+
from typing import TYPE_CHECKING, NewType, Self
88

9-
from eligibility_signposting_api.model import rules
9+
if TYPE_CHECKING:
10+
from eligibility_signposting_api.model import rules
1011

1112
NHSNumber = NewType("NHSNumber", str)
1213
DateOfBirth = NewType("DateOfBirth", date)
@@ -78,6 +79,7 @@ class CohortStatus:
7879
status: Status
7980
reasons: list[Reason]
8081

82+
8183
@dataclass
8284
class IterationStatus:
8385
status: Status

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
from wireup import service
1212

1313
from eligibility_signposting_api.model import eligibility, rules
14-
from eligibility_signposting_api.model.eligibility import CohortStatus, Condition, ConditionName, Status, \
15-
IterationStatus
14+
from eligibility_signposting_api.model.eligibility import (
15+
CohortStatus,
16+
Condition,
17+
ConditionName,
18+
IterationStatus,
19+
Status,
20+
)
1621
from eligibility_signposting_api.services.calculators.rule_calculator import RuleCalculator
1722

1823
Row = Collection[Mapping[str, Any]]
@@ -135,7 +140,9 @@ def evaluate_eligibility(self) -> eligibility.EligibilityStatus:
135140
cohort_results[cohort.cohort_label] = CohortStatus(cohort, eligibility.Status.not_eligible, [])
136141

137142
# Determine Result between cohorts - get the best
138-
iteration_results[active_iteration.name] = IterationStatus(*self.get_best_cohort(cohort_results)) # multiple
143+
iteration_results[active_iteration.name] = IterationStatus(
144+
*self.get_best_cohort(cohort_results)
145+
) # multiple
139146
# Determine results between iterations - get the best
140147
best_candidate = max(iteration_results.values(), key=lambda r: r.status.value)
141148
results[condition_name] = best_candidate
@@ -241,7 +248,6 @@ def evaluate_priority_group(
241248
def evaluate_rules_priority_group(
242249
self, iteration_rule_group: Iterator[rules.IterationRule]
243250
) -> tuple[eligibility.Status, list[eligibility.Reason], list[eligibility.Reason]]:
244-
245251
exclusion_reasons, actionable_reasons = [], []
246252
exclude_capable_rules = [
247253
ir

tests/unit/services/calculators/test_eligibility_calculator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def test_not_base_eligible(faker: Faker):
4545
),
4646
)
4747

48+
4849
@pytest.mark.skip(reason="This test is temporarily ignored. Reason : magic cohort")
4950
@pytest.mark.parametrize(
5051
("person_cohorts", "iteration_cohorts", "test_comment"),
@@ -767,6 +768,7 @@ def test_status_on_cohort_attribute_level(faker: Faker):
767768
),
768769
)
769770

771+
770772
@pytest.mark.skip(reason="This test is temporarily ignored. Reason : Cohort label")
771773
@pytest.mark.parametrize(
772774
("person_cohorts", "cohort_label", "expected_status", "test_comment"),
@@ -812,6 +814,7 @@ def test_status_if_iteration_rules_contains_cohort_label_field(
812814
test_comment,
813815
)
814816

817+
815818
@pytest.mark.skip(reason="This test is temporarily ignored. Reason : Rules stop")
816819
@pytest.mark.parametrize(
817820
("rule_stop", "expected_status", "test_comment"),

0 commit comments

Comments
 (0)