ELI 557 - Iteration Date must be >= Campaign Start Date AND <= Campaign End Date

Author: Karthikeyannhs

src/rules_validation_api/validators/campaign_config_validator.py

@@ -14,15 +14,19 @@ def validate_iterations(cls, iterations: list[Iteration]) -> list[IterationValid
         return [IterationValidation(**i.model_dump()) for i in iterations]
 
     @model_validator(mode="after")
-    def check_has_iteration_from_start(self) -> typing.Self:
+    def validate_campaign_has_iteration_within_schedule(self) -> typing.Self:
         iterations_by_date = sorted(self.iterations, key=attrgetter("iteration_date"))
         if first_iteration := next(iter(iterations_by_date), None):
-            if first_iteration.iteration_date > self.start_date:
-                message = (
-                    f"campaign {self.id} starts on {self.start_date}, "
-                    f"1st iteration starts later - {first_iteration.iteration_date}"
+            if first_iteration.iteration_date < self.start_date:
+                raise ValueError(
+                    f"Iteration {first_iteration.id} starts before campaign {self.id} "
+                    f"start date {self.start_date}."
+                )
+            if first_iteration.iteration_date > self.end_date:
+                raise ValueError(
+                    f"Iteration {first_iteration.id} starts after campaign {self.id} "
+                    f"end date {self.end_date}."
                 )
-                raise ValueError(message)
             return self
         # Should never happen, since we are constraining self.iterations with a min_length of 1
         message = f"campaign {self.id} has no iterations."

tests/unit/validation/test_campaign_config_validator.py

@@ -196,8 +196,8 @@ class TestBUCValidations:
         ("start_date", "end_date"),
         [
             ("20250101", "20250331"),  # valid range
-            ("20250601", "20250630"),  # valid short range
-            ("20250101", "20250101"),  # same day
+            ("20250201", "20250228"),  # valid short range
+            ("20250202", "20250202"),  # same day
         ],
     )
     def test_valid_start_and_end_dates_and_iteration_dates_relation(
@@ -206,14 +206,14 @@ def test_valid_start_and_end_dates_and_iteration_dates_relation(
         data = valid_campaign_config_with_only_mandatory_fields.copy()
         data["StartDate"] = start_date
         data["EndDate"] = end_date
-        data["Iterations"][0]["IterationDate"] = "20241231"
+        data["Iterations"][0]["IterationDate"] = "20250202"
         CampaignConfigValidation(**data)
 
     @pytest.mark.parametrize(
         ("start_date", "end_date"),
         [
-            ("20241230", "20250101"),  # campaign start date is after the iteration date
-            ("20250331", "20250101"),  # end before start
+            ("20241230", "20250101"),  # Campaign start date is after the iteration date
+            ("20240729", "20241228"),  # Campaign ends date is before the iteration date
         ],
     )
     def test_invalid_start_and_end_dates_and_iteration_dates_relation(
@@ -222,7 +222,7 @@ def test_invalid_start_and_end_dates_and_iteration_dates_relation(
         data = valid_campaign_config_with_only_mandatory_fields.copy()
         data["StartDate"] = start_date
         data["EndDate"] = end_date
-        data["Iterations"][0]["IterationDate"] = "20241231"
+        data["Iterations"][0]["IterationDate"] = "20241229"
         with pytest.raises(ValidationError):
             CampaignConfigValidation(**data)