fix: surface all calendar sync failures, not just Google

CalDAV and Home Assistant sync failures were previously only logged
server-side, leaving clients unable to distinguish an empty calendar
from a broken sync. Unify error reporting across CalDAV, Home
Assistant, and Google into a single errors list on GET
/api/caldav/events, shaped as {source, name, message}. Messages are
fixed generic strings, never raw exception text, to avoid leaking
URLs or credential fragments. get_ha_events and get_google_events now
return (events, errors) tuples so per-calendar failures propagate to
the caller in addition to account-level failures. Frontend toast now
picks its label from err.source instead of assuming Google/err.email.
This commit is contained in:
Scarriffle
2026-07-02 18:22:11 +02:00
parent 94655ce7c5
commit 9fb350eb29
4 changed files with 54 additions and 11 deletions

View File

@@ -382,8 +382,13 @@ def update_calendar(
# ── Events ───────────────────────────────────────────────
def get_google_events(account: models.GoogleAccount, start_dt: datetime, end_dt: datetime, db: Session) -> list:
"""Fetch events from all enabled Google calendars for an account."""
def get_google_events(account: models.GoogleAccount, start_dt: datetime, end_dt: datetime, db: Session) -> tuple:
"""Fetch events from all enabled Google calendars for an account.
Returns (events, errors) — errors is a list of
{"source": "google", "name": ..., "message": ...} dicts for any
calendar that failed to sync. Never includes raw exception text.
"""
try:
token = _refresh_access_token(account, db)
except Exception as exc:
@@ -391,6 +396,7 @@ def get_google_events(account: models.GoogleAccount, start_dt: datetime, end_dt:
raise
all_events = []
errors = []
for gcal in account.calendars:
if not gcal.enabled or gcal.sidebar_hidden:
continue
@@ -409,8 +415,13 @@ def get_google_events(account: models.GoogleAccount, start_dt: datetime, end_dt:
all_events.append(_parse_google_event(ev, gcal.id, gcal.name, gcal.color or "#4285f4"))
except Exception as exc:
logger.error("Error fetching events for calendar %s (%s): %s", gcal.name, gcal.cal_id, exc)
errors.append({
"source": "google",
"name": f"{account.email} {gcal.name}",
"message": "Sync fehlgeschlagen",
})
return all_events
return all_events, errors
class GoogleEventCreate(BaseModel):