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 ( diff --git a/routers/game.py b/routers/game.py index 585ac2a..6cdd30a 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( @@ -452,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 — глобальный. @@ -514,19 +530,22 @@ 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 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 @@ -618,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, }