diff --git a/routers/achievements.py b/routers/achievements.py index d776b6b..81d767f 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -1,7 +1,11 @@ +import logging + from fastapi import APIRouter, Request, HTTPException from auth import require_auth from database import get_pool +logger = logging.getLogger(__name__) + router = APIRouter(prefix="/achievements", tags=["achievements"]) # ============ Данные 52 достижений ============ @@ -281,46 +285,45 @@ ACHIEVEMENTS_DATA = [ async def init_achievements(): - """Добавляет новые достижения, не трогая существующие""" + """Добавляет/обновляет достижения одним bulk upsert.""" pool = await get_pool() async with pool.acquire() as conn: - for a in ACHIEVEMENTS_DATA: - exists = await conn.fetchval( - "SELECT 1 FROM achievements WHERE code = $1", a["code"] + # 🔧 ФИКС (25.09.2026): init_achievements_n_plus_1 — + # 52 SELECT + 52 INSERT/UPDATE (104 запроса) → 1 bulk upsert. + # Требует UNIQUE constraint на achievements.code (achievements_code_key). + rows = [ + ( + a["code"], a["category"], a["icon"], + a["name_pl"], a["name_ru"], a["name_uk"], a["name_en"], + a["desc_pl"], a["desc_ru"], a["desc_uk"], a["desc_en"], + a["type"], a["value"], ) - if not exists: - await conn.execute( - """INSERT INTO achievements (code, category, icon, - name_pl, name_ru, name_uk, name_en, - description_pl, description_ru, description_uk, description_en, - requirement_type, requirement_value) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)""", - a["code"], a["category"], a["icon"], - a["name_pl"], a["name_ru"], a["name_uk"], a["name_en"], - a["desc_pl"], a["desc_ru"], a["desc_uk"], a["desc_en"], - a["type"], a["value"] - ) - else: - # 🔧 НОВОЕ: Обновляем существующие достижения (на случай изменения названий) - await conn.execute(""" - UPDATE achievements SET - category = $2, - icon = $3, - name_pl = $4, - name_ru = $5, - name_uk = $6, - name_en = $7, - description_pl = $8, - description_ru = $9, - description_uk = $10, - description_en = $11, - requirement_type = $12, - requirement_value = $13 - WHERE code = $1 - """, a["code"], a["category"], a["icon"], - a["name_pl"], a["name_ru"], a["name_uk"], a["name_en"], - a["desc_pl"], a["desc_ru"], a["desc_uk"], a["desc_en"], - a["type"], a["value"]) + for a in ACHIEVEMENTS_DATA + ] + + await conn.executemany(""" + INSERT INTO achievements + (code, category, icon, + name_pl, name_ru, name_uk, name_en, + description_pl, description_ru, description_uk, description_en, + requirement_type, requirement_value) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) + ON CONFLICT (code) DO UPDATE SET + category = EXCLUDED.category, + icon = EXCLUDED.icon, + name_pl = EXCLUDED.name_pl, + name_ru = EXCLUDED.name_ru, + name_uk = EXCLUDED.name_uk, + name_en = EXCLUDED.name_en, + description_pl = EXCLUDED.description_pl, + description_ru = EXCLUDED.description_ru, + description_uk = EXCLUDED.description_uk, + description_en = EXCLUDED.description_en, + requirement_type = EXCLUDED.requirement_type, + requirement_value = EXCLUDED.requirement_value + """, rows) + + logger.info(f"[achievements] init: upserted {len(rows)} achievements") @router.get("") diff --git a/routers/admin_content.py b/routers/admin_content.py index 9622be0..1d1e4a1 100644 --- a/routers/admin_content.py +++ b/routers/admin_content.py @@ -408,19 +408,32 @@ async def get_text_levels(request: Request): ORDER BY sort_order """) + if not level_rows: + return {"levels": []} + + level_codes = [lvl["code"] for lvl in level_rows] + + # 🔧 ФИКС (25.09.2026): admin_content_text_levels_n_plus_1 — + # 1 GROUP BY вместо 6×2 запросов. + rows = await conn.fetch(""" + SELECT level, + COUNT(*) as cnt, + MAX(edited_at) as last_edited + FROM sentences + WHERE level = ANY($1::text[]) + GROUP BY level + """, level_codes) + stats_map = {r["level"]: r for r in rows} + result = [] for lvl in level_rows: code = lvl["code"] - count = await conn.fetchval( - "SELECT COUNT(*) FROM sentences WHERE level = $1", code - ) or 0 - last_edited = await conn.fetchval( - "SELECT MAX(edited_at) FROM sentences WHERE level = $1", code - ) + stat = stats_map.get(code) + last_edited = stat["last_edited"] if stat else None result.append({ "code": code, "name_ru": lvl["name_ru"], - "texts_count": count, + "texts_count": stat["cnt"] if stat else 0, "last_edited": last_edited.isoformat() if last_edited else None, }) diff --git a/routers/assistant.py b/routers/assistant.py index 5f03f32..61da76c 100644 --- a/routers/assistant.py +++ b/routers/assistant.py @@ -439,17 +439,27 @@ async def get_admin_stats(request: Request): ) active """) or 0 - # Языки - language_counts = {} - for lang in ["pl", "ru", "uk", "en"]: - count = await conn.fetchval("SELECT COUNT(*) FROM users WHERE app_language = $1", lang) or 0 - language_counts[lang] = count + # 🔧 ФИКС (25.09.2026): assistant_admin_stats_n_plus_1 — + # 2 GROUP BY вместо 10 COUNT-запросов. + LANGUAGES = ["pl", "ru", "uk", "en"] - # Уровни - level_counts = {} - for level in LEVELS: - count = await conn.fetchval("SELECT COUNT(*) FROM users WHERE current_level = $1", level) or 0 - level_counts[level] = count + lang_rows = await conn.fetch(""" + SELECT app_language, COUNT(*) as cnt + FROM users + WHERE app_language = ANY($1::text[]) + GROUP BY app_language + """, LANGUAGES) + lang_map = {r["app_language"]: r["cnt"] for r in lang_rows} + language_counts = {lang: lang_map.get(lang, 0) for lang in LANGUAGES} + + level_rows = await conn.fetch(""" + SELECT current_level, COUNT(*) as cnt + FROM users + WHERE current_level = ANY($1::text[]) + GROUP BY current_level + """, LEVELS) + level_map = {r["current_level"]: r["cnt"] for r in level_rows} + level_counts = {level: level_map.get(level, 0) for level in LEVELS} return { "total_users": total_users, diff --git a/routers/hints.py b/routers/hints.py index a7944bc..0291a14 100644 --- a/routers/hints.py +++ b/routers/hints.py @@ -48,19 +48,6 @@ async def get_first_letter_hint(request: Request, level_id: int): if not words: raise HTTPException(404, "No words found for this level") - # Теперь безопасно инкрементим счётчик - if progress: - await conn.execute( - "UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2", - telegram_id, level_id - ) - else: - await conn.execute( - "INSERT INTO user_progress (user_id, level_id, hints_used) VALUES ($1, $2, 1)", - telegram_id, level_id - ) - hints_already_used += 1 - word_paths = level["word_paths"] if isinstance(word_paths, str): import json @@ -85,6 +72,21 @@ async def get_first_letter_hint(request: Request, level_id: int): if not found_word: raise HTTPException(404, "No word paths found for this level") + # 🔧 ФИКС (25.09.2026): hint_consumed_before_word_paths_check — + # инкрементим hints_used ТОЛЬКО после всех проверок. + # Раньше при 404 (нет word_paths) подсказка уже была потрачена. + if progress: + await conn.execute( + "UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2", + telegram_id, level_id + ) + else: + await conn.execute( + "INSERT INTO user_progress (user_id, level_id, hints_used) VALUES ($1, $2, 1)", + telegram_id, level_id + ) + hints_already_used += 1 + return { "status": "ok", "word": found_word, @@ -126,6 +128,16 @@ async def get_word_list(request: Request, level_id: int): if hints_already_used >= MAX_HINTS: raise HTTPException(403, "Hint limit reached") + # 🔧 ФИКС (25.09.2026): word_list_hint_consumed_on_empty — + # сначала получаем слова, проверяем что они есть, только потом инкрементим. + words = await conn.fetch( + "SELECT * FROM level_words WHERE level_id = $1 ORDER BY word_pl", level_id + ) + + if not words: + raise HTTPException(404, "No words found for this level") + + # Теперь безопасно инкрементим счётчик if progress: await conn.execute( "UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2", @@ -138,11 +150,6 @@ async def get_word_list(request: Request, level_id: int): ) hints_already_used += 1 - # Получаем слова - words = await conn.fetch( - "SELECT * FROM level_words WHERE level_id = $1 ORDER BY word_pl", level_id - ) - # Определяем язык пользователя user = await conn.fetchrow( "SELECT app_language FROM users WHERE telegram_id = $1", telegram_id diff --git a/routers/leaderboard.py b/routers/leaderboard.py index 7b6ee81..9822b45 100644 --- a/routers/leaderboard.py +++ b/routers/leaderboard.py @@ -298,13 +298,16 @@ async def get_admin_stats(request: Request): WHERE a.code = 'open_teacher_menu' """) or 0 - # Количество пользователей по уровням - level_counts = {} - for lvl in LEVELS: - count = await conn.fetchval( - "SELECT COUNT(*) FROM users WHERE current_level = $1", lvl - ) or 0 - level_counts[lvl] = count + # 🔧 ФИКС (25.09.2026): leaderboard_admin_stats_n_plus_1 — + # 1 GROUP BY вместо 6 COUNT-запросов. + level_rows = await conn.fetch(""" + SELECT current_level, COUNT(*) as cnt + FROM users + WHERE current_level = ANY($1::text[]) + GROUP BY current_level + """, LEVELS) + level_map = {r["current_level"]: r["cnt"] for r in level_rows} + level_counts = {lvl: level_map.get(lvl, 0) for lvl in LEVELS} return { "total_users": total_users,