feat: last_completed_by_level (per-level прогресс) + полный total_score + пагинация

This commit is contained in:
2026-09-30 17:49:09 +00:00
parent aebeaa833f
commit daa79dd43e
4 changed files with 336 additions and 13 deletions
+51 -11
View File
@@ -13,7 +13,8 @@ async def get_progress(request: Request):
pool = await get_pool()
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT last_completed_level, current_level FROM users WHERE telegram_id = $1",
"""SELECT last_completed_level, current_level, last_completed_by_level
FROM users WHERE telegram_id = $1""",
telegram_id
)
@@ -25,6 +26,23 @@ async def get_progress(request: Request):
}
current_level = user["current_level"] or "A1"
# 🔧 ФИКС (30.09.2026): progress_uses_per_level —
# возвращаем last_completed_level для ТЕКУЩЕГО уровня языка,
# а не глобальный счётчик (который смешивал A1+A2+B1).
last_by_level = user["last_completed_by_level"] or {}
if isinstance(last_by_level, str):
try:
import json as _json
last_by_level = _json.loads(last_by_level)
except Exception:
last_by_level = {}
last_completed_for_current = (
last_by_level.get(current_level, 0)
if isinstance(last_by_level, dict)
else 0
)
# Очки из филвордов
wordsearch_score = await conn.fetchval(
@@ -53,7 +71,8 @@ async def get_progress(request: Request):
total_score = (wordsearch_score or 0) + (sentence_score or 0) + (wordquiz_score or 0) + (bubblewords_score or 0)
return {
"last_completed_level": user["last_completed_level"] or 0,
"last_completed_level": last_completed_for_current,
"last_completed_by_level": last_by_level,
"total_score": total_score,
"current_level": current_level
}
@@ -66,7 +85,7 @@ async def get_level(request: Request, level_number: int):
pool = await get_pool()
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT app_language, current_level, last_completed_level FROM users WHERE telegram_id = $1", telegram_id
"SELECT app_language, current_level, last_completed_level, last_completed_by_level FROM users WHERE telegram_id = $1", telegram_id
)
if not user:
@@ -76,6 +95,18 @@ async def get_level(request: Request, level_number: int):
current_level = user["current_level"] or "A1"
last_completed = user["last_completed_level"] or 0
# 🔧 ФИКС (30.09.2026): last_completed_by_level —
# используем per-level счётчик. Fallback на last_completed_level (старый).
last_completed_by_level = user["last_completed_by_level"] or {}
if isinstance(last_completed_by_level, str):
try:
import json as _json
last_completed_by_level = _json.loads(last_completed_by_level)
except Exception:
last_completed_by_level = {}
last_completed = last_completed_by_level.get(current_level, 0) if isinstance(last_completed_by_level, dict) else 0
# Проверяем, что уровень доступен (не дальше следующего за пройденным)
if level_number > 1 and level_number > last_completed + 1:
raise HTTPException(403, "Level not available yet. Complete previous level first.")
@@ -364,13 +395,22 @@ async def complete_level(request: Request):
current_streak = 0
""", telegram_id, level_id, hints_used, score, level_name)
# Обновляем last_completed_level (максимальный номер пройденного уровня)
await conn.execute(
"""UPDATE users
SET last_completed_level = GREATEST(last_completed_level, $2)
WHERE telegram_id = $1""",
telegram_id, current_level_number,
)
# 🔧 ФИКС (30.09.2026): last_completed_by_level —
# обновляем per-level счётчик (JSONB) + старый last_completed_level.
await conn.execute("""
UPDATE users
SET last_completed_level = GREATEST(last_completed_level, $2),
last_completed_by_level = jsonb_set(
COALESCE(last_completed_by_level, '{}'::jsonb),
ARRAY[$3::text],
to_jsonb(GREATEST(
COALESCE((last_completed_by_level->>$3)::int, 0),
$2
)),
true
)
WHERE telegram_id = $1
""", telegram_id, current_level_number, level_name)
# Собираем данные для достижений внутри блока
levels_completed = await conn.fetchval(
@@ -432,7 +472,7 @@ async def complete_level(request: Request):
return {
"status": "ok",
"score": score,
"score": score,
"already_completed": False,
"new_achievements": new_achievements
}