49aba8efb4
- C1: drop module-level app singleton in app/main.py so importing the package no longer validates Settings or creates DATA_DIR; run uvicorn with --factory in the Dockerfile. pytest now collects and passes with no ambient env vars. - I2: add missing app/auth, app/security, app/web __init__.py so setuptools discovers all five packages. - I3: resolve the Jinja2 template directory relative to __file__ instead of the process CWD. - I4: add .gitignore covering .env, data/, .venv/, caches and build artifacts so example deployment secrets cannot be committed. - I5: assert UserRepository.list_enabled() excludes disabled users. - M6: encode both operands before hmac.compare_digest in validate_csrf so a non-ASCII token yields 403 instead of an unhandled 500. - M9: remove unused relationship / HealthState imports. - M11: make session cookie https_only configurable via SESSION_HTTPS_ONLY (default unchanged: false). - M13: dispose SQLAlchemy engines in the db_session and client fixtures. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
93 lines
4.2 KiB
Python
93 lines
4.2 KiB
Python
from __future__ import annotations
|
|
|
|
import enum
|
|
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy import Boolean, DateTime, Enum, ForeignKey, Integer, String, Text, UniqueConstraint
|
|
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
|
|
|
|
|
def utcnow() -> datetime:
|
|
return datetime.now(timezone.utc)
|
|
|
|
|
|
class Base(DeclarativeBase):
|
|
pass
|
|
|
|
|
|
class HealthState(str, enum.Enum):
|
|
HEALTHY = "healthy"
|
|
SYNCING = "syncing"
|
|
DEGRADED = "degraded"
|
|
ACTION_REQUIRED = "action_required"
|
|
DISABLED = "disabled"
|
|
|
|
|
|
class ActivityStatus(str, enum.Enum):
|
|
DISCOVERED = "discovered"
|
|
DOWNLOADED = "downloaded"
|
|
CONVERTED = "converted"
|
|
IMPORTED = "imported"
|
|
DUPLICATE = "duplicate"
|
|
FAILED = "failed"
|
|
|
|
|
|
class SyncRunStatus(str, enum.Enum):
|
|
RUNNING = "running"
|
|
SUCCESS = "success"
|
|
PARTIAL = "partial"
|
|
FAILED = "failed"
|
|
|
|
|
|
class SyncUser(Base):
|
|
__tablename__ = "sync_users"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
|
name: Mapped[str] = mapped_column(String(120), nullable=False)
|
|
enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
health_state: Mapped[HealthState] = mapped_column(Enum(HealthState), nullable=False, default=HealthState.HEALTHY)
|
|
mywhoosh_state: Mapped[str] = mapped_column(String(32), nullable=False, default="unknown")
|
|
garmin_state: Mapped[str] = mapped_column(String(32), nullable=False, default="unknown")
|
|
action_reason: Mapped[str | None] = mapped_column(Text)
|
|
mywhoosh_email_enc: Mapped[str] = mapped_column(Text, nullable=False)
|
|
mywhoosh_password_enc: Mapped[str] = mapped_column(Text, nullable=False)
|
|
garmin_email_enc: Mapped[str] = mapped_column(Text, nullable=False)
|
|
garmin_password_enc: Mapped[str] = mapped_column(Text, nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow)
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow, onupdate=utcnow)
|
|
|
|
|
|
class Activity(Base):
|
|
__tablename__ = "activities"
|
|
__table_args__ = (UniqueConstraint("user_id", "mywhoosh_activity_id", name="uq_activity_user_mywhoosh"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
|
user_id: Mapped[int] = mapped_column(ForeignKey("sync_users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
mywhoosh_activity_id: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
activity_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
activity_timestamp: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
|
source_fit_path: Mapped[str | None] = mapped_column(Text)
|
|
converted_fit_path: Mapped[str | None] = mapped_column(Text)
|
|
status: Mapped[ActivityStatus] = mapped_column(Enum(ActivityStatus), nullable=False, default=ActivityStatus.DISCOVERED)
|
|
last_completed_stage: Mapped[ActivityStatus] = mapped_column(Enum(ActivityStatus), nullable=False, default=ActivityStatus.DISCOVERED)
|
|
retryable: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
garmin_activity_id: Mapped[str | None] = mapped_column(String(255))
|
|
last_error: Mapped[str | None] = mapped_column(Text)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow)
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow, onupdate=utcnow)
|
|
|
|
|
|
class SyncRun(Base):
|
|
__tablename__ = "sync_runs"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
|
user_id: Mapped[int] = mapped_column(ForeignKey("sync_users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
started_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow)
|
|
finished_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
|
status: Mapped[SyncRunStatus] = mapped_column(Enum(SyncRunStatus), nullable=False, default=SyncRunStatus.RUNNING)
|
|
discovered_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
imported_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
skipped_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
failed_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
summary_error: Mapped[str | None] = mapped_column(Text)
|