mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 19:07:16 +01:00
The workout log stored ONE workout per calendar day, so a second same-day
workout was silently dropped and could never earn credit.
Multiple workouts per day:
- workout_log.json: {date: entry} -> {date: [entry, ...]}. Legacy entries are
wrapped on read (_log_io.load_workout_log) so their HMACs stay valid — no
re-signing; every write normalizes the file, migrating it progressively.
- New write chokepoint (_log_mixin.write_signed_entry) APPENDS and dedups by a
stable workout_id, returning RecordResult so callers can tell a new workout
from a duplicate. Re-verifying the same workout is a no-op.
- count_weekly_workouts is anti-gaming: each VERIFIED workout counts
individually; self-reported manual entries count at most once per day. Four
real workouts in one day satisfy the week; four manual entries count as one.
- Reward: the day's first counted workout gets the base +2h; an additional
same-day VERIFIED workout gets +1h; an additional manual gets nothing. The
old "+1h when weekly_count > 4" gate is replaced — weekly volume is the
banked bonus's job and shouldn't be paid twice.
- Fixed: the unlock screen labelled the +1h "#{weekly_count - 4}", which can
render negative under the new rule. Removed the dead runnerup_manual type.
- Flutter: the manual budget counts distinct DAYS, matching the PC.
PC->phone sync (it had never worked once):
- push_pc_manuals pushed from a side-store written at log-time, so anything
logged before that feature existed could never publish. _manual_push now
derives the crdt log directly from workout_log.json — the single source of
truth — covering manual AND verified runs. The record id is the workout's own
workout_id (derived for legacy entries to match the phone's format) and the
HLC comes from the entry's own timestamp, so a re-push is byte-identical and
the repo never churns.
- The phone reads every kind (readMergedWorkoutPayloads) and lists the PC's
workouts under "SYNCED FROM PC". The manual budget still sees manual-only, so
a verified run can't consume a self-report slot.
- Settings claimed "Connected." whenever a token STRING existed. It now
verifies against the API on open, so a revoked token reports 401 instead of
showing a green lie.
Never fail silently:
- 30 swallowed exceptions across 19 files now log WARNING with the concrete
cause AND consequence — plus the token guards in _workout_sync that returned
[] in total silence, the exact bug that hid the dead sync for weeks.
- New pre-commit hook (scripts/check_silent_failures.py) fails any except that
neither re-raises nor logs loudly. ruff's S110 only catches `except: pass`;
the real pattern here was `except: log.info(); return []`. Documented in
CLAUDE.md.
Verified on real data: the Jul 13 run (pulled from its actual TCX over ADB) now
counts alongside that day's manual squash, and all three workouts are published
to kuhyx/syncs.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Fv8ULVt3Q67GwCFbM7doHB
199 lines
7.5 KiB
Python
199 lines
7.5 KiB
Python
"""Tests for ingesting synced manual workouts into workout_log.json."""
|
|
# pylint: disable=protected-access
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import patch
|
|
|
|
from screen_locker import _manual_sync
|
|
from screen_locker._manual_sync import (
|
|
ingest_manual_records,
|
|
reconstruct_draft,
|
|
)
|
|
from screen_locker._manual_workout import (
|
|
SPORT_OTHER,
|
|
SPORT_TABLE_TENNIS,
|
|
ManualWorkoutDraft,
|
|
build_sync_payload,
|
|
manual_sync_record_id,
|
|
)
|
|
from screen_locker._weekly_check import count_weekly_workouts
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
_DATE = "2026-07-13"
|
|
|
|
_TT_DRAFT = ManualWorkoutDraft(
|
|
sport=SPORT_TABLE_TENNIS,
|
|
start_time="18:00",
|
|
end_time="19:30",
|
|
location_name="Solec",
|
|
transport_method="bike",
|
|
cost="40 PLN",
|
|
rpe=6,
|
|
went_well="Served consistently and moved feet well",
|
|
to_improve="Backhand topspin needs more consistency",
|
|
overall_feeling="Felt strong focused and in good rhythm",
|
|
matches_won=3,
|
|
matches_lost=1,
|
|
sets_won=7,
|
|
sets_lost=4,
|
|
racket="Butterfly",
|
|
balls="Nittaku 3-star",
|
|
)
|
|
_OTHER_DRAFT = ManualWorkoutDraft(
|
|
sport=SPORT_OTHER,
|
|
start_time="09:00",
|
|
end_time="10:00",
|
|
location_name="Squash club",
|
|
transport_method="car",
|
|
cost="30 PLN",
|
|
rpe=5,
|
|
went_well="Moved well and kept long rallies going",
|
|
to_improve="Need to volley earlier off the back wall",
|
|
overall_feeling="Tired but satisfied with the effort",
|
|
activity_type_other="squash",
|
|
activity_details="Full-court squash drills and three practice games total",
|
|
equipment="racket, goggles",
|
|
)
|
|
|
|
|
|
def _manual_record(draft: ManualWorkoutDraft, date: str = _DATE) -> tuple[str, dict]:
|
|
"""Build a (record_id, payload) pair as it would arrive from sync."""
|
|
payload = build_sync_payload(draft, date)
|
|
return manual_sync_record_id(date, draft.start_time), payload
|
|
|
|
|
|
class TestReconstructDraft:
|
|
def test_rebuilds_a_table_tennis_draft(self) -> None:
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
draft = reconstruct_draft(payload)
|
|
assert draft is not None
|
|
assert draft.sport == SPORT_TABLE_TENNIS
|
|
assert draft.racket == "Butterfly"
|
|
|
|
def test_rebuilds_an_other_sport_draft(self) -> None:
|
|
_, payload = _manual_record(_OTHER_DRAFT)
|
|
draft = reconstruct_draft(payload)
|
|
assert draft is not None
|
|
assert draft.activity_type_other == "squash"
|
|
|
|
def test_returns_none_when_a_required_field_is_missing(self) -> None:
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
del payload["start_time"]
|
|
assert reconstruct_draft(payload) is None
|
|
|
|
def test_returns_none_on_a_mistyped_field(self) -> None:
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
payload["rpe"] = None
|
|
assert reconstruct_draft(payload) is None
|
|
|
|
|
|
class TestIngestManualRecords:
|
|
def test_ingests_a_valid_record(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
record = _manual_record(_TT_DRAFT)
|
|
ingested = ingest_manual_records(log_file, [record], today=_DATE)
|
|
assert ingested == [record[0]]
|
|
stored = json.loads(log_file.read_text())
|
|
# The log is now a list of entries per day.
|
|
workout = stored[_DATE][0]["workout_data"]
|
|
assert workout["type"] == "manual_workout"
|
|
assert workout["sync_record_id"] == record[0]
|
|
assert count_weekly_workouts(log_file, today=_dt(_DATE)) == 1
|
|
|
|
def test_is_idempotent(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
record = _manual_record(_TT_DRAFT)
|
|
ingest_manual_records(log_file, [record], today=_DATE)
|
|
again = ingest_manual_records(log_file, [record], today=_DATE)
|
|
assert again == []
|
|
|
|
def test_skips_a_non_manual_payload(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
assert (
|
|
ingest_manual_records(log_file, [("s", {"succeeded": True})], today=_DATE)
|
|
== []
|
|
)
|
|
|
|
def test_skips_a_record_without_a_date(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
del payload["date"]
|
|
assert ingest_manual_records(log_file, [("m", payload)], today=_DATE) == []
|
|
|
|
def test_appends_alongside_an_existing_counted_day(self, tmp_path: Path) -> None:
|
|
"""A day may hold several workouts: a synced manual is appended next to
|
|
an existing verified entry rather than being skipped (the old
|
|
one-per-day skip is gone)."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text(
|
|
json.dumps(
|
|
{_DATE: {"workout_data": {"type": "phone_verified"}}},
|
|
)
|
|
)
|
|
record = _manual_record(_TT_DRAFT)
|
|
assert ingest_manual_records(log_file, [record], today=_DATE) == [record[0]]
|
|
stored = json.loads(log_file.read_text())
|
|
# The original phone_verified entry is untouched and the manual is added.
|
|
assert len(stored[_DATE]) == 2
|
|
assert stored[_DATE][0]["workout_data"]["type"] == "phone_verified"
|
|
assert stored[_DATE][1]["workout_data"]["type"] == "manual_workout"
|
|
|
|
def test_skips_a_malformed_payload(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
payload["rpe"] = None # reconstruct_draft -> None
|
|
assert ingest_manual_records(log_file, [("m", payload)], today=_DATE) == []
|
|
|
|
def test_skips_an_invalid_draft(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
_, payload = _manual_record(_TT_DRAFT)
|
|
payload["location_name"] = " " # fails validate_manual_workout
|
|
assert ingest_manual_records(log_file, [("m", payload)], today=_DATE) == []
|
|
|
|
def test_skips_when_budget_exhausted(self, tmp_path: Path) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
record = _manual_record(_TT_DRAFT)
|
|
with patch.object(_manual_sync, "is_budget_exhausted", return_value=True):
|
|
assert ingest_manual_records(log_file, [record], today=_DATE) == []
|
|
|
|
def test_writes_unsigned_entry_when_hmac_key_unavailable(
|
|
self, tmp_path: Path
|
|
) -> None:
|
|
log_file = tmp_path / "workout_log.json"
|
|
record = _manual_record(_TT_DRAFT)
|
|
with patch("screen_locker._log_mixin.compute_entry_hmac", return_value=None):
|
|
ingest_manual_records(log_file, [record], today=_DATE)
|
|
stored = json.loads(log_file.read_text())
|
|
assert "hmac" not in stored[_DATE][0]
|
|
|
|
|
|
class TestIngestHelpers:
|
|
def test_already_ingested_finds_id_in_per_day_lists(self) -> None:
|
|
"""_already_ingested takes normalized ``{date: [entry, ...]}`` and
|
|
scans every entry across all days for a matching sync record id."""
|
|
logs = {
|
|
"a": [],
|
|
"b": [
|
|
{"workout_data": {"type": "manual_workout"}},
|
|
{"workout_data": {"sync_record_id": "x"}},
|
|
],
|
|
}
|
|
assert _manual_sync._already_ingested(logs, "x") is True
|
|
assert _manual_sync._already_ingested(logs, "y") is False
|
|
|
|
def test_already_ingested_ignores_non_dict_workout_data(self) -> None:
|
|
"""An entry whose workout_data isn't a dict is skipped, not matched."""
|
|
logs = {"b": [{"workout_data": "not-a-dict"}]}
|
|
assert _manual_sync._already_ingested(logs, "x") is False
|
|
|
|
|
|
def _dt(date: str) -> object:
|
|
from datetime import datetime, timezone
|
|
|
|
return datetime.strptime(date, "%Y-%m-%d").replace(tzinfo=timezone.utc)
|