more tests

Author: Karthikeyannhs

tests/integration/conftest.py

@@ -1120,8 +1120,14 @@ def campaign_configs(request, s3_client: BaseClient, rules_bucket: BucketName) -
         request, "param", [("RSV", "RSV_campaign_id"), ("COVID", "COVID_campaign_id"), ("FLU", "FLU_campaign_id")]
     )
 
-    targets = [t for t, _id in raw]
-    campaign_id = [_id for t, _id in raw]
+    targets = []
+    campaign_id = []
+    status = []
+
+    for t, _id, *rest in raw:
+        targets.append(t)
+        campaign_id.append(_id)
+        status.append(rest[0] if rest else None)
 
     for i in range(len(targets)):
         campaign: CampaignConfig = rule.CampaignConfigFactory.build(
@@ -1148,6 +1154,10 @@ def campaign_configs(request, s3_client: BaseClient, rules_bucket: BucketName) -
                 )
             ],
         )
+
+        if status[i] == "inactive":
+            campaign.iterations[0].iteration_date = datetime.datetime.now(tz=datetime.UTC) + datetime.timedelta(days=7)
+
         campaign_data = {"CampaignConfig": campaign.model_dump(by_alias=True)}
         key = f"{campaign.name}.json"
         s3_client.put_object(

tests/integration/in_process/test_eligibility_endpoint.py

@@ -1090,26 +1090,44 @@ def test_valid_response_when_consumer_has_a_valid_campaign_config_mapping(  # no
     @pytest.mark.parametrize(
         ("consumer_id", "expected_campaign_id"),
         [
+            # Consumer is mapped only to RSV_campaign_id_1
             ("consumer-id-1", "RSV_campaign_id_1"),
+            # Consumer  is mapped only to RSV_campaign_id_2
             ("consumer-id-2", "RSV_campaign_id_2"),
+            # Edge-case : Consumer-id-3 is mapped to multiple active campaigns, so the first one is only considered.
+            ("consumer-id-3", "RSV_campaign_id_3"),
+            # Edge-case : Consumer is mapped to inactive RSV_campaign_id_5 and active RSV_campaign_id_6
+            ("consumer-id-4", "RSV_campaign_id_6"),
+            # Edge-case : Consumer is mapped only to inactive RSV_campaign_id_5
+            ("consumer-id-5", None),
         ],
     )
     @pytest.mark.parametrize(
         ("campaign_configs", "consumer_mappings", "requested_conditions", "requested_category"),
         [
             (
-                [("RSV", "RSV_campaign_id_1"), ("RSV", "RSV_campaign_id_2")],
+                [
+                    ("RSV", "RSV_campaign_id_1"),
+                    ("RSV", "RSV_campaign_id_2"),
+                    ("RSV", "RSV_campaign_id_3"),
+                    ("RSV", "RSV_campaign_id_4"),
+                    ("RSV", "RSV_campaign_id_5", "inactive"),  # inactive iteration
+                    ("RSV", "RSV_campaign_id_6"),
+                ],
                 {
                     "consumer-id-1": [{"Campaign": "RSV_campaign_id_1"}],
                     "consumer-id-2": [{"Campaign": "RSV_campaign_id_2"}],
+                    "consumer-id-3": [{"Campaign": "RSV_campaign_id_3"}, {"Campaign": "RSV_campaign_id_4"}],
+                    "consumer-id-4": [{"Campaign": "RSV_campaign_id_5"}, {"Campaign": "RSV_campaign_id_6"}],
+                    "consumer-id-5": [{"Campaign": "RSV_campaign_id_5"}],
                 },
                 "RSV",
                 "VACCINATIONS",
             )
         ],
         indirect=["campaign_configs", "consumer_mappings"],
     )
-    def test_if_correct_campaign_is_chosen_for_the_consumer_if_there_exists_multiple_campaign_per_target(  # noqa: PLR0913
+    def test_if_correct_campaign_is_chosen_for_the_consumer_if_there_exists_multiple_campaign_per_target(  # noqa : PLR0913
         self,
         client: FlaskClient,
         persisted_person: NHSNumber,
@@ -1138,5 +1156,8 @@ def test_if_correct_campaign_is_chosen_for_the_consumer_if_there_exists_multiple
         audit_data = json.loads(s3_client.get_object(Bucket=audit_bucket, Key=latest_key)["Body"].read())
 
         # Then
-        assert_that(len(audit_data["response"]["condition"]), equal_to(1))
-        assert_that(audit_data["response"]["condition"][0].get("campaignId"), equal_to(expected_campaign_id))
+        if expected_campaign_id is not None:
+            assert_that(len(audit_data["response"]["condition"]), equal_to(1))
+            assert_that(audit_data["response"]["condition"][0].get("campaignId"), equal_to(expected_campaign_id))
+        else:
+            assert_that(len(audit_data["response"]["condition"]), equal_to(0))