Refactor campaign delivery decision paths

src/govoplan_campaign/backend/schemas.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
-from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator, model_validator
+from pydantic import BaseModel, BeforeValidator, ConfigDict, Field, ValidationInfo, field_validator, model_validator
 
 from govoplan_core.api.v1.schemas import DeltaDeletedItem
 from govoplan_campaign.backend.campaign.mail_profile_boundary import (
@@ -570,62 +570,67 @@ class CampaignActionResponse(BaseModel):
     result: dict[str, Any]
 
 
+def _valid_report_email_domain(domain: str) -> bool:
+    if not domain or domain.startswith(".") or domain.endswith(".") or ".." in domain:
+        return False
+    return all(
+        label
+        and not label.startswith("-")
+        and not label.endswith("-")
+        and all(character.isalnum() or character == "-" for character in label)
+        for label in domain.split(".")
+    )
+
+
+def _normalize_report_recipient(value: Any) -> str:
+    if not isinstance(value, str):
+        raise ValueError("report recipients must be email-address strings")
+    recipient = value.strip()
+    if len(recipient) > 320:
+        raise ValueError("report recipient addresses must be at most 320 characters")
+    if any(ord(character) < 32 or ord(character) == 127 for character in recipient):
+        raise ValueError("report recipient addresses must not contain control characters")
+    if recipient.count("@") != 1:
+        raise ValueError("report recipients must be email addresses")
+    local, domain = recipient.split("@", 1)
+    invalid_local = not local or local.startswith(".") or local.endswith(".") or ".." in local
+    invalid_address = (
+        any(character.isspace() for character in recipient)
+        or any(character in ',;:<>[]()\\"' for character in recipient)
+    )
+    if invalid_local or invalid_address or not _valid_report_email_domain(domain):
+        raise ValueError("report recipients must be email addresses")
+    return recipient
+
+
+ReportEmailAddress = Annotated[str, BeforeValidator(_normalize_report_recipient)]
+
+
+def _deduplicate_report_recipients(value: list[str]) -> list[str]:
+    recipients: list[str] = []
+    seen: set[str] = set()
+    for recipient in value:
+        key = recipient.casefold()
+        if key not in seen:
+            seen.add(key)
+            recipients.append(recipient)
+    return recipients
+
+
 class ReportEmailRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    to: list[str] = Field(min_length=1, max_length=50)
+    to: list[ReportEmailAddress] = Field(min_length=1, max_length=50)
     version_id: str | None = None
     include_jobs: bool = False
     attach_jobs_csv: bool = False
     attach_report_json: bool = False
     dry_run: bool = False
 
-    @field_validator("to", mode="before")
+    @field_validator("to")
     @classmethod
-    def normalize_and_validate_recipients(cls, value: Any) -> Any:
-        if not isinstance(value, list):
-            return value
-        if not 1 <= len(value) <= 50:
-            raise ValueError("report email requires between 1 and 50 recipients")
-        recipients: list[str] = []
-        seen: set[str] = set()
-        for item in value:
-            if not isinstance(item, str):
-                raise ValueError("report recipients must be email-address strings")
-            recipient = item.strip()
-            if len(recipient) > 320:
-                raise ValueError("report recipient addresses must be at most 320 characters")
-            if any(ord(character) < 32 or ord(character) == 127 for character in recipient):
-                raise ValueError("report recipient addresses must not contain control characters")
-            if recipient.count("@") != 1:
-                raise ValueError("report recipients must be email addresses")
-            local, domain = recipient.split("@", 1)
-            if (
-                not local
-                or not domain
-                or any(character.isspace() for character in recipient)
-                or any(character in ',;:<>[]()\\"' for character in recipient)
-                or local.startswith(".")
-                or local.endswith(".")
-                or ".." in local
-                or domain.startswith(".")
-                or domain.endswith(".")
-                or ".." in domain
-                or any(
-                    not label
-                    or label.startswith("-")
-                    or label.endswith("-")
-                    or not all(character.isalnum() or character == "-" for character in label)
-                    for label in domain.split(".")
-                )
-            ):
-                raise ValueError("report recipients must be email addresses")
-            key = recipient.casefold()
-            if key in seen:
-                continue
-            seen.add(key)
-            recipients.append(recipient)
-        return recipients
+    def normalize_and_validate_recipients(cls, value: list[str]) -> list[str]:
+        return _deduplicate_report_recipients(value)
 
 
 class ReportEmailResponse(BaseModel):