🌊 Волна 2: backend дедлоки пула (3 бага)

- achievements_nested_pool_acquire_sentences: вынос check_and_award_achievements
  за пределы async with pool.acquire() (sentences.py)
- achievements_nested_pool_acquire_wordquiz: то же (wordquiz.py)
- achievements_nested_pool_acquire_bubblewords: то же (bubblewords.py)

Паттерн скопирован из game.py (эталон).
Собираем данные внутри блока → закрываем блок → вызываем достижения.

Аудит: Issue #4, backend 3/20 задач
This commit is contained in:
2026-09-23 11:52:11 +00:00
parent f2715b7593
commit 3922ae2286
3 changed files with 88 additions and 81 deletions
+29 -22
View File
@@ -205,21 +205,14 @@ async def check_sentence(request: Request):
telegram_id, sentence_id, score, row["level"],
)
from routers.achievements import check_and_award_achievements
new_achievements = []
# 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences —
# раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(),
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
# а сами вызовы делаем ПОСЛЕ выхода (паттерн из game.py).
sentences_completed = await conn.fetchval(
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1",
telegram_id
)
ach = await check_and_award_achievements(telegram_id, "sentences_completed", sentences_completed)
new_achievements.extend(ach)
if completion_time is not None and completion_time > 0:
ach = await check_and_award_achievements(telegram_id, "speed_sentence", int(completion_time))
new_achievements.extend(ach)
# Общий счёт по ВСЕМ играм
wordsearch_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id
@@ -237,24 +230,38 @@ async def check_sentence(request: Request):
telegram_id
) or 0
grand_total = wordsearch_score + sentence_score + wordquiz_score + bubblewords_score
ach = await check_and_award_achievements(telegram_id, "total_score", grand_total)
# Собираем «что проверить» — вызовы достижений вне блока
achievements_to_check = [
("sentences_completed", sentences_completed),
("total_score", grand_total),
]
if completion_time is not None and completion_time > 0:
achievements_to_check.append(("speed_sentence", int(completion_time)))
# 🔧 ФИКС (23.09.2026): вызовы достижений ВНЕ блока async with pool.acquire()
if is_correct:
from routers.achievements import check_and_award_achievements
new_achievements = []
for ach_type, value in achievements_to_check:
ach = await check_and_award_achievements(telegram_id, ach_type, value)
new_achievements.extend(ach)
return {
"correct": True,
"correct_words": [normalize_word_for_display(w) for w in correct_words_original],
"already_completed": False,
"score": score,
"new_achievements": new_achievements
}
return {
"correct": False,
"correct": True,
"correct_words": [normalize_word_for_display(w) for w in correct_words_original],
"already_completed": False,
"new_achievements": []
"score": score,
"new_achievements": new_achievements
}
return {
"correct": False,
"correct_words": [normalize_word_for_display(w) for w in correct_words_original],
"already_completed": False,
"new_achievements": []
}
@router.get("/stats")
async def get_sentence_stats(request: Request):