🌊 Волна 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:
+34
-33
@@ -178,28 +178,12 @@ async def check_quiz_answer(request: Request):
|
||||
correct_streak = $3
|
||||
""", telegram_id, score, current_streak)
|
||||
|
||||
from routers.achievements import check_and_award_achievements
|
||||
new_achievements = []
|
||||
|
||||
# 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_wordquiz —
|
||||
# вызовы достижений вынесены за async with pool.acquire() (паттерн game.py).
|
||||
total_guessed = await conn.fetchval(
|
||||
"SELECT words_guessed FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) 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(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
@@ -217,15 +201,17 @@ async def check_quiz_answer(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)
|
||||
new_achievements.extend(ach)
|
||||
|
||||
return {
|
||||
"correct": True,
|
||||
"score": score,
|
||||
"correct_streak": current_streak,
|
||||
"new_achievements": new_achievements,
|
||||
}
|
||||
|
||||
achievements_to_check = [
|
||||
("quiz_guessed", total_guessed),
|
||||
("total_score", grand_total),
|
||||
]
|
||||
if current_streak >= 10:
|
||||
achievements_to_check.append(("quiz_perfect_streak", current_streak))
|
||||
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:
|
||||
# При 3 ошибках — начисляем утешительные 10 очков
|
||||
if mistakes >= 3:
|
||||
@@ -243,12 +229,27 @@ async def check_quiz_answer(request: Request):
|
||||
ON CONFLICT (user_id) DO UPDATE
|
||||
SET correct_streak = $2
|
||||
""", telegram_id, current_streak)
|
||||
|
||||
return {
|
||||
"correct": False,
|
||||
"correct_streak": current_streak,
|
||||
"consolation_score": 10 if mistakes >= 3 else 0,
|
||||
}
|
||||
|
||||
# 🔧 ФИКС (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,
|
||||
"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")
|
||||
|
||||
Reference in New Issue
Block a user