🌊 Волна 19: backend — 6 фиксов (hints + N+1 + logger)

This commit is contained in:
2026-09-25 10:09:13 +00:00
parent 3d75a00046
commit 555bf44db2
5 changed files with 115 additions and 79 deletions
+25 -18
View File
@@ -48,19 +48,6 @@ async def get_first_letter_hint(request: Request, level_id: int):
if not words:
raise HTTPException(404, "No words found for this level")
# Теперь безопасно инкрементим счётчик
if progress:
await conn.execute(
"UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2",
telegram_id, level_id
)
else:
await conn.execute(
"INSERT INTO user_progress (user_id, level_id, hints_used) VALUES ($1, $2, 1)",
telegram_id, level_id
)
hints_already_used += 1
word_paths = level["word_paths"]
if isinstance(word_paths, str):
import json
@@ -85,6 +72,21 @@ async def get_first_letter_hint(request: Request, level_id: int):
if not found_word:
raise HTTPException(404, "No word paths found for this level")
# 🔧 ФИКС (25.09.2026): hint_consumed_before_word_paths_check —
# инкрементим hints_used ТОЛЬКО после всех проверок.
# Раньше при 404 (нет word_paths) подсказка уже была потрачена.
if progress:
await conn.execute(
"UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2",
telegram_id, level_id
)
else:
await conn.execute(
"INSERT INTO user_progress (user_id, level_id, hints_used) VALUES ($1, $2, 1)",
telegram_id, level_id
)
hints_already_used += 1
return {
"status": "ok",
"word": found_word,
@@ -126,6 +128,16 @@ async def get_word_list(request: Request, level_id: int):
if hints_already_used >= MAX_HINTS:
raise HTTPException(403, "Hint limit reached")
# 🔧 ФИКС (25.09.2026): word_list_hint_consumed_on_empty —
# сначала получаем слова, проверяем что они есть, только потом инкрементим.
words = await conn.fetch(
"SELECT * FROM level_words WHERE level_id = $1 ORDER BY word_pl", level_id
)
if not words:
raise HTTPException(404, "No words found for this level")
# Теперь безопасно инкрементим счётчик
if progress:
await conn.execute(
"UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2",
@@ -138,11 +150,6 @@ async def get_word_list(request: Request, level_id: int):
)
hints_already_used += 1
# Получаем слова
words = await conn.fetch(
"SELECT * FROM level_words WHERE level_id = $1 ORDER BY word_pl", level_id
)
# Определяем язык пользователя
user = await conn.fetchrow(
"SELECT app_language FROM users WHERE telegram_id = $1", telegram_id