lint fix

Author: Karthikeyannhs

src/eligibility_signposting_api/model/campaign_config.py

@@ -274,12 +274,18 @@ class Iteration(BaseModel):
     def parse_dates(cls, v: str | date) -> date:
         if isinstance(v, date):
             return v
-        if not re.fullmatch(r"\d{8}", str(v)):
-            raise ValueError(f"Invalid format: {v}. Must be YYYYMMDD with 8 digits.")
+
+        v_str = str(v)
+
+        if not re.fullmatch(r"\d{8}", v_str):
+            msg = f"Invalid format: {v_str}. Must be YYYYMMDD with 8 digits."
+            raise ValueError(msg)
+
         try:
-            return datetime.strptime(str(v), "%Y%m%d").date()  # noqa: DTZ007
-        except ValueError:
-            raise ValueError(f"Invalid date value: {v}. Must be a valid calendar date in YYYYMMDD format.")
+            return datetime.strptime(v_str, "%Y%m%d").date()  # noqa: DTZ007
+        except ValueError as err:
+            msg = f"Invalid date value: {v_str}. Must be a valid calendar date in YYYYMMDD format."
+            raise ValueError(msg) from err
 
     @field_serializer("iteration_date", when_used="always")
     @staticmethod
@@ -322,12 +328,18 @@ class CampaignConfig(BaseModel):
     def parse_dates(cls, v: str | date) -> date:
         if isinstance(v, date):
             return v
-        if not re.fullmatch(r"\d{8}", str(v)):
-            raise ValueError(f"Invalid format: {v}. Must be YYYYMMDD with 8 digits.")
+
+        v_str = str(v)
+
+        if not re.fullmatch(r"\d{8}", v_str):
+            msg = f"Invalid format: {v_str}. Must be YYYYMMDD with 8 digits."
+            raise ValueError(msg)
+
         try:
-            return datetime.strptime(str(v), "%Y%m%d").date()  # noqa: DTZ007
-        except ValueError:
-            raise ValueError(f"Invalid date value: {v}. Must be a valid calendar date in YYYYMMDD format.")
+            return datetime.strptime(v_str, "%Y%m%d").date()  # noqa: DTZ007
+        except ValueError as err:
+            msg = f"Invalid date value: {v_str}. Must be a valid calendar date in YYYYMMDD format."
+            raise ValueError(msg) from err
 
     @field_serializer("start_date", "end_date", when_used="always")
     @staticmethod

src/rules_validation_api/validators/iteration_rules_validator.py

@@ -27,7 +27,7 @@ def check_cohort_label_for_non_f_and_s_types(self) -> typing.Self:
         allowed_types = {RuleType("F"), RuleType("S")}
         if self.cohort_label is not None and self.type not in allowed_types:
             msg = (
-                f"CohortLabel is only allowed for rule types F and S. "
+                "CohortLabel is only allowed for rule types F and S. "
                 f"Found type: {self.type} with cohort_label: {self.cohort_label}"
             )
             raise ValueError(msg)
@@ -39,12 +39,14 @@ def validate_attribute_name_is_optional_only_for_cohort_attribute_level(self) ->
             return self
         if self.attribute_level == RuleAttributeLevel.COHORT:
             return self
-        raise ValueError(f"AttributeName must be set where AttributeLevel is {self.attribute_level} .")
+        msg = f"AttributeName must be set where AttributeLevel is {self.attribute_level}."
+        raise ValueError(msg)
 
     @model_validator(mode="after")
     def validate_attribute_target_is_mandatory_for_target_attribute_level(self) -> typing.Self:
         if self.attribute_target:
             return self
         if self.attribute_level != RuleAttributeLevel.TARGET:
             return self
-        raise ValueError(f"AttributeTarget is mandatory where AttributeLevel is {self.attribute_level}.")
+        msg = f"AttributeTarget is mandatory where AttributeLevel is {self.attribute_level}."
+        raise ValueError(msg)