[Eva] complete-level: waves_completed/wave_completed/wave_points от current_wave/current_position_in_wave
This commit is contained in:
+5
-5
@@ -545,18 +545,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
|
||||||
|
|
||||||
# Пройдено волн = session_number - 1; если только что завершили
|
# Пройдено волн = current_wave - 1; если только что завершили
|
||||||
# 10-й уровень волны — волна пройдена (+1).
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
waves_completed = session_number - 1
|
waves_completed = current_wave - 1
|
||||||
if session_level_number == 10:
|
if current_position_in_wave == 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 = (session_level_number == 10)
|
wave_completed = (current_position_in_wave == 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, session_number,
|
telegram_id, current_wave,
|
||||||
) 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)
|
||||||
|
|||||||
Reference in New Issue
Block a user