bc1d44b556
Display workouts as "#N" based on each user's own ordered list of non-deleted workouts (rank by timestamp ascending). Global auto- increment id stays the primary key, used only internally and in exports. User-visible surfaces now all use the per-user number: - /history listing - /delete now accepts the per-user number - Save confirmations (bot text and Mini App toast) Deleting a workout renumbers the later ones downward, as expected for a pure display transform. New db helpers: get_user_workout_number, resolve_user_number, and get_workouts now includes user_number per row via SQLite window function. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
292 lines
11 KiB
Python
292 lines
11 KiB
Python
from datetime import datetime, timezone, timedelta
|
|
|
|
import db
|
|
|
|
|
|
# ── init_db ──────────────────────────────────────────────────────
|
|
|
|
|
|
class TestInitDb:
|
|
def test_tables_created(self, tmp_db):
|
|
with db.get_db() as conn:
|
|
tables = {r[0] for r in conn.execute(
|
|
"SELECT name FROM sqlite_master WHERE type='table'"
|
|
).fetchall()}
|
|
assert "workouts" in tables
|
|
assert "superset_groups" in tables
|
|
assert "exercises" in tables
|
|
|
|
def test_idempotent(self, tmp_db):
|
|
db.init_db() # second call should not raise
|
|
|
|
def test_migrations_applied(self, tmp_db):
|
|
with db.get_db() as conn:
|
|
w_cols = {r[1] for r in conn.execute("PRAGMA table_info(workouts)").fetchall()}
|
|
e_cols = {r[1] for r in conn.execute("PRAGMA table_info(exercises)").fetchall()}
|
|
assert "raw_text" in w_cols
|
|
assert "sets_detail" in e_cols
|
|
|
|
|
|
# ── Helpers ──────────────────────────────────────────────────────
|
|
|
|
|
|
def _make_exercise(name="Bench", sets=3, reps=8, weight=35.0, machine_id=None):
|
|
detail = [{"reps": reps, "weight_kg": weight}] * sets
|
|
return {
|
|
"name": name,
|
|
"machine_id": machine_id,
|
|
"sets": sets,
|
|
"reps": reps,
|
|
"weight_kg": weight,
|
|
"sets_detail": detail,
|
|
"raw_line": f"{name}: {sets}x{reps}x{weight}",
|
|
}
|
|
|
|
|
|
def _save_simple(user_id=1, name="Bench", ts=None):
|
|
ts = ts or datetime.now(timezone.utc)
|
|
return db.save_workout(
|
|
user_id=user_id,
|
|
timestamp=ts,
|
|
superset_groups=[[_make_exercise(name=name)]],
|
|
raw_text=f"{name}: 3x8x35",
|
|
)
|
|
|
|
|
|
# ── save_workout + get_workouts round-trip ───────────────────────
|
|
|
|
|
|
class TestSaveAndGet:
|
|
def test_basic_round_trip(self, tmp_db):
|
|
wid = _save_simple()
|
|
workouts = db.get_workouts(user_id=1)
|
|
assert len(workouts) == 1
|
|
w = workouts[0]
|
|
assert w["id"] == wid
|
|
assert len(w["superset_groups"]) == 1
|
|
ex = w["superset_groups"][0][0]
|
|
assert ex["name"] == "Bench"
|
|
assert ex["sets"] == 3
|
|
assert ex["reps"] == 8
|
|
assert ex["weight_kg"] == 35.0
|
|
|
|
def test_sets_detail_round_trip(self, tmp_db):
|
|
detail = [{"reps": 8, "weight_kg": 25}, {"reps": 5, "weight_kg": 35}]
|
|
ex = {
|
|
"name": "Press", "machine_id": None,
|
|
"sets": 2, "reps": 8, "weight_kg": 25,
|
|
"sets_detail": detail, "raw_line": "Press: 8x25, 5x35",
|
|
}
|
|
db.save_workout(1, datetime.now(timezone.utc), [[ex]])
|
|
workouts = db.get_workouts(1)
|
|
got = workouts[0]["superset_groups"][0][0]["sets_detail"]
|
|
assert got == detail
|
|
|
|
def test_machine_id(self, tmp_db):
|
|
ex = _make_exercise(machine_id="3032")
|
|
db.save_workout(1, datetime.now(timezone.utc), [[ex]])
|
|
workouts = db.get_workouts(1)
|
|
assert workouts[0]["superset_groups"][0][0]["machine_id"] == "3032"
|
|
|
|
def test_raw_text_stored(self, tmp_db):
|
|
_save_simple()
|
|
workouts = db.get_workouts(1)
|
|
assert workouts[0]["raw_text"] == "Bench: 3x8x35"
|
|
|
|
def test_newest_first(self, tmp_db):
|
|
t1 = datetime(2024, 1, 1, tzinfo=timezone.utc)
|
|
t2 = datetime(2024, 1, 2, tzinfo=timezone.utc)
|
|
t3 = datetime(2024, 1, 3, tzinfo=timezone.utc)
|
|
_save_simple(name="First", ts=t1)
|
|
_save_simple(name="Second", ts=t2)
|
|
_save_simple(name="Third", ts=t3)
|
|
workouts = db.get_workouts(1)
|
|
names = [w["superset_groups"][0][0]["name"] for w in workouts]
|
|
assert names == ["Third", "Second", "First"]
|
|
|
|
def test_pagination(self, tmp_db):
|
|
for i in range(5):
|
|
_save_simple(ts=datetime(2024, 1, i + 1, tzinfo=timezone.utc))
|
|
page1 = db.get_workouts(1, limit=2, offset=0)
|
|
page2 = db.get_workouts(1, limit=2, offset=2)
|
|
page3 = db.get_workouts(1, limit=2, offset=4)
|
|
assert len(page1) == 2
|
|
assert len(page2) == 2
|
|
assert len(page3) == 1
|
|
|
|
|
|
# ── delete_workout ───────────────────────────────────────────────
|
|
|
|
|
|
class TestDeleteWorkout:
|
|
def test_delete_success(self, tmp_db):
|
|
wid = _save_simple()
|
|
assert db.delete_workout(user_id=1, workout_id=wid) is True
|
|
assert db.get_workouts(1) == [] # not visible
|
|
|
|
def test_soft_delete_preserves_row(self, tmp_db):
|
|
wid = _save_simple()
|
|
db.delete_workout(user_id=1, workout_id=wid)
|
|
# Row still exists with deleted_at set
|
|
with db.get_db() as conn:
|
|
row = conn.execute("SELECT deleted_at FROM workouts WHERE id = ?", (wid,)).fetchone()
|
|
assert row is not None
|
|
assert row["deleted_at"] is not None
|
|
|
|
def test_delete_nonexistent(self, tmp_db):
|
|
assert db.delete_workout(user_id=1, workout_id=999) is False
|
|
|
|
def test_delete_wrong_user(self, tmp_db):
|
|
wid = _save_simple(user_id=1)
|
|
assert db.delete_workout(user_id=2, workout_id=wid) is False
|
|
assert len(db.get_workouts(1)) == 1 # still there
|
|
|
|
def test_delete_idempotent(self, tmp_db):
|
|
wid = _save_simple()
|
|
assert db.delete_workout(1, wid) is True
|
|
assert db.delete_workout(1, wid) is False # already deleted
|
|
|
|
|
|
# ── per-user numbering ───────────────────────────────────────────
|
|
|
|
|
|
class TestUserNumbering:
|
|
def test_user_number_in_get_workouts(self, tmp_db):
|
|
t = lambda d: datetime(2024, 1, d, tzinfo=timezone.utc)
|
|
_save_simple(name="First", ts=t(1))
|
|
_save_simple(name="Second", ts=t(2))
|
|
_save_simple(name="Third", ts=t(3))
|
|
ws = db.get_workouts(1) # newest first
|
|
assert [w["superset_groups"][0][0]["name"] for w in ws] == ["Third", "Second", "First"]
|
|
assert [w["user_number"] for w in ws] == [3, 2, 1]
|
|
|
|
def test_numbering_is_per_user(self, tmp_db):
|
|
t = lambda d: datetime(2024, 1, d, tzinfo=timezone.utc)
|
|
_save_simple(user_id=1, ts=t(1))
|
|
_save_simple(user_id=2, ts=t(1))
|
|
_save_simple(user_id=1, ts=t(2))
|
|
_save_simple(user_id=2, ts=t(2))
|
|
assert [w["user_number"] for w in db.get_workouts(1)] == [2, 1]
|
|
assert [w["user_number"] for w in db.get_workouts(2)] == [2, 1]
|
|
|
|
def test_numbering_skips_deleted(self, tmp_db):
|
|
t = lambda d: datetime(2024, 1, d, tzinfo=timezone.utc)
|
|
w1 = _save_simple(ts=t(1))
|
|
_save_simple(ts=t(2))
|
|
_save_simple(ts=t(3))
|
|
db.delete_workout(1, w1)
|
|
ws = db.get_workouts(1) # now 2 workouts, both shift down
|
|
assert [w["user_number"] for w in ws] == [2, 1]
|
|
|
|
def test_get_user_workout_number(self, tmp_db):
|
|
t = lambda d: datetime(2024, 1, d, tzinfo=timezone.utc)
|
|
w1 = _save_simple(ts=t(1))
|
|
w2 = _save_simple(ts=t(2))
|
|
assert db.get_user_workout_number(1, w1) == 1
|
|
assert db.get_user_workout_number(1, w2) == 2
|
|
|
|
def test_get_user_workout_number_missing(self, tmp_db):
|
|
assert db.get_user_workout_number(1, 9999) is None
|
|
|
|
def test_get_user_workout_number_deleted(self, tmp_db):
|
|
wid = _save_simple()
|
|
db.delete_workout(1, wid)
|
|
assert db.get_user_workout_number(1, wid) is None
|
|
|
|
def test_resolve_user_number(self, tmp_db):
|
|
t = lambda d: datetime(2024, 1, d, tzinfo=timezone.utc)
|
|
w1 = _save_simple(ts=t(1))
|
|
w2 = _save_simple(ts=t(2))
|
|
assert db.resolve_user_number(1, 1) == w1
|
|
assert db.resolve_user_number(1, 2) == w2
|
|
|
|
def test_resolve_user_number_out_of_range(self, tmp_db):
|
|
_save_simple()
|
|
assert db.resolve_user_number(1, 0) is None
|
|
assert db.resolve_user_number(1, 99) is None
|
|
assert db.resolve_user_number(1, -1) is None
|
|
|
|
def test_resolve_user_number_wrong_user(self, tmp_db):
|
|
_save_simple(user_id=1)
|
|
assert db.resolve_user_number(user_id=2, user_number=1) is None
|
|
|
|
|
|
# ── update_workout ───────────────────────────────────────────────
|
|
|
|
|
|
class TestUpdateWorkout:
|
|
def test_update_preserves_timestamp(self, tmp_db):
|
|
t = datetime(2024, 6, 15, 10, 0, tzinfo=timezone.utc)
|
|
wid = db.save_workout(1, t, [[_make_exercise(name="Old")]])
|
|
new_id = db.update_workout(1, wid, [[_make_exercise(name="New")]])
|
|
assert new_id is not None
|
|
assert new_id != wid
|
|
workouts = db.get_workouts(1)
|
|
assert len(workouts) == 1
|
|
assert workouts[0]["superset_groups"][0][0]["name"] == "New"
|
|
assert workouts[0]["timestamp"] == t.isoformat()
|
|
|
|
def test_update_soft_deletes_old(self, tmp_db):
|
|
wid = _save_simple()
|
|
db.update_workout(1, wid, [[_make_exercise(name="Updated")]])
|
|
# Old workout should have deleted_at set
|
|
with db.get_db() as conn:
|
|
row = conn.execute("SELECT deleted_at FROM workouts WHERE id = ?", (wid,)).fetchone()
|
|
assert row["deleted_at"] is not None
|
|
|
|
def test_update_nonexistent(self, tmp_db):
|
|
assert db.update_workout(1, 999, [[_make_exercise()]]) is None
|
|
|
|
def test_update_wrong_user(self, tmp_db):
|
|
wid = _save_simple(user_id=1)
|
|
assert db.update_workout(2, wid, [[_make_exercise()]]) is None
|
|
assert len(db.get_workouts(1)) == 1 # unchanged
|
|
|
|
def test_update_with_note(self, tmp_db):
|
|
wid = _save_simple()
|
|
new_id = db.update_workout(1, wid, [[_make_exercise()]], note="Updated note")
|
|
workouts = db.get_workouts(1)
|
|
assert workouts[0]["note"] == "Updated note"
|
|
|
|
|
|
# ── get_workout_count ────────────────────────────────────────────
|
|
|
|
|
|
class TestGetWorkoutCount:
|
|
def test_zero(self, tmp_db):
|
|
assert db.get_workout_count(1) == 0
|
|
|
|
def test_counts(self, tmp_db):
|
|
_save_simple()
|
|
_save_simple()
|
|
assert db.get_workout_count(1) == 2
|
|
|
|
|
|
# ── get_stats_sql ────────────────────────────────────────────────
|
|
|
|
|
|
class TestGetStatsSql:
|
|
def test_empty(self, tmp_db):
|
|
stats = db.get_stats_sql(1)
|
|
assert stats["total_workouts"] == 0
|
|
assert stats["total_volume"] == 0
|
|
|
|
def test_volume_calculation(self, tmp_db):
|
|
# 3 sets x 10 reps x 50kg = 1500kg volume
|
|
ex = _make_exercise(sets=3, reps=10, weight=50.0)
|
|
db.save_workout(1, datetime.now(timezone.utc), [[ex]])
|
|
stats = db.get_stats_sql(1)
|
|
assert stats["total_workouts"] == 1
|
|
assert stats["total_sets"] == 3
|
|
assert stats["total_volume"] == 1500.0
|
|
|
|
def test_unique_exercises(self, tmp_db):
|
|
db.save_workout(1, datetime.now(timezone.utc), [
|
|
[_make_exercise(name="Bench")],
|
|
[_make_exercise(name="Squats")],
|
|
])
|
|
db.save_workout(1, datetime.now(timezone.utc), [
|
|
[_make_exercise(name="bench")], # same exercise, different case
|
|
])
|
|
stats = db.get_stats_sql(1)
|
|
assert stats["unique_exercises"] == 2 # bench + squats
|