🌊 Волна 23: быстрые фиксы (N+1, индексы, rate limiter, options)

- admin_content get_word_levels: 12 запросов → 1 GROUP BY
- admin_content update_lesson: валидация >26 options (option_key overflow)
- database.py: удалены дубли индексов levels/sentences
- main.py RateLimiter._cleanup: использует max(window) из limits

Аудит v10: быстрые фиксы
This commit is contained in:
2026-09-25 18:07:09 +00:00
parent eda9bbd92c
commit f7a4bf5c71
3 changed files with 47 additions and 13 deletions
+29 -8
View File
@@ -181,20 +181,32 @@ async def get_word_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_get_word_levels_n_plus_1 —
# раньше 6 уровней × 2 запроса = 12 round-trip. Теперь 1 GROUP BY.
rows = await conn.fetch("""
SELECT level,
COUNT(*) as cnt,
MAX(edited_at) as last_edited
FROM level_words
WHERE level = ANY($1::text[]) AND level_id IS NULL
GROUP BY level
""", level_codes)
stats_map = {r["level"]: r for r in rows}
result = []
for lvl in level_rows:
code = lvl["code"]
# 🔧 ФИКС: только level_id IS NULL
count = await conn.fetchval(
"SELECT COUNT(*) FROM level_words WHERE level = $1 AND level_id IS NULL", code
) or 0
last_edited = await conn.fetchval(
"SELECT MAX(edited_at) FROM level_words WHERE level = $1 AND level_id IS NULL", code
)
stat = stats_map.get(code)
last_edited = stat["last_edited"] if stat else None
result.append({
"code": code,
"name_ru": lvl["name_ru"],
"words_count": count,
"words_count": stat["cnt"] if stat else 0,
"last_edited": last_edited.isoformat() if last_edited else None,
})
@@ -1086,6 +1098,15 @@ async def update_lesson(request: Request, lesson_id: str):
if not isinstance(options_raw, list) or len(options_raw) == 0:
raise HTTPException(400, f"At least one option required for question {question_id}")
# 🔧 ФИКС (25.09.2026): admin_content_option_key_overflow —
# если >26 вариантов, chr(ord('A') + idx) даст '[' '\' ']' —
# фронт не сопоставит correct_answer. Ограничиваем 26 (A-Z).
if len(options_raw) > 26:
raise HTTPException(
400,
f"Question {question_id}: too many options (max 26, got {len(options_raw)})"
)
# Проверка: ровно один правильный вариант
correct_count = sum(1 for o in options_raw if o.get("is_correct") is True)
if correct_count != 1: