Public instance has no accounts, so all user state was GLOBAL in DB — new users saw/overwrote each other's (and Jan's) favorites, watched badges and blacklists (bug 2026-06-10). Add device_id (VARCHAR 64) to 9 state tables with composite PK (device_id, entity_id); app sends X-Device-Id header (get_device_id dep). All favorites/scene-favorites/blacklist/watch + scene&movie list/detail (is_favorite, watched, blacklist-hide) now filter by device. Existing rows backfilled to 'legacy-shared'; POST /me/adopt-legacy reassigns them to the caller once. Old clients (no header) map to legacy-shared so they keep working until OTA updates. Migration 0022: add col, backfill, composite PK. Verified on prod: 967 progress rows preserved, device isolation holds (new device sees none of legacy state). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
61 lines
2.2 KiB
Python
61 lines
2.2 KiB
Python
"""Pozycja odtwarzania per scena (continue watching)."""
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
from datetime import datetime
|
|
|
|
from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, func
|
|
from sqlalchemy.dialects.postgresql import UUID
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from app.models.base import Base
|
|
|
|
|
|
class ScenePlayProgress(Base):
|
|
__tablename__ = "scene_play_progress"
|
|
|
|
device_id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
|
scene_id: Mapped[uuid.UUID] = mapped_column(
|
|
UUID(as_uuid=True),
|
|
ForeignKey("scenes.id", ondelete="CASCADE"),
|
|
primary_key=True,
|
|
)
|
|
position_sec: Mapped[int] = mapped_column(
|
|
Integer, nullable=False, server_default="0", default=0
|
|
)
|
|
# Mirror Scene.duration_sec gdy player zwróci ten dato — pozwala na poprawny
|
|
# progress_pct nawet gdy Scene.duration_sec jest None.
|
|
duration_sec: Mapped[int | None] = mapped_column(Integer)
|
|
finished: Mapped[bool] = mapped_column(
|
|
Boolean, nullable=False, server_default="false", default=False
|
|
)
|
|
last_played_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=True), server_default=func.now(), nullable=False
|
|
)
|
|
|
|
|
|
class MoviePlayProgress(Base):
|
|
"""Pozycja odtwarzania per film. Mirror ScenePlayProgress dla movies.
|
|
|
|
User-report 2026-05-26 (b207ff17): "przydałoby się oznaczenie filmów już
|
|
obejrzanych" — sceny mają watched badge, filmów brakowało.
|
|
"""
|
|
|
|
__tablename__ = "movie_play_progress"
|
|
|
|
device_id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
|
movie_id: Mapped[uuid.UUID] = mapped_column(
|
|
UUID(as_uuid=True),
|
|
ForeignKey("movies.id", ondelete="CASCADE"),
|
|
primary_key=True,
|
|
)
|
|
position_sec: Mapped[int] = mapped_column(
|
|
Integer, nullable=False, server_default="0", default=0
|
|
)
|
|
duration_sec: Mapped[int | None] = mapped_column(Integer)
|
|
finished: Mapped[bool] = mapped_column(
|
|
Boolean, nullable=False, server_default="false", default=False
|
|
)
|
|
last_played_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=True), server_default=func.now(), nullable=False
|
|
)
|