🌊 Волна 11: backend N+1 + метрики (5 багов)
- online_now_counts_all_today_logins: убрана ветка daily_logins, фильтр 30 мин (admin.py) - assistant_personal_stats_n_plus_1: 36 → 6 запросов через GROUP BY (assistant.py) - learning_get_lesson_n_plus_1: ANY + группировка options, + get_topic_test (learning.py) - feed_attachment_order_collision: MAX(order_number)+1 + UNIQUE (feed.py + database.py) - admin_content_summary_n_plus_1: 30 → 6 запросов через GROUP BY (admin_content.py) Аудит v2: Issue #5, backend 10/10 задач — закрыто!
This commit is contained in:
+68
-32
@@ -298,47 +298,83 @@ async def get_personal_stats(request: Request):
|
||||
|
||||
current_level = user["current_level"] or "A1"
|
||||
|
||||
# Прогресс по каждому уровню
|
||||
level_progress = {}
|
||||
total_score = 0
|
||||
# 🔧 ФИКС (24.09.2026): assistant_personal_stats_n_plus_1 —
|
||||
# раньше 6 уровней × 6 запросов = 36 round-trip. Теперь 6 GROUP BY + сборка.
|
||||
total_achievements = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM user_achievements WHERE user_id = $1
|
||||
""", telegram_id) or 0
|
||||
|
||||
# Тоталы по уровням (для расчёта процентов) — 4 запроса
|
||||
ws_totals_rows = await conn.fetch("""
|
||||
SELECT level, COUNT(*) as cnt FROM levels
|
||||
WHERE level = ANY($1::text[])
|
||||
GROUP BY level
|
||||
""", LEVELS)
|
||||
ws_totals = {r["level"]: r["cnt"] for r in ws_totals_rows}
|
||||
|
||||
s_totals_rows = await conn.fetch("""
|
||||
SELECT level, COUNT(*) as cnt FROM sentences
|
||||
WHERE level = ANY($1::text[])
|
||||
GROUP BY level
|
||||
""", LEVELS)
|
||||
s_totals = {r["level"]: r["cnt"] for r in s_totals_rows}
|
||||
|
||||
# Прогресс пользователя по уровням — 6 запросов (вместо 24)
|
||||
ws_progress_rows = await conn.fetch("""
|
||||
SELECT level,
|
||||
COUNT(DISTINCT level_id) as completed,
|
||||
COALESCE(SUM(score), 0) as total_score
|
||||
FROM user_progress
|
||||
WHERE user_id = $1 AND completed_at IS NOT NULL
|
||||
AND level = ANY($2::text[])
|
||||
GROUP BY level
|
||||
""", telegram_id, LEVELS)
|
||||
ws_progress = {r["level"]: r for r in ws_progress_rows}
|
||||
|
||||
s_progress_rows = await conn.fetch("""
|
||||
SELECT level,
|
||||
COUNT(*) as completed,
|
||||
COALESCE(SUM(score), 0) as total_score
|
||||
FROM sentence_progress
|
||||
WHERE user_id = $1 AND completed_at IS NOT NULL
|
||||
AND level = ANY($2::text[])
|
||||
GROUP BY level
|
||||
""", telegram_id, LEVELS)
|
||||
s_progress = {r["level"]: r for r in s_progress_rows}
|
||||
|
||||
wq_progress_rows = await conn.fetch("""
|
||||
SELECT level, COALESCE(total_score, 0) as total_score
|
||||
FROM word_quiz_progress
|
||||
WHERE user_id = $1 AND level = ANY($2::text[])
|
||||
""", telegram_id, LEVELS)
|
||||
wq_progress = {r["level"]: r["total_score"] for r in wq_progress_rows}
|
||||
|
||||
bw_progress_rows = await conn.fetch("""
|
||||
SELECT level, COALESCE(total_score, 0) as total_score
|
||||
FROM bubble_words_progress
|
||||
WHERE user_id = $1 AND level = ANY($2::text[])
|
||||
""", telegram_id, LEVELS)
|
||||
bw_progress = {r["level"]: r["total_score"] for r in bw_progress_rows}
|
||||
|
||||
# Собираем level_progress из загруженных данных
|
||||
level_progress = {}
|
||||
total_score = 0
|
||||
|
||||
for level in LEVELS:
|
||||
# Филворды
|
||||
ws_total = await conn.fetchval("SELECT COUNT(*) FROM levels WHERE level = $1", level) or 0
|
||||
ws_completed = await conn.fetchval(
|
||||
"SELECT COUNT(DISTINCT level_id) FROM user_progress WHERE user_id = $1 AND level = $2 AND completed_at IS NOT NULL",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
ws_total = ws_totals.get(level, 0)
|
||||
ws_row = ws_progress.get(level)
|
||||
ws_completed = ws_row["completed"] if ws_row else 0
|
||||
ws_percent = round((ws_completed / ws_total * 100), 1) if ws_total > 0 else 0
|
||||
|
||||
# Предложения
|
||||
s_total = await conn.fetchval("SELECT COUNT(*) FROM sentences WHERE level = $1", level) or 0
|
||||
s_completed = await conn.fetchval(
|
||||
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2 AND completed_at IS NOT NULL",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
s_total = s_totals.get(level, 0)
|
||||
s_row = s_progress.get(level)
|
||||
s_completed = s_row["completed"] if s_row else 0
|
||||
s_percent = round((s_completed / s_total * 100), 1) if s_total > 0 else 0
|
||||
|
||||
# Очки уровня
|
||||
ws_score = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND level = $2 AND completed_at IS NOT NULL",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
s_score = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2 AND completed_at IS NOT NULL",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
wq_score = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM word_quiz_progress WHERE user_id = $1 AND level = $2",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
bw_score = await conn.fetchval(
|
||||
"SELECT COALESCE(total_score, 0) FROM bubble_words_progress WHERE user_id = $1 AND level = $2",
|
||||
telegram_id, level
|
||||
) or 0
|
||||
ws_score = ws_row["total_score"] if ws_row else 0
|
||||
s_score = s_row["total_score"] if s_row else 0
|
||||
wq_score = wq_progress.get(level, 0)
|
||||
bw_score = bw_progress.get(level, 0)
|
||||
|
||||
level_total = ws_score + s_score + wq_score + bw_score
|
||||
total_score += level_total
|
||||
|
||||
Reference in New Issue
Block a user