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

@@ -300,6 +300,7 @@ def get_events(
end_dt = end_dt.replace(tzinfo=timezone.utc)
all_events = []
sync_errors = []
accounts = (
db.query(models.CalDAVAccount)
.filter(
@@ -333,6 +334,11 @@ def get_events(
logger.error(
"Error fetching calendar %s: %s", calendar.id, exc
)
sync_errors.append({
"source": "caldav",
"name": f"{account.username} {calendar.name}",
"message": "Sync fehlgeschlagen",
})
# ── Local calendar events (own + shared + group calendars) ─────────────
readable_ids = permissions.readable_local_calendar_ids(db, current_user)
@@ -414,13 +420,18 @@ def get_events(
.filter(models.GoogleAccount.user_id == current_user.id)
.all()
)
google_errors = []
for g_acc in google_accounts:
try:
all_events.extend(get_google_events(g_acc, start_dt, end_dt, db))
g_events, g_errors = get_google_events(g_acc, start_dt, end_dt, db)
all_events.extend(g_events)
sync_errors.extend(g_errors)
except Exception as exc:
logger.error("Error fetching Google Calendar for %s: %s", g_acc.email, exc)
google_errors.append({"email": g_acc.email})
sync_errors.append({
"source": "google",
"name": g_acc.email,
"message": "Sync fehlgeschlagen",
})
# ── Home Assistant events ─────────────────────────────
from routers.homeassistant_router import get_ha_events
@@ -431,11 +442,18 @@ def get_events(
)
for ha_acc in ha_accounts:
try:
all_events.extend(get_ha_events(ha_acc, start_dt, end_dt, db))
ha_events, ha_errors = get_ha_events(ha_acc, start_dt, end_dt, db)
all_events.extend(ha_events)
sync_errors.extend(ha_errors)
except Exception as exc:
logger.error("Error fetching HA events for %s: %s", ha_acc.name, exc)
sync_errors.append({
"source": "homeassistant",
"name": ha_acc.name,
"message": "Sync fehlgeschlagen",
})
return {"events": all_events, "errors": google_errors}
return {"events": all_events, "errors": sync_errors}
@router.post("/events")