feat: last_completed_by_level (per-level прогресс) + полный total_score + пагинация
This commit is contained in:
+37
@@ -38,6 +38,43 @@ async def init_db():
|
||||
)
|
||||
""")
|
||||
|
||||
# 🔧 ФИКС (30.09.2026): last_completed_by_level —
|
||||
# per-level счётчик прогресса. Раньше был один last_completed_level,
|
||||
# который смешивал A1+A2+B1 → юзер не мог открыть уровень выше max.
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'users' AND column_name = 'last_completed_by_level'
|
||||
""")
|
||||
if not col_exists:
|
||||
await conn.execute("""
|
||||
ALTER TABLE users ADD COLUMN last_completed_by_level JSONB DEFAULT '{}'::jsonb
|
||||
""")
|
||||
logger.info("Added last_completed_by_level column to users")
|
||||
|
||||
# Backfill из user_progress
|
||||
await conn.execute("""
|
||||
UPDATE users u
|
||||
SET last_completed_by_level = COALESCE(sub.by_level, '{}'::jsonb)
|
||||
FROM (
|
||||
SELECT
|
||||
user_id,
|
||||
jsonb_object_agg(level, max_num) AS by_level
|
||||
FROM (
|
||||
SELECT
|
||||
up.user_id,
|
||||
up.level,
|
||||
MAX(l.level_number) AS max_num
|
||||
FROM user_progress up
|
||||
JOIN levels l ON l.id = up.level_id
|
||||
WHERE up.completed_at IS NOT NULL
|
||||
GROUP BY up.user_id, up.level
|
||||
) inner_sub
|
||||
GROUP BY user_id
|
||||
) sub
|
||||
WHERE u.telegram_id = sub.user_id
|
||||
""")
|
||||
logger.info("Backfilled last_completed_by_level from user_progress")
|
||||
|
||||
# ============ Авто-миграция: добавляем current_level в users ============
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
|
||||
Reference in New Issue
Block a user