From f83fcc0e1c28adb40ff38c20d92fb1c00c0d0e6d Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:28:54 +0000 Subject: [PATCH 1/6] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20user=5Fprogress.wave=20INTEGER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/database.py b/database.py index be06b58..440708f 100644 --- a/database.py +++ b/database.py @@ -229,6 +229,21 @@ async def init_db(): """) logger.info("Added current_streak column to user_progress") + # ============ Авто-миграция: добавляем wave в user_progress ============ + # 🔧 НОВОЕ (13.10.2026): wave — номер волны, к которой относится + # пройденный уровень. Нужен для подсчёта wave_points (сумма очков + # за 10 уровней волны) в модалке итогов волны. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'user_progress' AND column_name = 'wave' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE user_progress + ADD COLUMN wave INTEGER + """) + logger.info("Added wave column to user_progress") + # ============ sentences ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS sentences ( -- 2.54.0 From bd743e4c485d8efe6483d89ac2099b0e3b3ad9b0 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:33:56 +0000 Subject: [PATCH 2/6] =?UTF-8?q?[Eva]=20complete-level:=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D1=85=20=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=20=D0=B2=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/routers/game.py b/routers/game.py index 585ac2a..015246e 100644 --- a/routers/game.py +++ b/routers/game.py @@ -354,6 +354,12 @@ async def complete_level(request: Request): fast_streak = 0 no_hints_streak = 0 words_found = 0 + # 🆕 (13.10.2026): итоги волны для модалки. + wave_completed = False + wave_points = 0 + wave_max_points = 0 + wave_medal_result = "none" + session_number = 1 async with pool.acquire() as conn: user = await conn.fetchrow( -- 2.54.0 From 4333aa62a64f5208afc1d94af330045839a627fa Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:34:07 +0000 Subject: [PATCH 3/6] =?UTF-8?q?[Eva]=20complete-level:=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8C=20wave=20=D0=B2=20user=5Fprogress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/routers/game.py b/routers/game.py index 015246e..85acfc1 100644 --- a/routers/game.py +++ b/routers/game.py @@ -458,17 +458,27 @@ async def complete_level(request: Request): # уже была создана hints.py (юзер взял подсказку → уровень не завершится). # Теперь UPSERT с ON CONFLICT DO UPDATE. # hints_used уже прочитан из БД выше (не доверяем клиенту). + # 🆕 (13.10.2026): читаем session_number ДО записи, чтобы + # записать wave в user_progress (для подсчёта очков волны). + wave_row = await conn.fetchrow( + "SELECT session_number, session_level_number 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 + await conn.execute(""" INSERT INTO user_progress - (user_id, level_id, completed_at, hints_used, score, level, current_streak) - VALUES ($1, $2, NOW(), $3, $4, $5, 0) + (user_id, level_id, completed_at, hints_used, score, level, current_streak, wave) + VALUES ($1, $2, NOW(), $3, $4, $5, 0, $6) ON CONFLICT (user_id, level_id) DO UPDATE SET completed_at = NOW(), hints_used = $3, score = $4, level = $5, - current_streak = 0 - """, telegram_id, level_id, hints_used, score, level_name) + current_streak = 0, + wave = $6 + """, telegram_id, level_id, hints_used, score, level_name, session_number) # 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress. # Обновляем только users.last_completed_level — глобальный. -- 2.54.0 From 9db00df88fa7de3d4c12b09287e75889d8c79e65 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:34:16 +0000 Subject: [PATCH 4/6] =?UTF-8?q?[Eva]=20complete-level:=20=D1=83=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=20=D0=B4=D1=83=D0=B1=D0=BB=D1=8C=20=D1=87?= =?UTF-8?q?=D1=82=D0=B5=D0=BD=D0=B8=D1=8F=20session=5Fnumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/routers/game.py b/routers/game.py index 85acfc1..8736f0d 100644 --- a/routers/game.py +++ b/routers/game.py @@ -530,13 +530,6 @@ async def complete_level(request: Request): "SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id ) or 0 - wave_row = await conn.fetchrow( - "SELECT session_number, session_level_number 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 - # Пройдено волн = session_number - 1; если только что завершили # 10-й уровень волны — волна пройдена (+1). waves_completed = session_number - 1 -- 2.54.0 From aa7679c49b36edb0783f043038ee7a01a9edb0f9 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:34:29 +0000 Subject: [PATCH 5/6] =?UTF-8?q?[Eva]=20complete-level:=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D1=81=D1=87=D1=91=D1=82=20=D0=B8=D1=82=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=D0=BE=D0=BB=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/routers/game.py b/routers/game.py index 8736f0d..a78ccd2 100644 --- a/routers/game.py +++ b/routers/game.py @@ -536,6 +536,16 @@ async def complete_level(request: Request): if session_level_number == 10: waves_completed += 1 + # 🆕 (13.10.2026): итоги волны для модалки. + from services.waves import max_points_for_wave, wave_medal + wave_completed = (session_level_number == 10) + wave_points = await conn.fetchval( + "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2", + telegram_id, session_number, + ) or 0 + wave_max_points = max_points_for_wave() + wave_medal_result = wave_medal(wave_points, wave_max_points) + # XP филворда = сумма score по user_progress (уже посчитана как total_score). wordsearch_xp = total_score -- 2.54.0 From 556c11fc9585013ae182099a12eaae1f9083f5bc Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 13 Oct 2026 16:35:18 +0000 Subject: [PATCH 6/6] =?UTF-8?q?[Eva]=20complete-level:=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D1=8B=20=D0=B2=20=D0=BE=D1=82=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/routers/game.py b/routers/game.py index a78ccd2..6cdd30a 100644 --- a/routers/game.py +++ b/routers/game.py @@ -637,6 +637,12 @@ async def complete_level(request: Request): "rank_key": xp_result["rank_key"], "xp_in_level": xp_result["xp_in_level"], "xp_needed": xp_result["xp_needed"], + # 🆕 (13.10.2026): итоги волны для модалки. + "wave_completed": wave_completed, + "wave_number": session_number, + "wave_points": wave_points, + "wave_max_points": wave_max_points, + "wave_medal": wave_medal_result, } -- 2.54.0