chelsea/Synculous-2
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix datetime comparison error in victories API

Browse Source
This commit is contained in:
chelsea
2026-02-16 19:14:36 -06:00
parent c7be19611a
commit e4e6ad44ac
1 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
api/routes/victories.py
View File

@@ -32,7 +32,6 @@ def _auth(request):
def register(app): def register(app):
@app.route("/api/victories", methods=["GET"]) @app.route("/api/victories", methods=["GET"])
def api_getVictories(): def api_getVictories():
"""Compute noteworthy achievements. Query: ?days=30""" """Compute noteworthy achievements. Query: ?days=30"""
@@ -42,11 +41,12 @@ def register(app):
days = flask.request.args.get("days", 30, type=int) days = flask.request.args.get("days", 30, type=int)
cutoff = tz.user_now() - timedelta(days=days) cutoff = tz.user_now() - timedelta(days=days)
# Convert to naive datetime for comparison with database timestamps
cutoff = cutoff.replace(tzinfo=None)
sessions = postgres.select("routine_sessions", {"user_uuid": user_uuid}) sessions = postgres.select("routine_sessions", {"user_uuid": user_uuid})
recent = [ recent = [
s for s in sessions s for s in sessions if s.get("created_at") and s["created_at"] >= cutoff
if s.get("created_at") and s["created_at"] >= cutoff
] ]
completed = [s for s in recent if s.get("status") == "completed"] completed = [s for s in recent if s.get("status") == "completed"]
@@ -60,28 +60,38 @@ def register(app):
curr = sorted_completed[i]["created_at"] curr = sorted_completed[i]["created_at"]
gap = (curr - prev).days gap = (curr - prev).days
if gap >= 2: if gap >= 2:
victories.append({ victories.append(
{
"type": "comeback", "type": "comeback",
"message": f"Came back after {gap} days — that takes real strength", "message": f"Came back after {gap} days — that takes real strength",
"date": curr.isoformat() if hasattr(curr, 'isoformat') else str(curr), "date": curr.isoformat()
}) if hasattr(curr, "isoformat")
else str(curr),
}
)
# Weekend completion # Weekend completion
for s in completed: for s in completed:
created = s["created_at"] created = s["created_at"]
if hasattr(created, 'weekday') and created.weekday() >= 5: # Saturday=5, Sunday=6 if (
victories.append({ hasattr(created, "weekday") and created.weekday() >= 5
): # Saturday=5, Sunday=6
victories.append(
{
"type": "weekend", "type": "weekend",
"message": "Completed a routine on the weekend", "message": "Completed a routine on the weekend",
"date": created.isoformat() if hasattr(created, 'isoformat') else str(created), "date": created.isoformat()
}) if hasattr(created, "isoformat")
else str(created),
}
)
break # Only show once break # Only show once
# Variety: 3+ different routines in a week # Variety: 3+ different routines in a week
routine_ids_by_week = {} routine_ids_by_week = {}
for s in completed: for s in completed:
created = s["created_at"] created = s["created_at"]
if hasattr(created, 'isocalendar'): if hasattr(created, "isocalendar"):
week_key = created.isocalendar()[:2] week_key = created.isocalendar()[:2]
if week_key not in routine_ids_by_week: if week_key not in routine_ids_by_week:
routine_ids_by_week[week_key] = set() routine_ids_by_week[week_key] = set()
@@ -89,11 +99,13 @@ def register(app):
for week_key, routine_ids in routine_ids_by_week.items(): for week_key, routine_ids in routine_ids_by_week.items():
if len(routine_ids) >= 3: if len(routine_ids) >= 3:
victories.append({ victories.append(
{
"type": "variety", "type": "variety",
"message": f"Completed {len(routine_ids)} different routines in one week", "message": f"Completed {len(routine_ids)} different routines in one week",
"date": None, "date": None,
}) }
)
break break
# Full week consistency: completed every day for 7 consecutive days # Full week consistency: completed every day for 7 consecutive days
@@ -101,7 +113,7 @@ def register(app):
dates_set = set() dates_set = set()
for s in completed: for s in completed:
created = s["created_at"] created = s["created_at"]
if hasattr(created, 'date'): if hasattr(created, "date"):
dates_set.add(created.date()) dates_set.add(created.date())
sorted_dates = sorted(dates_set) sorted_dates = sorted(dates_set)
@@ -115,11 +127,13 @@ def register(app):
current_streak = 1 current_streak = 1
if max_streak >= 7: if max_streak >= 7:
victories.append({ victories.append(
{
"type": "consistency", "type": "consistency",
"message": f"Completed routines every day for {max_streak} days straight", "message": f"Completed routines every day for {max_streak} days straight",
"date": None, "date": None,
}) }
)
# Limit and deduplicate # Limit and deduplicate
seen_types = set() seen_types = set()