Make admin notification recipients configurable via ADMIN_EMAILS
Previously the To/Cc addresses were hardcoded in notifier.py (Andrea, Barbara, Markus). This caused accidental emails to production contacts during testing. Changes: - New ADMIN_EMAILS env var: comma-separated list of addresses. First address → To; remaining addresses → Cc. - AdminNotifier now accepts admin_emails list; warns and skips if empty. - Removed hardcoded _INDOOR_EMAIL / _OUTDOOR_EMAIL / _ADMIN_CC_EMAIL constants and the _recipients_for() routing method. - Config.from_env() parses ADMIN_EMAILS into a list. - main.py passes config.admin_emails to AdminNotifier. - .env.example documents the new variable with production example. - Tests: fixture updated; TestRecipientsFor removed (routing gone). For testing: ADMIN_EMAILS=you@example.com For production: ADMIN_EMAILS=andrea.sigrist@gmx.net,baba.laeubli@gmail.com,spielgruppen@familien-verein.ch https://claude.ai/code/session_01HaUFs7SaLD5SoiuGCY27Tw
This commit is contained in:
@@ -32,6 +32,11 @@ class Config:
|
||||
# Registration email address shown to parents
|
||||
registration_email: str = ""
|
||||
|
||||
# Admin notification recipients (comma-separated).
|
||||
# First address → To; remaining addresses → Cc.
|
||||
# Set to a single address (e.g. your own) during testing.
|
||||
admin_emails: list = field(default_factory=list)
|
||||
|
||||
# Storage
|
||||
data_dir: Path = field(default_factory=lambda: Path("data"))
|
||||
knowledge_base_dir: Path = field(
|
||||
@@ -56,6 +61,11 @@ class Config:
|
||||
smtp_port=int(os.getenv("SMTP_PORT", "587")),
|
||||
smtp_use_tls=os.getenv("SMTP_USE_TLS", "true").lower() == "true",
|
||||
registration_email=os.getenv("REGISTRATION_EMAIL", ""),
|
||||
admin_emails=[
|
||||
e.strip()
|
||||
for e in os.getenv("ADMIN_EMAILS", "").split(",")
|
||||
if e.strip()
|
||||
],
|
||||
data_dir=Path(os.getenv("DATA_DIR", "data")),
|
||||
knowledge_base_dir=Path(
|
||||
os.getenv(
|
||||
|
||||
@@ -10,11 +10,6 @@ from ..models.registration import RegistrationData
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Notification routing per spec
|
||||
_INDOOR_EMAIL = "andrea.sigrist@gmx.net"
|
||||
_OUTDOOR_EMAIL = "baba.laeubli@gmail.com"
|
||||
_ADMIN_CC_EMAIL = "spielgruppen@familien-verein.ch"
|
||||
|
||||
|
||||
class AdminNotifier:
|
||||
"""Sends formatted admin notification emails.
|
||||
@@ -34,6 +29,7 @@ class AdminNotifier:
|
||||
password: str,
|
||||
use_tls: bool = True,
|
||||
from_email: str = "",
|
||||
admin_emails: list[str] | None = None,
|
||||
) -> None:
|
||||
self._smtp_host = smtp_host
|
||||
self._smtp_port = smtp_port
|
||||
@@ -41,6 +37,7 @@ class AdminNotifier:
|
||||
self._password = password
|
||||
self._use_tls = use_tls
|
||||
self._from_email = from_email or username
|
||||
self._admin_emails: list[str] = admin_emails or []
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Public API
|
||||
@@ -55,9 +52,11 @@ class AdminNotifier:
|
||||
channel: str,
|
||||
) -> None:
|
||||
"""Send notification for a newly completed registration (version 1)."""
|
||||
types = registration.booking.playgroup_types
|
||||
to_addresses = self._recipients_for(types)
|
||||
if not self._admin_emails:
|
||||
logger.warning("ADMIN_EMAILS not configured — new-registration notification skipped.")
|
||||
return
|
||||
|
||||
types = registration.booking.playgroup_types
|
||||
subject = (
|
||||
f"Neue Anmeldung: {registration.child.full_name} "
|
||||
f"– {self._format_types(types)}"
|
||||
@@ -65,8 +64,8 @@ class AdminNotifier:
|
||||
body = self._build_new_body(registration, registration_id, version, channel)
|
||||
|
||||
self._send(
|
||||
to=to_addresses,
|
||||
cc=[_ADMIN_CC_EMAIL],
|
||||
to=[self._admin_emails[0]],
|
||||
cc=self._admin_emails[1:],
|
||||
subject=subject,
|
||||
body=body,
|
||||
reply_to=registration.parent_guardian.email or "",
|
||||
@@ -81,15 +80,16 @@ class AdminNotifier:
|
||||
conversation_id: str,
|
||||
) -> None:
|
||||
"""Send notification when an existing registration is updated."""
|
||||
types = registration.booking.playgroup_types
|
||||
to_addresses = self._recipients_for(types)
|
||||
if not self._admin_emails:
|
||||
logger.warning("ADMIN_EMAILS not configured — update notification skipped.")
|
||||
return
|
||||
|
||||
subject = f"Anmeldung aktualisiert: {registration.child.full_name}"
|
||||
body = self._build_update_body(registration, registration_id, version, change_summary)
|
||||
|
||||
self._send(
|
||||
to=to_addresses,
|
||||
cc=[_ADMIN_CC_EMAIL],
|
||||
to=[self._admin_emails[0]],
|
||||
cc=self._admin_emails[1:],
|
||||
subject=subject,
|
||||
body=body,
|
||||
reply_to=registration.parent_guardian.email or "",
|
||||
@@ -99,15 +99,6 @@ class AdminNotifier:
|
||||
# Formatting helpers
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
@staticmethod
|
||||
def _recipients_for(types: list[str]) -> list[str]:
|
||||
recipients = []
|
||||
if "indoor" in types:
|
||||
recipients.append(_INDOOR_EMAIL)
|
||||
if "outdoor" in types:
|
||||
recipients.append(_OUTDOOR_EMAIL)
|
||||
return recipients
|
||||
|
||||
@staticmethod
|
||||
def _format_types(types: list[str]) -> str:
|
||||
has_indoor = "indoor" in types
|
||||
|
||||
Reference in New Issue
Block a user