From 01ce5dfa2d1a2188fb28ab9eb673cd71b689864a Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 17:46:12 +0000 Subject: [PATCH] =?UTF-8?q?[Eva]=20complete-level:=20=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20current=5Fwave/current=5Fposition=5Fin=5Fw?= =?UTF-8?q?ave=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20session=5Fnumber/s?= =?UTF-8?q?ession=5Flevel=5Fnum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/routers/game.py b/routers/game.py index 5e256a2..05b811d 100644 --- a/routers/game.py +++ b/routers/game.py @@ -459,14 +459,28 @@ async def complete_level(request: Request): # уже была создана hints.py (юзер взял подсказку → уровень не завершится). # Теперь UPSERT с ON CONFLICT DO UPDATE. # hints_used уже прочитан из БД выше (не доверяем клиенту). - # 🆕 (13.10.2026): читаем session_number ДО записи, чтобы - # записать wave в user_progress (для подсчёта очков волны). + # 🔧 ФИКС (13.10.2026): wave_off_by_one — + # session_level_number хранит позицию СЛЕДУЮЩЕГО уровня + # (уже увеличенную при выдаче), поэтому модалка волны + # срабатывала на 9-м уровне. Читаем current_wave / + # current_position_in_wave — позицию именно завершаемого уровня. wave_row = await conn.fetchrow( - "SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1", + "SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1", telegram_id, ) - session_number = int(wave_row["session_number"] or 1) if wave_row else 1 - session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1 + if wave_row and wave_row["current_wave"] and wave_row["current_position_in_wave"]: + current_wave = int(wave_row["current_wave"]) + current_position_in_wave = int(wave_row["current_position_in_wave"]) + else: + # Fallback для старых записей без current_* полей. + global_level = await conn.fetchval( + "SELECT global_level_number FROM user_game_progress WHERE user_id = $1", + telegram_id, + ) + global_level = int(global_level or 1) + from services.waves import wave_for_level, level_in_wave + current_wave = wave_for_level(global_level) + current_position_in_wave = level_in_wave(global_level) await conn.execute(""" INSERT INTO user_progress @@ -479,7 +493,7 @@ async def complete_level(request: Request): level = $5, current_streak = 0, wave = $6 - """, telegram_id, level_id, hints_used, score, level_name, session_number) + """, telegram_id, level_id, hints_used, score, level_name, current_wave) # 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress. # Обновляем только users.last_completed_level — глобальный.