🌊 Волна 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:
+69
-37
@@ -82,50 +82,82 @@ async def get_content_summary(request: Request):
|
||||
ORDER BY sort_order
|
||||
""")
|
||||
|
||||
# 🔧 ФИКС (24.09.2026): admin_content_summary_n_plus_1 —
|
||||
# раньше 6 уровней × 5 запросов = 30 round-trip. Теперь 5 GROUP BY.
|
||||
level_codes = [lvl["code"] for lvl in level_rows]
|
||||
|
||||
# 1. Темы — GROUP BY level_code
|
||||
topics_rows = await conn.fetch("""
|
||||
SELECT level_code, COUNT(*) as cnt
|
||||
FROM learning_topics
|
||||
WHERE level_code = ANY($1::text[])
|
||||
GROUP BY level_code
|
||||
""", level_codes)
|
||||
topics_map = {r["level_code"]: r["cnt"] for r in topics_rows}
|
||||
|
||||
# 2. Уроки — GROUP BY level_code (через JOIN)
|
||||
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[])
|
||||
GROUP BY t.level_code
|
||||
""", level_codes)
|
||||
lessons_map = {r["level_code"]: r["cnt"] for r in lessons_rows}
|
||||
|
||||
# 3. Слова — GROUP BY level (level_id IS NULL)
|
||||
words_rows = await conn.fetch("""
|
||||
SELECT level, COUNT(*) as cnt
|
||||
FROM level_words
|
||||
WHERE level = ANY($1::text[]) AND level_id IS NULL
|
||||
GROUP BY level
|
||||
""", level_codes)
|
||||
words_map = {r["level"]: r["cnt"] for r in words_rows}
|
||||
|
||||
# 4. Тексты — GROUP BY level
|
||||
texts_rows = await conn.fetch("""
|
||||
SELECT level, COUNT(*) as cnt
|
||||
FROM sentences
|
||||
WHERE level = ANY($1::text[])
|
||||
GROUP BY level
|
||||
""", level_codes)
|
||||
texts_map = {r["level"]: r["cnt"] for r in texts_rows}
|
||||
|
||||
# 5. Последняя правка — один запрос с UNION ALL + GROUP BY
|
||||
last_edited_rows = await conn.fetch("""
|
||||
SELECT level_code, MAX(edited_at) as last_edited
|
||||
FROM (
|
||||
SELECT level_code, edited_at FROM learning_topics
|
||||
WHERE 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[])
|
||||
UNION ALL
|
||||
SELECT level, edited_at FROM level_words
|
||||
WHERE level = ANY($1::text[]) AND level_id IS NULL
|
||||
UNION ALL
|
||||
SELECT level, edited_at FROM sentences
|
||||
WHERE level = 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
|
||||
result = []
|
||||
for lvl in level_rows:
|
||||
code = lvl["code"]
|
||||
|
||||
topics_total = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM learning_topics WHERE level_code = $1
|
||||
""", code) or 0
|
||||
|
||||
lessons_total = 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
|
||||
""", code) or 0
|
||||
|
||||
# 🔧 ФИКС: только level_id IS NULL
|
||||
words_total = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM level_words WHERE level = $1 AND level_id IS NULL
|
||||
""", code) or 0
|
||||
|
||||
texts_total = await conn.fetchval("""
|
||||
SELECT COUNT(*) FROM sentences WHERE level = $1
|
||||
""", code) or 0
|
||||
|
||||
last_edited = await conn.fetchval("""
|
||||
SELECT MAX(edited_at) FROM (
|
||||
SELECT edited_at FROM learning_topics WHERE 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
|
||||
UNION ALL
|
||||
SELECT edited_at FROM level_words WHERE level = $1 AND level_id IS NULL
|
||||
UNION ALL
|
||||
SELECT edited_at FROM sentences WHERE level = $1
|
||||
) sub
|
||||
""", code)
|
||||
last_edited = last_edited_map.get(code)
|
||||
|
||||
result.append({
|
||||
"code": code,
|
||||
"name_ru": lvl["name_ru"],
|
||||
"topics_total": topics_total,
|
||||
"lessons_total": lessons_total,
|
||||
"words_total": words_total,
|
||||
"texts_total": texts_total,
|
||||
"topics_total": topics_map.get(code, 0),
|
||||
"lessons_total": lessons_map.get(code, 0),
|
||||
"words_total": words_map.get(code, 0),
|
||||
"texts_total": texts_map.get(code, 0),
|
||||
"last_edited": last_edited.isoformat() if last_edited else None,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user