diff --git a/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py b/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py index 9a86e2ef..0423e533 100644 --- a/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py +++ b/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py @@ -63,11 +63,7 @@ def get_the_base_eligible_campaigns(self, campaign_group: list[rules.CampaignCon """Return campaigns for which the person is base eligible via cohorts.""" base_eligible_campaigns: list[rules.CampaignConfig] = [ - campaign - for campaign in campaign_group - if campaign.campaign_live - and campaign.current_iteration - and self.check_base_eligibility(campaign.current_iteration) + campaign for campaign in campaign_group if self.check_base_eligibility(campaign.current_iteration) ] if base_eligible_campaigns: @@ -91,8 +87,8 @@ def check_base_eligibility(self, iteration: rules.Iteration | None) -> set[str]: def evaluate_eligibility_by_iteration_rules( self, campaign_group: list[rules.CampaignConfig] ) -> tuple[eligibility.Status, list[eligibility.Reason]]: - """Evaluate iteration rules to see if the person is actionable, not actionable (due to "F" rules), - or not eligible (due to "S" rules"). + """Evaluate iteration rules to see if the person is actionable, not actionable (due to "S" rules), + or not eligible (due to "F" rules"). For each condition, evaluate all iterations for inclusion or exclusion."""