feat: XP foundation + waves + featured game + profile + leaderboard by total_xp
- services/xp.py: award_xp, level_for, RANKS (48), featured_game - services/waves.py: wave_plan, grid_size_for, wave_medal - routers/featured.py: GET /featured (игра дня ×1.5) - routers/users.py: POST /set-nickname, POST /set-avatar - routers/app_auth.py: /auth/me с XP-полями (level, rank_key, rank_name, xp) - routers/game.py: award_xp + 3 штрафа + POST /game/next (волны) - routers/wordquiz.py: award_xp + серии в choose_progress - routers/bubblewords.py: award_xp + 4 штрафа - routers/sentences.py: award_xp по длине предложения - routers/leaderboard.py: сортировка по total_xp, XP-поля в ответе - database.py: миграции user_profile, xp_log, choose_progress, user_seen_levels, user_game_progress, wave_results, bubble_levels, user_word_stats - main.py: подключение routers/featured Проверено: - /auth/me отдаёт level=1, rank_00, xp_in_level - /featured отдаёт wordsearch + seconds_left - /game/complete-level начисляет XP через award_xp - xp_log, user_profile заполняются - /game/next выдаёт уровень по волнам - /leaderboard сортирует по total_xp
This commit is contained in:
+171
-101
@@ -10,7 +10,18 @@ LEVELS = ["A1", "A2", "B1", "B2", "C1", "C2"]
|
||||
|
||||
@router.get("")
|
||||
async def get_leaderboard(request: Request, limit: int = 50):
|
||||
"""Рейтинг игроков — быстрое чтение из кэша"""
|
||||
"""
|
||||
Рейтинг игроков.
|
||||
|
||||
🔧 ОБНОВЛЕНО (08.10.2026): XP-фундамент.
|
||||
|
||||
Сортировка: total_xp DESC → total_score DESC.
|
||||
weekly_xp в БД остаётся, но больше НЕ используется в сортировке.
|
||||
Legacy-поля (total_score, wordsearch_score, ...) сохранены для Mini App.
|
||||
|
||||
Новые поля в каждой строке: total_xp, level, rank_key, rank_name,
|
||||
xp_in_level, xp_needed, avatar_id.
|
||||
"""
|
||||
telegram_id, _ = await require_auth(request)
|
||||
|
||||
if limit < 1:
|
||||
@@ -28,17 +39,39 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
|
||||
current_level = user["current_level"] or "A1"
|
||||
|
||||
# Быстрое чтение из MATERIALIZED VIEW
|
||||
# 🆕 Топ-N: matview + LEFT JOIN user_profile для XP.
|
||||
# 🔧 ОБНОВЛЕНО (08.10.2026): сортировка по total_xp (weekly_xp убран).
|
||||
rows = await conn.fetch("""
|
||||
SELECT * FROM leaderboard_cache
|
||||
ORDER BY total_score DESC
|
||||
SELECT
|
||||
lc.*,
|
||||
COALESCE(p.weekly_xp, 0) AS weekly_xp,
|
||||
COALESCE(p.total_xp, 0) AS total_xp,
|
||||
COALESCE(p.avatar_id, 0) AS avatar_id,
|
||||
u.app_language
|
||||
FROM leaderboard_cache lc
|
||||
LEFT JOIN user_profile p ON p.user_id = lc.telegram_id
|
||||
LEFT JOIN users u ON u.telegram_id = lc.telegram_id
|
||||
ORDER BY COALESCE(p.total_xp, 0) DESC,
|
||||
lc.total_score DESC,
|
||||
lc.telegram_id ASC
|
||||
LIMIT $1
|
||||
""", limit)
|
||||
|
||||
leaderboard = []
|
||||
for i, row in enumerate(rows):
|
||||
leaderboard.append({
|
||||
"rank": i + 1,
|
||||
# Импорт XP-хелперов
|
||||
from services.xp import level_for, rank_for
|
||||
|
||||
def _serialize_row(row, rank_num):
|
||||
"""Собирает строку рейтинга с legacy + XP-полями."""
|
||||
weekly_xp = int(row["weekly_xp"] or 0)
|
||||
total_xp = int(row["total_xp"] or 0)
|
||||
level, xp_in_level, xp_needed, rank_key = level_for(total_xp)
|
||||
lang = (row.get("app_language") or "ru").lower()
|
||||
if lang not in ("pl", "ru", "uk", "en"):
|
||||
lang = "ru"
|
||||
|
||||
return {
|
||||
# Legacy (Mini App)
|
||||
"rank": rank_num,
|
||||
"telegram_id": row["telegram_id"],
|
||||
"username": row["username"] or f"Player{row['telegram_id']}",
|
||||
"total_score": row["total_score"],
|
||||
@@ -50,100 +83,131 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
"bubble_levels_completed": row["bubble_levels_completed"],
|
||||
"levels_completed": 0,
|
||||
"sentences_completed": 0,
|
||||
})
|
||||
# 🆕 XP (Pleily)
|
||||
"weekly_xp": weekly_xp, # оставлен для legacy Mini App
|
||||
"total_xp": total_xp,
|
||||
"level": level,
|
||||
"rank_key": rank_key,
|
||||
"rank_name": rank_for(level, lang),
|
||||
"xp_in_level": xp_in_level,
|
||||
"xp_needed": xp_needed,
|
||||
"avatar_id": int(row["avatar_id"] or 0),
|
||||
"app_language": lang,
|
||||
}
|
||||
|
||||
# 🔧 ФИКС (25.09.2026): leaderboard_rank_wrong_for_uncached_user —
|
||||
# если пользователя нет в leaderboard_cache, подзапрос вернёт NULL,
|
||||
# и COUNT(*) + 1 = 1 (юзер видит себя первым, хотя у него 0 очков).
|
||||
# Теперь: если user нет в кэше — считаем его место по количеству
|
||||
# записей с total_score > 0 + 1 (в конец списка).
|
||||
my_total_in_cache = await conn.fetchval("""
|
||||
SELECT total_score FROM leaderboard_cache WHERE telegram_id = $1
|
||||
""", telegram_id)
|
||||
leaderboard = [
|
||||
_serialize_row(row, rank_num=i + 1)
|
||||
for i, row in enumerate(rows)
|
||||
]
|
||||
|
||||
if my_total_in_cache is None:
|
||||
# Пользователя нет в кэше — считаем по количеству с > 0
|
||||
user_rank = await conn.fetchval("""
|
||||
SELECT COUNT(*) + 1 FROM leaderboard_cache
|
||||
WHERE total_score > 0
|
||||
""") or 1
|
||||
else:
|
||||
user_rank = await conn.fetchval("""
|
||||
SELECT COUNT(*) + 1 FROM leaderboard_cache
|
||||
WHERE total_score > $1
|
||||
""", my_total_in_cache)
|
||||
|
||||
# Персональная статистика пользователя
|
||||
# ============ Мой ранг ============
|
||||
# Читаем мои XP + legacy-статистику.
|
||||
my_row = await conn.fetchrow("""
|
||||
SELECT * FROM leaderboard_cache WHERE telegram_id = $1
|
||||
SELECT
|
||||
lc.*,
|
||||
COALESCE(p.weekly_xp, 0) AS weekly_xp,
|
||||
COALESCE(p.total_xp, 0) AS total_xp,
|
||||
COALESCE(p.avatar_id, 0) AS avatar_id,
|
||||
u.app_language
|
||||
FROM leaderboard_cache lc
|
||||
LEFT JOIN user_profile p ON p.user_id = lc.telegram_id
|
||||
LEFT JOIN users u ON u.telegram_id = lc.telegram_id
|
||||
WHERE lc.telegram_id = $1
|
||||
""", telegram_id)
|
||||
|
||||
if my_row:
|
||||
# Если юзера нет в matview — пробуем только user_profile.
|
||||
if not my_row:
|
||||
my_profile = await conn.fetchrow("""
|
||||
SELECT
|
||||
p.weekly_xp, p.total_xp, p.avatar_id,
|
||||
u.username, u.app_language, u.current_level
|
||||
FROM user_profile p
|
||||
JOIN users u ON u.telegram_id = p.user_id
|
||||
WHERE p.user_id = $1
|
||||
""", telegram_id)
|
||||
|
||||
if my_profile:
|
||||
my_weekly_xp = int(my_profile["weekly_xp"] or 0)
|
||||
my_total_xp = int(my_profile["total_xp"] or 0)
|
||||
my_avatar_id = int(my_profile["avatar_id"] or 0)
|
||||
my_username = my_profile["username"]
|
||||
my_lang = (my_profile["app_language"] or "ru").lower()
|
||||
else:
|
||||
my_weekly_xp = 0
|
||||
my_total_xp = 0
|
||||
my_avatar_id = 0
|
||||
my_username = None
|
||||
my_lang = "ru"
|
||||
|
||||
# 🔧 ОБНОВЛЕНО (08.10.2026): место по total_xp (не weekly_xp).
|
||||
my_position = await conn.fetchval("""
|
||||
SELECT COUNT(*) + 1
|
||||
FROM user_profile
|
||||
WHERE total_xp > $1
|
||||
""", my_total_xp) or 1
|
||||
|
||||
# Legacy-статистика (для совместимости с Mini App)
|
||||
my_wordsearch = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_sentence = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_wordquiz = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_words_guessed = await conn.fetchval(
|
||||
"SELECT COALESCE(words_guessed, 0) FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_bubblewords = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM bubble_words_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_bubble_levels = await conn.fetchval(
|
||||
"SELECT COALESCE(levels_completed, 0) FROM bubble_words_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_total = my_wordsearch + my_sentence + my_wordquiz + my_bubblewords
|
||||
my_wordsearch_levels = 0
|
||||
my_sentences_completed = 0
|
||||
my_avatar_id_final = my_avatar_id
|
||||
my_username_final = my_username
|
||||
my_lang_final = my_lang
|
||||
else:
|
||||
my_weekly_xp = int(my_row["weekly_xp"] or 0)
|
||||
my_total_xp = int(my_row["total_xp"] or 0)
|
||||
my_avatar_id_final = int(my_row["avatar_id"] or 0)
|
||||
my_username_final = my_row["username"]
|
||||
my_lang_final = (my_row["app_language"] or "ru").lower()
|
||||
my_wordsearch = my_row["wordsearch_score"]
|
||||
my_sentence = my_row["sentence_score"]
|
||||
my_wordquiz = my_row["wordquiz_score"]
|
||||
my_words_guessed = my_row["words_guessed"]
|
||||
my_bubblewords = my_row["bubblewords_score"]
|
||||
my_bubble_levels = my_row["bubble_levels_completed"]
|
||||
else:
|
||||
my_wordsearch = 0
|
||||
my_sentence = 0
|
||||
my_wordquiz = 0
|
||||
my_words_guessed = 0
|
||||
my_bubblewords = 0
|
||||
my_bubble_levels = 0
|
||||
my_total = my_wordsearch + my_sentence + my_wordquiz + my_bubblewords
|
||||
|
||||
# Считаем НАПРЯМУЮ из основных таблиц
|
||||
my_wordsearch_levels = await conn.fetchval(
|
||||
"SELECT COUNT(DISTINCT level_id) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
# 🔧 ОБНОВЛЕНО (08.10.2026): место по total_xp (не weekly_xp).
|
||||
my_position = await conn.fetchval("""
|
||||
SELECT COUNT(*) + 1
|
||||
FROM user_profile
|
||||
WHERE total_xp > $1
|
||||
""", my_total_xp) or 1
|
||||
|
||||
my_sentences_completed = await conn.fetchval(
|
||||
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
# Если пользователя нет в кэше — считаем очки из основных таблиц
|
||||
if not my_row:
|
||||
my_wordsearch = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
my_wordsearch_levels = await conn.fetchval(
|
||||
"SELECT COUNT(DISTINCT level_id) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
my_sentences_completed = await conn.fetchval(
|
||||
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_sentence = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_wordquiz = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_words_guessed = await conn.fetchval(
|
||||
"SELECT COALESCE(words_guessed, 0) FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_bubblewords = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM bubble_words_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_bubble_levels = await conn.fetchval(
|
||||
"SELECT COALESCE(levels_completed, 0) FROM bubble_words_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
my_total = my_wordsearch + my_sentence + my_wordquiz + my_bubblewords
|
||||
my_position = user_rank or 1
|
||||
|
||||
# 🔧 ФИКС N+1 (19.09.2026): 48 запросов → 5.
|
||||
# Было: цикл по 6 уровням × 8 запросов = 48 round-trip к БД.
|
||||
# Стало: 5 агрегированных запросов + сборка level_stats в Python.
|
||||
|
||||
# 1. Справочники (не зависят от юзера) — одним запросом
|
||||
# ============ level_stats (legacy для Mini App) ============
|
||||
ref_row = await conn.fetchrow("""
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM levels WHERE level = 'A1') AS a1_levels,
|
||||
@@ -160,11 +224,8 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
(SELECT COUNT(*) FROM sentences WHERE level = 'C2') AS c2_sent
|
||||
""")
|
||||
|
||||
# 2. Очки и прогресс по всем уровням сразу — 4 запроса с GROUP BY
|
||||
ws_rows = await conn.fetch("""
|
||||
SELECT level,
|
||||
COALESCE(SUM(score), 0) AS score,
|
||||
COUNT(*) AS completed
|
||||
SELECT level, COALESCE(SUM(score), 0) AS score, COUNT(*) AS completed
|
||||
FROM user_progress
|
||||
WHERE user_id = $1 AND completed_at IS NOT NULL
|
||||
GROUP BY level
|
||||
@@ -172,9 +233,7 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
ws_by_level = {r["level"]: r for r in ws_rows}
|
||||
|
||||
s_rows = await conn.fetch("""
|
||||
SELECT level,
|
||||
COALESCE(SUM(score), 0) AS score,
|
||||
COUNT(*) AS completed
|
||||
SELECT level, COALESCE(SUM(score), 0) AS score, COUNT(*) AS completed
|
||||
FROM sentence_progress
|
||||
WHERE user_id = $1 AND completed_at IS NOT NULL
|
||||
GROUP BY level
|
||||
@@ -183,23 +242,19 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
|
||||
wq_rows = await conn.fetch("""
|
||||
SELECT level, COALESCE(total_score, 0) AS score
|
||||
FROM word_quiz_progress
|
||||
WHERE user_id = $1
|
||||
FROM word_quiz_progress WHERE user_id = $1
|
||||
""", telegram_id)
|
||||
wq_by_level = {r["level"]: r for r in wq_rows}
|
||||
|
||||
bw_rows = await conn.fetch("""
|
||||
SELECT level, COALESCE(total_score, 0) AS score
|
||||
FROM bubble_words_progress
|
||||
WHERE user_id = $1
|
||||
FROM bubble_words_progress WHERE user_id = $1
|
||||
""", telegram_id)
|
||||
bw_by_level = {r["level"]: r for r in bw_rows}
|
||||
|
||||
# 3. Собираем level_stats в Python — без единого запроса
|
||||
level_stats = {}
|
||||
for lvl in LEVELS:
|
||||
lvl_lower = lvl.lower()
|
||||
|
||||
ws_score = ws_by_level.get(lvl, {}).get("score", 0) or 0
|
||||
ws_completed = ws_by_level.get(lvl, {}).get("completed", 0) or 0
|
||||
s_score = s_by_level.get(lvl, {}).get("score", 0) or 0
|
||||
@@ -209,7 +264,6 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
|
||||
total_ws_levels = ref_row[f"{lvl_lower}_levels"] or 0
|
||||
total_sentences = ref_row[f"{lvl_lower}_sent"] or 0
|
||||
|
||||
total_items = total_ws_levels + total_sentences
|
||||
completed_items = ws_completed + s_completed
|
||||
progress_percent = round((completed_items / total_items * 100), 1) if total_items > 0 else 0
|
||||
@@ -223,15 +277,20 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
"bubblewords_score": bw_score,
|
||||
}
|
||||
|
||||
# 🔧 ИСПРАВЛЕНО: вызов достижений ВНЕ блока async with pool.acquire()
|
||||
# Достижения
|
||||
from routers.achievements import check_and_award_achievements
|
||||
if my_position <= 3:
|
||||
await check_and_award_achievements(telegram_id, "rank_reached", my_position)
|
||||
|
||||
# ============ Мой ранг (XP) ============
|
||||
my_level, my_xp_in_level, my_xp_needed, my_rank_key = level_for(my_total_xp)
|
||||
my_rank_name = rank_for(my_level, my_lang_final)
|
||||
|
||||
return {
|
||||
"leaderboard": leaderboard,
|
||||
"current_level": current_level,
|
||||
"my_rank": {
|
||||
# Legacy
|
||||
"rank": my_position,
|
||||
"telegram_id": telegram_id,
|
||||
"total_score": my_total,
|
||||
@@ -243,6 +302,17 @@ async def get_leaderboard(request: Request, limit: int = 50):
|
||||
"words_guessed": my_words_guessed,
|
||||
"bubblewords_score": my_bubblewords,
|
||||
"bubble_levels_completed": my_bubble_levels,
|
||||
# 🆕 XP
|
||||
"username": my_username_final,
|
||||
"weekly_xp": my_weekly_xp, # оставлен для legacy Mini App
|
||||
"total_xp": my_total_xp,
|
||||
"level": my_level,
|
||||
"rank_key": my_rank_key,
|
||||
"rank_name": my_rank_name,
|
||||
"xp_in_level": my_xp_in_level,
|
||||
"xp_needed": my_xp_needed,
|
||||
"avatar_id": my_avatar_id_final,
|
||||
"app_language": my_lang_final,
|
||||
},
|
||||
"level_stats": level_stats,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user