diff --git a/main.py b/main.py index dc5443f..e13f452 100644 --- a/main.py +++ b/main.py @@ -88,18 +88,20 @@ def upload(data: PostData, session: SessionDep) -> int: @app.get("/user/today") -def user_today(session: SessionDep) -> int: - user_set = set() +def user_today(session: SessionDep) -> dict[str, int]: + main_set = set() + fast_set = set() + slow_set = set() yesterday = datetime.now(timezone.utc) - timedelta(days=1) for system in session.exec(select(System).where(System.upload_time > yesterday)): - user_set.add(system.user_id) - return len(user_set) - - -@app.get("/user/week") -def user_week(session: SessionDep) -> int: - user_set = set() - last_week = datetime.now(timezone.utc) - timedelta(weeks=1) - for system in session.exec(select(System).where(System.upload_time > last_week)): - user_set.add(system.user_id) - return len(user_set) + if system.branch == "main": + main_set.add(system.user_id) + elif system.branch == "fast" and system.user_id not in main_set: + fast_set.add(system.user_id) + elif ( + system.branch == "slow" + and system.user_id not in main_set + and system.user_id not in fast_set + ): + slow_set.add(system.user_id) + return {"main": len(main_set), "fast": len(fast_set), "slow": len(slow_set)}