🌊 Волна 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
+25 -26
View File
@@ -205,29 +205,12 @@ async def complete_bubble_level(request: Request):
level = $3 level = $3
""", telegram_id, score, current_level) """, telegram_id, score, current_level)
# Проверка достижений # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_bubblewords —
from routers.achievements import check_and_award_achievements # вызовы достижений вынесены за async with pool.acquire() (паттерн game.py).
new_achievements = []
total_levels = await conn.fetchval( total_levels = await conn.fetchval(
"SELECT levels_completed FROM bubble_words_progress WHERE user_id = $1", "SELECT levels_completed FROM bubble_words_progress WHERE user_id = $1",
telegram_id telegram_id
) or 0 ) or 0
ach = await check_and_award_achievements(telegram_id, "bubble_levels", total_levels)
new_achievements.extend(ach)
if hints_used == 0:
ach = await check_and_award_achievements(telegram_id, "bubble_no_hints", 1)
new_achievements.extend(ach)
if score == 100:
ach = await check_and_award_achievements(telegram_id, "bubble_perfect", 1)
new_achievements.extend(ach)
if completion_time is not None and completion_time > 0 and int(completion_time) <= 45:
ach = await check_and_award_achievements(telegram_id, "bubble_speed", 45)
new_achievements.extend(ach)
wordsearch_score = await conn.fetchval( wordsearch_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL", "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id telegram_id
@@ -245,15 +228,31 @@ async def complete_bubble_level(request: Request):
telegram_id telegram_id
) or 0 ) or 0
grand_total = wordsearch_score + sentence_score + wordquiz_score + bubblewords_score 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 = [
("bubble_levels", total_levels),
("total_score", grand_total),
]
if hints_used == 0:
achievements_to_check.append(("bubble_no_hints", 1))
if score == 100:
achievements_to_check.append(("bubble_perfect", 1))
if completion_time is not None and completion_time > 0 and int(completion_time) <= 45:
achievements_to_check.append(("bubble_speed", 45))
# 🔧 ФИКС (23.09.2026): вызовы достижений ВНЕ блока async with pool.acquire()
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) new_achievements.extend(ach)
return { return {
"status": "ok", "status": "ok",
"score": score, "score": score,
"completion_time": completion_time, "completion_time": completion_time,
"new_achievements": new_achievements, "new_achievements": new_achievements,
} }
@router.get("/progress") @router.get("/progress")
+29 -22
View File
@@ -205,21 +205,14 @@ async def check_sentence(request: Request):
telegram_id, sentence_id, score, row["level"], telegram_id, sentence_id, score, row["level"],
) )
from routers.achievements import check_and_award_achievements # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences —
new_achievements = [] # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(),
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
# а сами вызовы делаем ПОСЛЕ выхода (паттерн из game.py).
sentences_completed = await conn.fetchval( sentences_completed = await conn.fetchval(
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1", "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1",
telegram_id 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( wordsearch_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL", "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id telegram_id
@@ -237,24 +230,38 @@ async def check_sentence(request: Request):
telegram_id telegram_id
) or 0 ) or 0
grand_total = wordsearch_score + sentence_score + wordquiz_score + bubblewords_score 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) 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 { return {
"correct": False, "correct": True,
"correct_words": [normalize_word_for_display(w) for w in correct_words_original], "correct_words": [normalize_word_for_display(w) for w in correct_words_original],
"already_completed": False, "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") @router.get("/stats")
async def get_sentence_stats(request: Request): async def get_sentence_stats(request: Request):
+34 -33
View File
@@ -178,28 +178,12 @@ async def check_quiz_answer(request: Request):
correct_streak = $3 correct_streak = $3
""", telegram_id, score, current_streak) """, telegram_id, score, current_streak)
from routers.achievements import check_and_award_achievements # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_wordquiz —
new_achievements = [] # вызовы достижений вынесены за async with pool.acquire() (паттерн game.py).
total_guessed = await conn.fetchval( total_guessed = await conn.fetchval(
"SELECT words_guessed FROM word_quiz_progress WHERE user_id = $1", "SELECT words_guessed FROM word_quiz_progress WHERE user_id = $1",
telegram_id telegram_id
) or 0 ) or 0
ach = await check_and_award_achievements(telegram_id, "quiz_guessed", total_guessed)
new_achievements.extend(ach)
if current_streak >= 10:
ach = await check_and_award_achievements(telegram_id, "quiz_perfect_streak", current_streak)
new_achievements.extend(ach)
if mistakes == 0:
ach = await check_and_award_achievements(telegram_id, "quiz_no_mistakes", 1)
new_achievements.extend(ach)
if completion_time is not None and completion_time > 0 and int(completion_time) <= 3:
ach = await check_and_award_achievements(telegram_id, "quiz_speed", 3)
new_achievements.extend(ach)
wordsearch_score = await conn.fetchval( wordsearch_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL", "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id telegram_id
@@ -217,15 +201,17 @@ async def check_quiz_answer(request: Request):
telegram_id telegram_id
) or 0 ) or 0
grand_total = wordsearch_score + sentence_score + wordquiz_score + bubblewords_score grand_total = wordsearch_score + sentence_score + wordquiz_score + bubblewords_score
ach = await check_and_award_achievements(telegram_id, "total_score", grand_total)
new_achievements.extend(ach) achievements_to_check = [
("quiz_guessed", total_guessed),
return { ("total_score", grand_total),
"correct": True, ]
"score": score, if current_streak >= 10:
"correct_streak": current_streak, achievements_to_check.append(("quiz_perfect_streak", current_streak))
"new_achievements": new_achievements, if mistakes == 0:
} achievements_to_check.append(("quiz_no_mistakes", 1))
if completion_time is not None and completion_time > 0 and int(completion_time) <= 3:
achievements_to_check.append(("quiz_speed", 3))
else: else:
# При 3 ошибках — начисляем утешительные 10 очков # При 3 ошибках — начисляем утешительные 10 очков
if mistakes >= 3: if mistakes >= 3:
@@ -243,12 +229,27 @@ async def check_quiz_answer(request: Request):
ON CONFLICT (user_id) DO UPDATE ON CONFLICT (user_id) DO UPDATE
SET correct_streak = $2 SET correct_streak = $2
""", telegram_id, current_streak) """, telegram_id, current_streak)
return { # 🔧 ФИКС (23.09.2026): вызовы достижений ВНЕ блока async with pool.acquire()
"correct": False, if is_correct:
"correct_streak": current_streak, from routers.achievements import check_and_award_achievements
"consolation_score": 10 if mistakes >= 3 else 0, 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,
"score": score,
"correct_streak": current_streak,
"new_achievements": new_achievements,
}
return {
"correct": False,
"correct_streak": current_streak,
"consolation_score": 10 if mistakes >= 3 else 0,
}
@router.get("/progress") @router.get("/progress")