🌊 Волна 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:
+52
-8
@@ -497,12 +497,27 @@ async def get_lesson(request: Request, lesson_id: str):
|
||||
examples = await conn.fetch("SELECT * FROM lesson_examples WHERE lesson_id = $1 ORDER BY order_number", lesson_id)
|
||||
questions = await conn.fetch("SELECT * FROM learning_questions WHERE lesson_id = $1 AND is_test_question = FALSE ORDER BY id", lesson_id)
|
||||
|
||||
# 🔧 ФИКС (24.09.2026): learning_get_lesson_n_plus_1 —
|
||||
# раньше N+1 запрос на options. Теперь один ANY + группировка в Python.
|
||||
question_ids = [q["question_id"] for q in questions]
|
||||
|
||||
all_options = []
|
||||
if question_ids:
|
||||
all_options = await conn.fetch("""
|
||||
SELECT * FROM question_options
|
||||
WHERE question_id = ANY($1::text[])
|
||||
""", question_ids)
|
||||
|
||||
# Группируем options по question_id
|
||||
options_by_question: dict[str, list] = {}
|
||||
for o in all_options:
|
||||
options_by_question.setdefault(o["question_id"], []).append(dict(o))
|
||||
|
||||
questions_data = []
|
||||
for q in questions:
|
||||
options = await conn.fetch("SELECT * FROM question_options WHERE question_id = $1", q["question_id"])
|
||||
questions_data.append({
|
||||
"question": dict(q),
|
||||
"options": [dict(o) for o in options],
|
||||
"options": options_by_question.get(q["question_id"], []),
|
||||
})
|
||||
|
||||
progress = await conn.fetchrow("SELECT * FROM user_lesson_progress WHERE user_id = $1 AND lesson_id = $2", telegram_id, lesson_id)
|
||||
@@ -523,12 +538,26 @@ async def get_topic_test(request: Request, topic_id: str):
|
||||
async with pool.acquire() as conn:
|
||||
questions = await conn.fetch("SELECT * FROM learning_questions WHERE topic_id = $1 AND is_test_question = TRUE ORDER BY test_order", topic_id)
|
||||
|
||||
# 🔧 ФИКС (24.09.2026): learning_get_lesson_n_plus_1 (тот же паттерн) —
|
||||
# заодно оптимизируем get_topic_test.
|
||||
question_ids = [q["question_id"] for q in questions]
|
||||
|
||||
all_options = []
|
||||
if question_ids:
|
||||
all_options = await conn.fetch("""
|
||||
SELECT * FROM question_options
|
||||
WHERE question_id = ANY($1::text[])
|
||||
""", question_ids)
|
||||
|
||||
options_by_question: dict[str, list] = {}
|
||||
for o in all_options:
|
||||
options_by_question.setdefault(o["question_id"], []).append(dict(o))
|
||||
|
||||
questions_data = []
|
||||
for q in questions:
|
||||
options = await conn.fetch("SELECT * FROM question_options WHERE question_id = $1", q["question_id"])
|
||||
questions_data.append({
|
||||
"question": dict(q),
|
||||
"options": [dict(o) for o in options],
|
||||
"options": options_by_question.get(q["question_id"], []),
|
||||
})
|
||||
|
||||
return {"test": questions_data, "total": len(questions_data)}
|
||||
@@ -862,12 +891,27 @@ async def start_weak_skills_practice(request: Request):
|
||||
VALUES ($1, $2, '', 'weak_skills_practice') RETURNING id
|
||||
""", telegram_id, user_level)
|
||||
|
||||
# 🔧 ФИКС (24.09.2026): learning_get_lesson_n_plus_1 (тот же паттерн) —
|
||||
# оптимизируем и practice/start: N+1 → один ANY + группировка.
|
||||
question_ids = [q["question_id"] for q in questions]
|
||||
|
||||
all_options = []
|
||||
if question_ids:
|
||||
all_options = await conn.fetch("""
|
||||
SELECT * FROM question_options
|
||||
WHERE question_id = ANY($1::text[])
|
||||
""", question_ids)
|
||||
|
||||
options_by_question: dict[str, list] = {}
|
||||
for o in all_options:
|
||||
options_by_question.setdefault(o["question_id"], []).append(dict(o))
|
||||
|
||||
questions_data = []
|
||||
for q in questions:
|
||||
options = await conn.fetch(
|
||||
"SELECT * FROM question_options WHERE question_id = $1", q["question_id"]
|
||||
)
|
||||
questions_data.append({"question": dict(q), "options": [dict(o) for o in options]})
|
||||
questions_data.append({
|
||||
"question": dict(q),
|
||||
"options": options_by_question.get(q["question_id"], []),
|
||||
})
|
||||
|
||||
# Загружаем понятные названия навыков из БД
|
||||
skill_names = await get_skill_names(conn)
|
||||
|
||||
Reference in New Issue
Block a user