lint fix

Author: Karthikeyannhs

src/rules_validation_api/validators/campaign_config_validator.py

@@ -9,45 +9,43 @@
 
 
 class CampaignConfigValidation(CampaignConfig):
-
     @field_validator("iterations")
     @classmethod
     def validate_iterations(cls, iterations: list[Iteration]) -> list[IterationValidation]:
         return [IterationValidation(**i.model_dump()) for i in iterations]
 
     @model_validator(mode="after")
     def validate_approval_minimum_is_less_than_or_equal_to_approval_maximum(self) -> typing.Self:
-        if self.approval_minimum > self.approval_maximum:
-            raise ValueError(
-                f"approval_minimum {self.approval_minimum} is greater than approval_maximum {self.approval_maximum}"
-            )
+        if self.approval_minimum and self.approval_maximum:
+            if self.approval_minimum > self.approval_maximum:
+                msg = f"approval_minimum {self.approval_minimum} > approval_maximum {self.approval_maximum}"
+                raise ValueError(msg)
+            return self
         return self
 
     @model_validator(mode="after")
     def validate_iterations_have_unique_id(self) -> typing.Self:
         ids = [iteration.id for iteration in self.iterations]
         duplicates = {i_id for i_id, count in Counter(ids).items() if count > 1}
         if duplicates:
-            raise ValueError(
-                f"Iterations contain duplicate IDs: {', '.join(duplicates)}"
-            )
+            msg = f"Iterations contain duplicate IDs: {', '.join(duplicates)}"
+            raise ValueError(msg)
         return self
 
     @model_validator(mode="after")
     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:
-                raise ValueError(
-                    f"Iteration {first_iteration.id} starts before campaign {self.id} "
-                    f"start date {self.start_date}."
-                )
+                msg = f"Iteration {first_iteration.id} starts before campaign {self.id} start date {self.start_date}."
+                raise ValueError(msg)
+
             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}."
-                )
+                msg = f"Iteration {first_iteration.id} starts after campaign {self.id} end date {self.end_date}."
+                raise ValueError(msg)
+
             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."
-        raise ValueError(message)
+        msg = f"campaign {self.id} has no iterations."
+        raise ValueError(msg)

tests/unit/validation/test_campaign_config_validator.py

@@ -234,10 +234,12 @@ def test_validate_iterations_non_empty(self, valid_campaign_config_with_only_man
         errors = error.value.errors()
         assert any(e["loc"][-1] == "Iterations" for e in errors), "Expected validation error on 'Iterations'"
 
-    def test_unique_iteration_ids(self, valid_campaign_config_with_only_mandatory_fields, valid_iteration_with_only_mandatory_fields):
+    def test_unique_iteration_ids(
+        self, valid_campaign_config_with_only_mandatory_fields, valid_iteration_with_only_mandatory_fields
+    ):
         data = valid_campaign_config_with_only_mandatory_fields.copy()
         data["Iterations"].append(valid_iteration_with_only_mandatory_fields.copy())
-        data["Iterations"][1]["ID"] =  data["Iterations"][0]["ID"]
+        data["Iterations"][1]["ID"] = data["Iterations"][0]["ID"]
         with pytest.raises(ValidationError) as exc_info:
             CampaignConfigValidation(**data)
 
@@ -248,8 +250,9 @@ def test_unique_iteration_ids(self, valid_campaign_config_with_only_mandatory_fi
         duplicate_id = data["Iterations"][0]["ID"]
         assert f"Iterations contain duplicate IDs: {duplicate_id}" in error_message
 
-
-    def test_error_approval_minimum_is_greater_than_approval_maximum(self, valid_campaign_config_with_only_mandatory_fields):
+    def test_error_approval_minimum_is_greater_than_approval_maximum(
+        self, valid_campaign_config_with_only_mandatory_fields
+    ):
         data = valid_campaign_config_with_only_mandatory_fields.copy()
         data["ApprovalMinimum"] = 2
         data["ApprovalMaximum"] = 1
@@ -261,15 +264,15 @@ def test_error_approval_minimum_is_greater_than_approval_maximum(self, valid_cam
         [
             (1, 2),
             (1, 1),
-        ]
+        ],
     )
     def test_approval_minimum_greater_than_approval_maximum_is_invalid(
-        self, valid_campaign_config_with_only_mandatory_fields,
+        self,
+        valid_campaign_config_with_only_mandatory_fields,
         approval_min,
         approval_max,
     ):
         data = valid_campaign_config_with_only_mandatory_fields.copy()
         data["ApprovalMinimum"] = approval_min
         data["ApprovalMaximum"] = approval_max
         CampaignConfigValidation(**data)
-