32268a18b2
Kollaborations-Features ausschliesslich fuer lokale Kalender:
- Sharing: calendar_shares-Tabelle, GET/POST/DELETE /api/local/calendars/{id}/shares
(nur Besitzer), GET /api/users/directory, geteilte Kalender in
GET /api/local/calendars (shared_by/permission/owned) und im Merge-Read.
- Gruppen: groups/group_members/group_calendars + /api/groups-Router inkl.
kombinierter Ansicht /api/groups/{id}/combined (owner + is_group_event).
- Ersteller: local_events.creator_id (serverseitig gesetzt) + creator_name_external
aus ORGANIZER; creator-Feld in allen lokalen Event-Responses.
- Private-Flag: local_events.is_private + user_settings.private_event_visibility
(hidden|busy), Filterung in der Gruppenansicht.
- iCal Import/Export: ical_io.py, POST /api/local/calendars/{id}/import,
POST /api/local/import, GET /api/local/calendars/{id}/export.
- Zentraler Berechtigungs-Helper (permissions.py) und gemeinsamer Event-Dict-
Builder (local_events_util.py) ersetzen die Nur-Besitzer-Filter.
- pytest-Suite (12 Tests) fuer Sharing, Gruppen, Parser, Private-Filterung.
Additiv & rueckwaertskompatibel; Migrationen in main.py._migrate().
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
308 lines
12 KiB
Python
308 lines
12 KiB
Python
from sqlalchemy import Column, Integer, String, Boolean, DateTime, ForeignKey, Text, UniqueConstraint
|
|
from sqlalchemy.orm import relationship
|
|
from database import Base
|
|
|
|
|
|
class User(Base):
|
|
__tablename__ = "users"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
username = Column(String(50), unique=True, nullable=False)
|
|
email = Column(String(100), unique=True, nullable=True)
|
|
password_hash = Column(String(255), nullable=False)
|
|
is_admin = Column(Boolean, default=False)
|
|
avatar_filename = Column(String(255), nullable=True)
|
|
totp_secret = Column(String(32), nullable=True)
|
|
totp_enabled = Column(Boolean, default=False)
|
|
|
|
caldav_accounts = relationship(
|
|
"CalDAVAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
settings = relationship(
|
|
"UserSettings", back_populates="user", uselist=False, cascade="all, delete-orphan"
|
|
)
|
|
local_calendars = relationship(
|
|
"LocalCalendar", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
ical_subscriptions = relationship(
|
|
"ICalSubscription", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
google_accounts = relationship(
|
|
"GoogleAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
homeassistant_accounts = relationship(
|
|
"HomeAssistantAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
|
|
@property
|
|
def display_name(self) -> str:
|
|
"""No dedicated display-name column exists — fall back to the username."""
|
|
return self.username
|
|
|
|
|
|
class CalDAVAccount(Base):
|
|
__tablename__ = "caldav_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(500), nullable=False)
|
|
username = Column(String(100), nullable=False)
|
|
password = Column(String(255), nullable=False)
|
|
color = Column(String(7), default="#4285f4")
|
|
enabled = Column(Boolean, default=True)
|
|
|
|
user = relationship("User", back_populates="caldav_accounts")
|
|
calendars = relationship(
|
|
"Calendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class Calendar(Base):
|
|
__tablename__ = "calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("caldav_accounts.id"), nullable=False)
|
|
cal_id = Column(String(500), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("CalDAVAccount", back_populates="calendars")
|
|
|
|
|
|
class UserSettings(Base):
|
|
__tablename__ = "user_settings"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), unique=True, nullable=False)
|
|
default_view = Column(String(20), default="month")
|
|
week_start_day = Column(String(10), default="monday")
|
|
primary_color = Column(String(7), default="#4285f4")
|
|
accent_color = Column(String(7), default="#ea4335")
|
|
today_color = Column(String(7), default="#4285f4")
|
|
dim_past_events = Column(Boolean, default=False)
|
|
text_contrast = Column(Integer, default=3)
|
|
line_contrast = Column(Integer, default=3)
|
|
hour_height = Column(Integer, default=60)
|
|
language = Column(String(5), default="de")
|
|
month_divider_color = Column(String(7), default="#7090c0")
|
|
month_label_color = Column(String(7), default="#7090c0")
|
|
text_color = Column(String(7), nullable=True) # Override für --text-1 (NULL = nutze text_contrast)
|
|
line_color = Column(String(7), nullable=True) # Override für --border (NULL = nutze line_contrast)
|
|
bg_color = Column(String(7), nullable=True) # Override für --bg-app (NULL = Default)
|
|
# How this user's private events appear to other group members:
|
|
# 'hidden' = invisible, 'busy' = anonymous busy block (default).
|
|
private_event_visibility = Column(String(10), default="busy")
|
|
|
|
user = relationship("User", back_populates="settings")
|
|
|
|
|
|
class LocalCalendar(Base):
|
|
__tablename__ = "local_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
color = Column(String(7), default="#34a853")
|
|
enabled = Column(Boolean, default=True)
|
|
|
|
user = relationship("User", back_populates="local_calendars")
|
|
events = relationship("LocalEvent", back_populates="calendar", cascade="all, delete-orphan")
|
|
|
|
|
|
class LocalEvent(Base):
|
|
__tablename__ = "local_events"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
calendar_id = Column(Integer, ForeignKey("local_calendars.id"), nullable=False)
|
|
uid = Column(String(255), nullable=False, unique=True)
|
|
title = Column(String(255), nullable=False)
|
|
start = Column(String(50), nullable=False)
|
|
end = Column(String(50), nullable=False)
|
|
all_day = Column(Boolean, default=False)
|
|
location = Column(String(500), nullable=True)
|
|
description = Column(Text, nullable=True)
|
|
color = Column(String(7), nullable=True)
|
|
rrule = Column(Text, nullable=True)
|
|
exdate = Column(Text, nullable=True) # Comma-separated YYYYMMDD dates to exclude
|
|
# Creator: set server-side from the auth token on create, never from the client.
|
|
creator_id = Column(Integer, ForeignKey("users.id"), nullable=True)
|
|
# For imported events without a local user (from the .ics ORGANIZER field).
|
|
creator_name_external = Column(Text, nullable=True)
|
|
# Private events are filtered for other group members per their visibility setting.
|
|
is_private = Column(Boolean, default=False)
|
|
|
|
calendar = relationship("LocalCalendar", back_populates="events")
|
|
creator = relationship("User")
|
|
|
|
|
|
class ICalSubscription(Base):
|
|
__tablename__ = "ical_subscriptions"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(1000), nullable=False)
|
|
color = Column(String(7), default="#46bdc6")
|
|
enabled = Column(Boolean, default=True)
|
|
refresh_minutes = Column(Integer, default=60)
|
|
last_fetched = Column(DateTime, nullable=True)
|
|
cached_ics = Column(Text, nullable=True)
|
|
|
|
user = relationship("User", back_populates="ical_subscriptions")
|
|
overrides = relationship("ICalOverride", back_populates="subscription", cascade="all, delete-orphan")
|
|
|
|
|
|
class ICalOverride(Base):
|
|
__tablename__ = "ical_overrides"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
subscription_id = Column(Integer, ForeignKey("ical_subscriptions.id"), nullable=False)
|
|
event_uid = Column(String(500), nullable=False)
|
|
hidden = Column(Boolean, default=False)
|
|
title = Column(String(255), nullable=True)
|
|
start = Column(String(50), nullable=True)
|
|
end = Column(String(50), nullable=True)
|
|
all_day = Column(Boolean, nullable=True)
|
|
location = Column(String(500), nullable=True)
|
|
description = Column(Text, nullable=True)
|
|
color = Column(String(7), nullable=True)
|
|
|
|
subscription = relationship("ICalSubscription", back_populates="overrides")
|
|
|
|
|
|
class GoogleAccount(Base):
|
|
__tablename__ = "google_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
email = Column(String(255), nullable=False)
|
|
access_token = Column(Text, nullable=False)
|
|
refresh_token = Column(Text, nullable=False)
|
|
token_expiry = Column(DateTime, nullable=True)
|
|
|
|
user = relationship("User", back_populates="google_accounts")
|
|
calendars = relationship(
|
|
"GoogleCalendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class GoogleCalendar(Base):
|
|
__tablename__ = "google_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("google_accounts.id"), nullable=False)
|
|
cal_id = Column(String(500), nullable=False)
|
|
name = Column(String(255), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("GoogleAccount", back_populates="calendars")
|
|
|
|
|
|
class HomeAssistantAccount(Base):
|
|
__tablename__ = "homeassistant_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(500), nullable=False)
|
|
token = Column(Text, nullable=False)
|
|
auth_method = Column(String(20), default="token")
|
|
refresh_token = Column(Text, nullable=True)
|
|
token_expiry = Column(DateTime, nullable=True)
|
|
client_id = Column(String(500), nullable=True)
|
|
|
|
user = relationship("User", back_populates="homeassistant_accounts")
|
|
calendars = relationship(
|
|
"HomeAssistantCalendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class HomeAssistantCalendar(Base):
|
|
__tablename__ = "homeassistant_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("homeassistant_accounts.id"), nullable=False)
|
|
entity_id = Column(String(255), nullable=False)
|
|
name = Column(String(255), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("HomeAssistantAccount", back_populates="calendars")
|
|
|
|
|
|
# ── Collaboration: sharing & groups (local calendars only) ────────────────
|
|
|
|
|
|
class CalendarShare(Base):
|
|
"""A local calendar shared with another Calendarr user."""
|
|
|
|
__tablename__ = "calendar_shares"
|
|
__table_args__ = (
|
|
UniqueConstraint("calendar_id", "user_id", name="uq_calendar_share"),
|
|
)
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
calendar_id = Column(Integer, ForeignKey("local_calendars.id"), nullable=False)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
permission = Column(String(20), default="read") # 'read' | 'read_write'
|
|
created_at = Column(String(50), nullable=True) # ISO 8601
|
|
|
|
calendar = relationship("LocalCalendar")
|
|
user = relationship("User")
|
|
|
|
|
|
class Group(Base):
|
|
__tablename__ = "groups"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
name = Column(String(100), nullable=False)
|
|
created_by = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
created_at = Column(String(50), nullable=True) # ISO 8601
|
|
|
|
members = relationship(
|
|
"GroupMember", back_populates="group", cascade="all, delete-orphan"
|
|
)
|
|
group_calendar = relationship(
|
|
"GroupCalendar", back_populates="group", uselist=False,
|
|
cascade="all, delete-orphan",
|
|
)
|
|
|
|
|
|
class GroupMember(Base):
|
|
__tablename__ = "group_members"
|
|
__table_args__ = (
|
|
UniqueConstraint("group_id", "user_id", name="uq_group_member"),
|
|
)
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
group_id = Column(Integer, ForeignKey("groups.id"), nullable=False)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
role = Column(String(10), default="member") # 'owner' | 'member'
|
|
joined_at = Column(String(50), nullable=True) # ISO 8601
|
|
|
|
group = relationship("Group", back_populates="members")
|
|
user = relationship("User")
|
|
|
|
|
|
class GroupCalendar(Base):
|
|
"""1:1 link between a group and its shared local calendar."""
|
|
|
|
__tablename__ = "group_calendars"
|
|
__table_args__ = (
|
|
UniqueConstraint("group_id", name="uq_group_calendar_group"),
|
|
UniqueConstraint("calendar_id", name="uq_group_calendar_calendar"),
|
|
)
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
group_id = Column(Integer, ForeignKey("groups.id"), nullable=False)
|
|
calendar_id = Column(Integer, ForeignKey("local_calendars.id"), nullable=False)
|
|
|
|
group = relationship("Group", back_populates="group_calendar")
|
|
calendar = relationship("LocalCalendar")
|