[Eva] Ева, прочитай .gitignore #38

Merged
Drobysh merged 6 commits from eva/chat-c3088d-backend into main 2026-10-13 16:36:34 +00:00
Showing only changes of commit 4333aa62a6 - Show all commits
+14 -4
View File
@@ -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 — глобальный.