+13 -28
View File
@@ -359,8 +359,7 @@ async def complete_level(request: Request):
wave_points = 0 wave_points = 0
wave_max_points = 0 wave_max_points = 0
wave_medal_result = "none" wave_medal_result = "none"
current_wave = 1 session_number = 1
current_position_in_wave = 1
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
@@ -459,28 +458,14 @@ async def complete_level(request: Request):
# уже была создана hints.py (юзер взял подсказку → уровень не завершится). # уже была создана hints.py (юзер взял подсказку → уровень не завершится).
# Теперь UPSERT с ON CONFLICT DO UPDATE. # Теперь UPSERT с ON CONFLICT DO UPDATE.
# hints_used уже прочитан из БД выше (не доверяем клиенту). # hints_used уже прочитан из БД выше (не доверяем клиенту).
# 🔧 ФИКС (13.10.2026): wave_off_by_one — # 🆕 (13.10.2026): читаем session_number ДО записи, чтобы
# session_level_number хранит позицию СЛЕДУЮЩЕГО уровня # записать wave в user_progress (для подсчёта очков волны).
# (уже увеличенную при выдаче), поэтому модалка волны
# срабатывала на 9-м уровне. Читаем current_wave /
# current_position_in_wave — позицию именно завершаемого уровня.
wave_row = await conn.fetchrow( wave_row = await conn.fetchrow(
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1", "SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
telegram_id, telegram_id,
) )
if wave_row and wave_row["current_wave"] and wave_row["current_position_in_wave"]: session_number = int(wave_row["session_number"] or 1) if wave_row else 1
current_wave = int(wave_row["current_wave"]) session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1
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(""" await conn.execute("""
INSERT INTO user_progress INSERT INTO user_progress
@@ -493,7 +478,7 @@ async def complete_level(request: Request):
level = $5, level = $5,
current_streak = 0, current_streak = 0,
wave = $6 wave = $6
""", telegram_id, level_id, hints_used, score, level_name, current_wave) """, telegram_id, level_id, hints_used, score, level_name, session_number)
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress. # 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
# Обновляем только users.last_completed_level — глобальный. # Обновляем только users.last_completed_level — глобальный.
@@ -545,18 +530,18 @@ async def complete_level(request: Request):
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id "SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
) or 0 ) or 0
# Пройдено волн = current_wave - 1; если только что завершили # Пройдено волн = session_number - 1; если только что завершили
# 10-й уровень волны — волна пройдена (+1). # 10-й уровень волны — волна пройдена (+1).
waves_completed = current_wave - 1 waves_completed = session_number - 1
if current_position_in_wave == 10: if session_level_number == 10:
waves_completed += 1 waves_completed += 1
# 🆕 (13.10.2026): итоги волны для модалки. # 🆕 (13.10.2026): итоги волны для модалки.
from services.waves import max_points_for_wave, wave_medal from services.waves import max_points_for_wave, wave_medal
wave_completed = (current_position_in_wave == 10) wave_completed = (session_level_number == 10)
wave_points = await conn.fetchval( wave_points = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2", "SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2",
telegram_id, current_wave, telegram_id, session_number,
) or 0 ) or 0
wave_max_points = max_points_for_wave() wave_max_points = max_points_for_wave()
wave_medal_result = wave_medal(wave_points, wave_max_points) wave_medal_result = wave_medal(wave_points, wave_max_points)
@@ -654,7 +639,7 @@ async def complete_level(request: Request):
"xp_needed": xp_result["xp_needed"], "xp_needed": xp_result["xp_needed"],
# 🆕 (13.10.2026): итоги волны для модалки. # 🆕 (13.10.2026): итоги волны для модалки.
"wave_completed": wave_completed, "wave_completed": wave_completed,
"wave_number": current_wave, "wave_number": session_number,
"wave_points": wave_points, "wave_points": wave_points,
"wave_max_points": wave_max_points, "wave_max_points": wave_max_points,
"wave_medal": wave_medal_result, "wave_medal": wave_medal_result,