Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78d40364bf | ||
|
|
26442db954 | ||
|
|
50c02b7707 | ||
|
|
22e4eed3f5 | ||
|
|
8b98655716 |
-15
@@ -229,21 +229,6 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added current_streak column to user_progress")
|
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 ============
|
# ============ sentences ============
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE TABLE IF NOT EXISTS sentences (
|
CREATE TABLE IF NOT EXISTS sentences (
|
||||||
|
|||||||
+15
-55
@@ -354,13 +354,6 @@ async def complete_level(request: Request):
|
|||||||
fast_streak = 0
|
fast_streak = 0
|
||||||
no_hints_streak = 0
|
no_hints_streak = 0
|
||||||
words_found = 0
|
words_found = 0
|
||||||
# 🆕 (13.10.2026): итоги волны для модалки.
|
|
||||||
wave_completed = False
|
|
||||||
wave_points = 0
|
|
||||||
wave_max_points = 0
|
|
||||||
wave_medal_result = "none"
|
|
||||||
current_wave = 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,41 +452,17 @@ 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 —
|
|
||||||
# session_level_number хранит позицию СЛЕДУЮЩЕГО уровня
|
|
||||||
# (уже увеличенную при выдаче), поэтому модалка волны
|
|
||||||
# срабатывала на 9-м уровне. Читаем current_wave /
|
|
||||||
# current_position_in_wave — позицию именно завершаемого уровня.
|
|
||||||
wave_row = await conn.fetchrow(
|
|
||||||
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
|
|
||||||
telegram_id,
|
|
||||||
)
|
|
||||||
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("""
|
await conn.execute("""
|
||||||
INSERT INTO user_progress
|
INSERT INTO user_progress
|
||||||
(user_id, level_id, completed_at, hints_used, score, level, current_streak, wave)
|
(user_id, level_id, completed_at, hints_used, score, level, current_streak)
|
||||||
VALUES ($1, $2, NOW(), $3, $4, $5, 0, $6)
|
VALUES ($1, $2, NOW(), $3, $4, $5, 0)
|
||||||
ON CONFLICT (user_id, level_id) DO UPDATE
|
ON CONFLICT (user_id, level_id) DO UPDATE
|
||||||
SET completed_at = NOW(),
|
SET completed_at = NOW(),
|
||||||
hints_used = $3,
|
hints_used = $3,
|
||||||
score = $4,
|
score = $4,
|
||||||
level = $5,
|
level = $5,
|
||||||
current_streak = 0,
|
current_streak = 0
|
||||||
wave = $6
|
""", telegram_id, level_id, hints_used, score, level_name)
|
||||||
""", telegram_id, level_id, hints_used, score, level_name, current_wave)
|
|
||||||
|
|
||||||
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
||||||
# Обновляем только users.last_completed_level — глобальный.
|
# Обновляем только users.last_completed_level — глобальный.
|
||||||
@@ -545,21 +514,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; если только что завершили
|
wave_row = await conn.fetchrow(
|
||||||
# 10-й уровень волны — волна пройдена (+1).
|
"SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
|
||||||
waves_completed = current_wave - 1
|
telegram_id,
|
||||||
if current_position_in_wave == 10:
|
)
|
||||||
waves_completed += 1
|
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
|
||||||
|
|
||||||
# 🆕 (13.10.2026): итоги волны для модалки.
|
# Пройдено волн = session_number - 1; если только что завершили
|
||||||
from services.waves import max_points_for_wave, wave_medal
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
wave_completed = (current_position_in_wave == 10)
|
waves_completed = session_number - 1
|
||||||
wave_points = await conn.fetchval(
|
if session_level_number == 10:
|
||||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2",
|
waves_completed += 1
|
||||||
telegram_id, current_wave,
|
|
||||||
) 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).
|
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
|
||||||
wordsearch_xp = total_score
|
wordsearch_xp = total_score
|
||||||
@@ -652,12 +618,6 @@ async def complete_level(request: Request):
|
|||||||
"rank_key": xp_result["rank_key"],
|
"rank_key": xp_result["rank_key"],
|
||||||
"xp_in_level": xp_result["xp_in_level"],
|
"xp_in_level": xp_result["xp_in_level"],
|
||||||
"xp_needed": xp_result["xp_needed"],
|
"xp_needed": xp_result["xp_needed"],
|
||||||
# 🆕 (13.10.2026): итоги волны для модалки.
|
|
||||||
"wave_completed": wave_completed,
|
|
||||||
"wave_number": current_wave,
|
|
||||||
"wave_points": wave_points,
|
|
||||||
"wave_max_points": wave_max_points,
|
|
||||||
"wave_medal": wave_medal_result,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user