refer status of magic cohorts based on other cohorts info

Author: Karthikeyannhs

src/eligibility_signposting_api/views/eligibility.py

@@ -1,6 +1,5 @@
 import logging
 import uuid
-from collections import defaultdict
 from datetime import UTC, datetime
 from http import HTTPStatus
 
@@ -70,22 +69,14 @@ def build_eligibility_response(eligibility_status: EligibilityStatus) -> eligibi
 
 
 def build_eligibility_cohorts(condition: Condition) -> list[eligibility.EligibilityCohort]:
-    """Group Iteration cohorts and make only one entry per cohort group"""
-
-    grouped_cohort_results = defaultdict(list)
-
-    for cohort_result in condition.cohort_results:
-        if condition.status == cohort_result.status:
-            grouped_cohort_results[cohort_result.cohort_code].append(cohort_result)
-
     return [
         eligibility.EligibilityCohort(
-            cohortCode=cohort_group_code,
-            cohortText=cohort_group[0].description,
-            cohortStatus=STATUS_MAPPING[cohort_group[0].status],
+            cohortCode=eligibility.CohortCode(cohort_result.cohort_code),
+            cohortText=eligibility.CohortText(cohort_result.description),
+            cohortStatus=STATUS_MAPPING[cohort_result.status],
         )
-        for cohort_group_code, cohort_group in grouped_cohort_results.items()
-        if cohort_group
+        for cohort_result in condition.cohort_results
+        if cohort_result and cohort_result.cohort_code and cohort_result.cohort_code.strip()
     ]
 
 

tests/integration/conftest.py

@@ -282,7 +282,7 @@ def bucket(s3_client: BaseClient) -> Generator[BucketName]:
     s3_client.delete_bucket(Bucket=bucket_name)
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="class")
 def campaign_config(s3_client: BaseClient, bucket: BucketName) -> Generator[rules.CampaignConfig]:
     campaign: rules.CampaignConfig = rule.CampaignConfigFactory.build(
         target="RSV",
@@ -309,3 +309,25 @@ def campaign_config(s3_client: BaseClient, bucket: BucketName) -> Generator[rule
     )
     yield campaign
     s3_client.delete_object(Bucket=bucket, Key=f"{campaign.name}.json")
+
+
+@pytest.fixture(scope="class")
+def campaign_config_with_magic_cohort(s3_client: BaseClient, bucket: BucketName) -> Generator[rules.CampaignConfig]:
+    campaign: rules.CampaignConfig = rule.CampaignConfigFactory.build(
+        target="COVID",
+        iterations=[
+            rule.IterationFactory.build(
+                iteration_rules=[
+                    rule.PostcodeSuppressionRuleFactory.build(type=rules.RuleType.filter),
+                    rule.PersonAgeSuppressionRuleFactory.build(),
+                ],
+                iteration_cohorts=[rule.IterationCohortFactory.build(cohort_label="elid_all_people")],
+            )
+        ],
+    )
+    campaign_data = {"CampaignConfig": campaign.model_dump(by_alias=True)}
+    s3_client.put_object(
+        Bucket=bucket, Key=f"{campaign.name}.json", Body=json.dumps(campaign_data), ContentType="application/json"
+    )
+    yield campaign
+    s3_client.delete_object(Bucket=bucket, Key=f"{campaign.name}.json")