🌊 Волна 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:
+12
-4
@@ -989,13 +989,21 @@ async def init_db():
|
||||
# - idx_skill_mastery_user (user_id+skill_tag уже UNIQUE)
|
||||
# - idx_user_progress_user (user_id+level_id уже PK)
|
||||
# - idx_sentence_progress_user (user_id+sentence_id уже PK)
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_levels_number ON levels(level_number)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_levels_level ON levels(level)")
|
||||
#
|
||||
# 🔧 ФИКС (25.09.2026): redundant_indexes_levels_sentences —
|
||||
# составной индекс (level, level_number) покрывает и level,
|
||||
# и level_number. Убраны дубли:
|
||||
# idx_levels_number, idx_levels_level,
|
||||
# idx_sentences_number, idx_sentences_level.
|
||||
# DROP на случай, если они уже созданы в предыдущих деплоях.
|
||||
await conn.execute("DROP INDEX IF EXISTS idx_levels_number")
|
||||
await conn.execute("DROP INDEX IF EXISTS idx_levels_level")
|
||||
await conn.execute("DROP INDEX IF EXISTS idx_sentences_number")
|
||||
await conn.execute("DROP INDEX IF EXISTS idx_sentences_level")
|
||||
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_levels_level_number ON levels(level, level_number)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_level_words_level_id ON level_words(level_id)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_level_words_level ON level_words(level)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_sentences_number ON sentences(sentence_number)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_sentences_level ON sentences(level)")
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_sentences_level_number ON sentences(level, sentence_number)")
|
||||
# Оставляем score-индексы (не дубли)
|
||||
await conn.execute("CREATE INDEX IF NOT EXISTS idx_user_progress_score ON user_progress(score DESC)")
|
||||
|
||||
@@ -92,9 +92,14 @@ class RateLimiter:
|
||||
self._cleanup_task = None
|
||||
|
||||
def _cleanup(self):
|
||||
# 🔧 ФИКС (25.09.2026): rate_limiter_cleanup_hardcoded_window —
|
||||
# раньше жёстко 60с. Если добавить лимит с window > 60,
|
||||
# записи удалялись бы раньше времени, и лимит не работал.
|
||||
# Теперь: max(window) из self.limits.
|
||||
now = time.time()
|
||||
max_window = max(cfg["window"] for cfg in self.limits.values())
|
||||
for key in list(self.requests.keys()):
|
||||
self.requests[key] = [t for t in self.requests[key] if now - t < 60]
|
||||
self.requests[key] = [t for t in self.requests[key] if now - t < max_window]
|
||||
if not self.requests[key]:
|
||||
del self.requests[key]
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user