derekc
9deee8d42e
- timer.py: MySQL returns timezone-naive datetimes; wrap occurred_at
with _utc() before arithmetic against datetime.now(timezone.utc) to
avoid TypeError on compute_block_elapsed / compute_break_elapsed.
This was causing a 500 on GET /api/dashboard/{token} for any child
with an active session, preventing schedule templates from loading.
- children.js: after regenerateToken, also update activeChild so it
doesn't hold a stale tv_token reference. Also sync activeChild on
fetchChildren re-fetch so navigation after token regen picks up the
new token immediately.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
87 lines
3.0 KiB
Python
87 lines
3.0 KiB
Python
"""Shared timer-elapsed computation used by sessions and dashboard routers."""
|
|
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy import select
|
|
|
|
from app.models.session import TimerEvent
|
|
|
|
|
|
def _utc(dt: datetime) -> datetime:
|
|
"""Return dt as UTC-aware, tagging naive datetimes (from MySQL) as UTC."""
|
|
return dt.replace(tzinfo=timezone.utc) if dt.tzinfo is None else dt
|
|
|
|
|
|
async def compute_block_elapsed(
|
|
db: AsyncSession, session_id: int, block_id: int
|
|
) -> tuple[int, bool]:
|
|
"""Return (elapsed_seconds, is_paused) for a block.
|
|
|
|
'reset' events are treated as zero-elapsed restart markers: any elapsed
|
|
time accumulated before a reset is discarded.
|
|
"""
|
|
tick_result = await db.execute(
|
|
select(TimerEvent)
|
|
.where(
|
|
TimerEvent.session_id == session_id,
|
|
TimerEvent.block_id == block_id,
|
|
TimerEvent.event_type.in_(["start", "resume", "pause", "reset"]),
|
|
)
|
|
.order_by(TimerEvent.occurred_at)
|
|
)
|
|
tick_events = tick_result.scalars().all()
|
|
|
|
elapsed = 0.0
|
|
last_start = None
|
|
for e in tick_events:
|
|
if e.event_type == "reset":
|
|
elapsed = 0.0
|
|
last_start = None
|
|
elif e.event_type in ("start", "resume"):
|
|
last_start = _utc(e.occurred_at)
|
|
elif e.event_type == "pause" and last_start:
|
|
elapsed += (_utc(e.occurred_at) - last_start).total_seconds()
|
|
last_start = None
|
|
running = last_start is not None
|
|
if running:
|
|
elapsed += (datetime.now(timezone.utc) - last_start).total_seconds()
|
|
|
|
# is_paused is True whenever the timer is not actively running —
|
|
# covers: explicitly paused, never started, or only selected.
|
|
is_paused = not running
|
|
return int(elapsed), is_paused
|
|
|
|
|
|
async def compute_break_elapsed(
|
|
db: AsyncSession, session_id: int, block_id: int
|
|
) -> tuple[int, bool]:
|
|
"""Return (break_elapsed_seconds, is_break_paused) for a block's break timer."""
|
|
tick_result = await db.execute(
|
|
select(TimerEvent)
|
|
.where(
|
|
TimerEvent.session_id == session_id,
|
|
TimerEvent.block_id == block_id,
|
|
TimerEvent.event_type.in_(["break_start", "break_resume", "break_pause", "break_reset"]),
|
|
)
|
|
.order_by(TimerEvent.occurred_at)
|
|
)
|
|
tick_events = tick_result.scalars().all()
|
|
|
|
elapsed = 0.0
|
|
last_start = None
|
|
for e in tick_events:
|
|
if e.event_type == "break_reset":
|
|
elapsed = 0.0
|
|
last_start = _utc(e.occurred_at)
|
|
elif e.event_type in ("break_start", "break_resume"):
|
|
last_start = _utc(e.occurred_at)
|
|
elif e.event_type == "break_pause" and last_start:
|
|
elapsed += (_utc(e.occurred_at) - last_start).total_seconds()
|
|
last_start = None
|
|
running = last_start is not None
|
|
if running:
|
|
elapsed += (datetime.now(timezone.utc) - last_start).total_seconds()
|
|
|
|
is_paused = not running
|
|
return int(elapsed), is_paused
|