From 3922ae22860c2daae3a4ec769827f927563849ae Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 23 Sep 2026 11:52:11 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8A=20=D0=92=D0=BE=D0=BB=D0=BD=D0=B0?= =?UTF-8?q?=202:=20backend=20=D0=B4=D0=B5=D0=B4=D0=BB=D0=BE=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=83=D0=BB=D0=B0=20(3=20=D0=B1=D0=B0=D0=B3=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 задач --- routers/bubblewords.py | 51 ++++++++++++++++---------------- routers/sentences.py | 51 ++++++++++++++++++-------------- routers/wordquiz.py | 67 +++++++++++++++++++++--------------------- 3 files changed, 88 insertions(+), 81 deletions(-) diff --git a/routers/bubblewords.py b/routers/bubblewords.py index 350266a..b4986f4 100644 --- a/routers/bubblewords.py +++ b/routers/bubblewords.py @@ -205,29 +205,12 @@ async def complete_bubble_level(request: Request): level = $3 """, telegram_id, score, current_level) - # Проверка достижений - from routers.achievements import check_and_award_achievements - new_achievements = [] - + # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_bubblewords — + # вызовы достижений вынесены за async with pool.acquire() (паттерн game.py). total_levels = await conn.fetchval( "SELECT levels_completed FROM bubble_words_progress WHERE user_id = $1", telegram_id ) 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( "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND completed_at IS NOT NULL", telegram_id @@ -245,15 +228,31 @@ async def complete_bubble_level(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 = [ + ("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) - return { - "status": "ok", - "score": score, - "completion_time": completion_time, - "new_achievements": new_achievements, - } + return { + "status": "ok", + "score": score, + "completion_time": completion_time, + "new_achievements": new_achievements, + } @router.get("/progress") diff --git a/routers/sentences.py b/routers/sentences.py index c2b7a35..e09c577 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -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): diff --git a/routers/wordquiz.py b/routers/wordquiz.py index 5678b22..ca681ec 100644 --- a/routers/wordquiz.py +++ b/routers/wordquiz.py @@ -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")