[Eva] Ева, привет! Новая задача: игра «Составь #52

Merged
Drobysh merged 4 commits from eva/chat-ec3e05-backend into main 2026-10-16 11:59:55 +00:00
Showing only changes of commit ba9a43dcfa - Show all commits
+5 -13
View File
@@ -410,21 +410,14 @@ async def get_sentence_stats(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( total = await conn.fetchval("SELECT COUNT(*) FROM sentences")
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
)
current_level = user["current_level"] if user else "A1"
total = await conn.fetchval(
"SELECT COUNT(*) FROM sentences WHERE level = $1", current_level
)
completed = await conn.fetchval( completed = await conn.fetchval(
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
total_score = await conn.fetchval( total_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
return { return {
@@ -433,5 +426,4 @@ async def get_sentence_stats(request: Request):
"remaining": total - (completed or 0), "remaining": total - (completed or 0),
"total_score": total_score or 0, "total_score": total_score or 0,
"progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0, "progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0,
"level": current_level,
} }