Ensure deadline always falls on a weekday

scripts/generate_email_draft.py

@@ -356,7 +356,26 @@ def build_summary(entries: list[dict]) -> str:
     return f"Apple released security updates for {', '.join(product_names)}."
 
 
+def is_weekend(date: datetime) -> bool:
+    return date.weekday() >= 5  # Saturday=5, Sunday=6
+
+
+def next_weekday(date: datetime) -> datetime:
+    """Return the next weekday (Mon-Fri) after the given date.
+
+    If the date is already a weekday, return it unchanged.
+    If it's Saturday, return Monday.
+    If it's Sunday, return Monday.
+    """
+    if date.weekday() == 5:  # Saturday
+        return date + timedelta(days=2)
+    if date.weekday() == 6:  # Sunday
+        return date + timedelta(days=1)
+    return date
+
+
 def build_deadline(config: dict, release_date: str | None) -> str | None:
+    """Build deadline string, ensuring it falls on a weekday."""
     explicit_deadline = config.get("deadline")
     if explicit_deadline:
         return explicit_deadline
@@ -366,9 +385,16 @@ def build_deadline(config: dict, release_date: str | None) -> str | None:
         return None
 
     offset_days = int(config.get("deadline_offset_days", 4))
+    # Ensure minimum 3 working days (skip weekend if needed)
+    offset_days = max(3, offset_days)
+
     deadline_time = config.get("deadline_time", "18:00")
     deadline_timezone = config.get("deadline_timezone", "CET")
     deadline_date = parsed_release_date + timedelta(days=offset_days)
+
+    # Ensure deadline falls on a weekday (Mon-Fri)
+    deadline_date = next_weekday(deadline_date)
+
     return f"{deadline_date.strftime('%Y-%m-%d')} {deadline_time} {deadline_timezone}"