🌊 Волна 17: backend #8 — баги + N+1 (16 багов)
Продуктовые: - hint_consumed_before_word_check: сначала проверка слов, потом инкремент (hints.py) - hint_fake_first_cell: 404 вместо [0,0] (hints.py) - leaderboard_rank_wrong_for_uncached_user: корректный rank (leaderboard.py) - teacher_ai_explanation_empty_on_failure: fallback-текст (teacher.py) Данные: - duplicate_delete_keeps_wrong_row: оставляем лучшую строку (database.py) Security: - fastapi_docs_exposed: /docs скрыт в проде (main.py) - cf_ip_check_per_request: предкомпиляция CF_IPS (main.py) N+1: - admin_content_lesson_levels_n_plus_1: 3 GROUP BY (admin_content.py) - admin_content_lesson_topics_n_plus_1: 2 GROUP BY (admin_content.py) - admin_content_get_lesson_n_plus_1: ANY + группировка (admin_content.py) - teacher_progress_n_plus_1: 2 GROUP BY (teacher.py) - teacher_diagnostic_test_n_plus_1: ANY + группировка (teacher.py) - orchestrator_n_plus_1_options: ANY + группировка (orchestrator.py) Качество: - cleanup_task_leak_on_startup_failure: cleanup после init (main.py) - unused_first_name: удалена мёртвая переменная (auth.py) Пропущено осознанно: - initdata_in_query_param (fallback deleteFeedPost) - init_db_slow_startup (Alembic, отдельная задача) Аудит v5: Issue #8, backend 16/17 задач
This commit is contained in:
+84
-45
@@ -647,37 +647,53 @@ async def get_lesson_levels(request: Request):
|
||||
ORDER BY sort_order
|
||||
""")
|
||||
|
||||
if not level_rows:
|
||||
return {"levels": []}
|
||||
|
||||
level_codes = [lvl["code"] for lvl in level_rows]
|
||||
|
||||
# 🔧 ФИКС (25.09.2026): admin_content_lesson_levels_n_plus_1 —
|
||||
# 3 GROUP BY запроса вместо 3×N.
|
||||
topics_rows = await conn.fetch("""
|
||||
SELECT level_code, COUNT(*) as cnt
|
||||
FROM learning_topics
|
||||
WHERE level_code = ANY($1::text[]) AND is_active = TRUE
|
||||
GROUP BY level_code
|
||||
""", level_codes)
|
||||
topics_map = {r["level_code"]: r["cnt"] for r in topics_rows}
|
||||
|
||||
lessons_rows = await conn.fetch("""
|
||||
SELECT t.level_code, COUNT(*) as cnt
|
||||
FROM learning_lessons l
|
||||
JOIN learning_topics t ON l.topic_id = t.topic_id
|
||||
WHERE t.level_code = ANY($1::text[]) AND l.is_active = TRUE
|
||||
GROUP BY t.level_code
|
||||
""", level_codes)
|
||||
lessons_map = {r["level_code"]: r["cnt"] for r in lessons_rows}
|
||||
|
||||
last_edited_rows = await conn.fetch("""
|
||||
SELECT level_code, MAX(edited_at) as last_edited
|
||||
FROM (
|
||||
SELECT t.level_code, t.edited_at FROM learning_topics t
|
||||
WHERE t.level_code = ANY($1::text[])
|
||||
UNION ALL
|
||||
SELECT t.level_code, l.edited_at FROM learning_lessons l
|
||||
JOIN learning_topics t ON l.topic_id = t.topic_id
|
||||
WHERE t.level_code = ANY($1::text[])
|
||||
) sub
|
||||
GROUP BY level_code
|
||||
""", level_codes)
|
||||
last_edited_map = {r["level_code"]: r["last_edited"] for r in last_edited_rows}
|
||||
|
||||
result = []
|
||||
for lvl in level_rows:
|
||||
code = lvl["code"]
|
||||
|
||||
topics_count = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM learning_topics
|
||||
WHERE level_code = $1 AND is_active = TRUE
|
||||
""", code) or 0
|
||||
|
||||
lessons_count = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM learning_lessons l
|
||||
JOIN learning_topics t ON l.topic_id = t.topic_id
|
||||
WHERE t.level_code = $1 AND l.is_active = TRUE
|
||||
""", code) or 0
|
||||
|
||||
last_edited = await conn.fetchval("""
|
||||
SELECT MAX(edited_at) FROM (
|
||||
SELECT t.edited_at FROM learning_topics t
|
||||
WHERE t.level_code = $1
|
||||
UNION ALL
|
||||
SELECT l.edited_at FROM learning_lessons l
|
||||
JOIN learning_topics t ON l.topic_id = t.topic_id
|
||||
WHERE t.level_code = $1
|
||||
) sub
|
||||
""", code)
|
||||
|
||||
last_edited = last_edited_map.get(code)
|
||||
result.append({
|
||||
"code": code,
|
||||
"name_ru": lvl["name_ru"],
|
||||
"topics_count": topics_count,
|
||||
"lessons_count": lessons_count,
|
||||
"topics_count": topics_map.get(code, 0),
|
||||
"lessons_count": lessons_map.get(code, 0),
|
||||
"last_edited": last_edited.isoformat() if last_edited else None,
|
||||
})
|
||||
|
||||
@@ -709,20 +725,32 @@ async def get_lesson_topics(request: Request, level: str):
|
||||
ORDER BY order_number ASC
|
||||
""", level)
|
||||
|
||||
if not rows:
|
||||
return {"level": level, "topics": []}
|
||||
|
||||
topic_ids = [r["topic_id"] for r in rows]
|
||||
|
||||
# 🔧 ФИКС (25.09.2026): admin_content_lesson_topics_n_plus_1 —
|
||||
# 2 GROUP BY запроса вместо 2×N.
|
||||
lessons_rows = await conn.fetch("""
|
||||
SELECT topic_id, COUNT(*) as cnt
|
||||
FROM learning_lessons
|
||||
WHERE topic_id = ANY($1::text[]) AND is_active = TRUE
|
||||
GROUP BY topic_id
|
||||
""", topic_ids)
|
||||
lessons_map = {r["topic_id"]: r["cnt"] for r in lessons_rows}
|
||||
|
||||
test_rows = await conn.fetch("""
|
||||
SELECT topic_id, COUNT(*) as cnt
|
||||
FROM learning_questions
|
||||
WHERE topic_id = ANY($1::text[]) AND is_test_question = TRUE
|
||||
GROUP BY topic_id
|
||||
""", topic_ids)
|
||||
test_map = {r["topic_id"]: r["cnt"] for r in test_rows}
|
||||
|
||||
result = []
|
||||
for r in rows:
|
||||
topic_id = r["topic_id"]
|
||||
|
||||
lessons_count = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM learning_lessons
|
||||
WHERE topic_id = $1 AND is_active = TRUE
|
||||
""", topic_id) or 0
|
||||
|
||||
test_questions_count = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM learning_questions
|
||||
WHERE topic_id = $1 AND is_test_question = TRUE
|
||||
""", topic_id) or 0
|
||||
|
||||
result.append({
|
||||
"topic_id": topic_id,
|
||||
"order_number": r["order_number"],
|
||||
@@ -730,8 +758,8 @@ async def get_lesson_topics(request: Request, level: str):
|
||||
"name_ru": r["name_ru"],
|
||||
"name_uk": r["name_uk"],
|
||||
"name_en": r["name_en"],
|
||||
"lessons_count": lessons_count,
|
||||
"test_questions_count": test_questions_count,
|
||||
"lessons_count": lessons_map.get(topic_id, 0),
|
||||
"test_questions_count": test_map.get(topic_id, 0),
|
||||
})
|
||||
|
||||
return {"level": level, "topics": result}
|
||||
@@ -876,15 +904,26 @@ async def get_lesson(request: Request, lesson_id: str):
|
||||
""")
|
||||
wb_map = {w["wrong_because"]: w["explanation_ru"] for w in wb_rows}
|
||||
|
||||
questions = []
|
||||
for q in questions_rows:
|
||||
options_rows = await conn.fetch("""
|
||||
SELECT option_key, text_pl, text_ru, text_uk, text_en,
|
||||
# 🔧 ФИКС (25.09.2026): admin_content_get_lesson_n_plus_1 —
|
||||
# один запрос ANY + группировка.
|
||||
question_ids = [q["question_id"] for q in questions_rows]
|
||||
all_options = []
|
||||
if question_ids:
|
||||
all_options = await conn.fetch("""
|
||||
SELECT question_id, option_key, text_pl, text_ru, text_uk, text_en,
|
||||
is_correct, wrong_because
|
||||
FROM question_options
|
||||
WHERE question_id = $1
|
||||
ORDER BY option_key ASC
|
||||
""", q["question_id"])
|
||||
WHERE question_id = ANY($1::text[])
|
||||
ORDER BY question_id, option_key ASC
|
||||
""", question_ids)
|
||||
|
||||
options_by_q: dict = {}
|
||||
for o in all_options:
|
||||
options_by_q.setdefault(o["question_id"], []).append(o)
|
||||
|
||||
questions = []
|
||||
for q in questions_rows:
|
||||
options_rows = options_by_q.get(q["question_id"], [])
|
||||
|
||||
options = []
|
||||
for o in options_rows:
|
||||
|
||||
Reference in New Issue
Block a user