2 Commits
Author SHA1 Message Date
Drobysh 2b08a4999f 🌊 Волна 19: backend — 6 фиксов + database.py
database.py:
- get_pool_race: asyncio.Lock + двойная проверка
- init_db_no_transaction: вся инициализация в одной транзакции
- drop_constraint_cascade: убран CASCADE
- add_pk_on_duplicates: DELETE дублей через DISTINCT ON (умная версия)
- redundant_index_users_telegram: удалены дубли индексов
- fstring_sql_migration: whitelist regex _SAFE_NAME + _SAFE_TYPE
- ensure_achievements_code_key: гарантия UNIQUE на achievements.code
- sentence_hints_used + typing_hints_used
- client_controlled_* (current_streak, current_mistakes, current_hints_used)

routers/hints.py:
- hint_consumed_before_word_paths_check: инкремент после проверок
- word_list_hint_consumed_on_empty: слова до инкремента

routers/admin_content.py:
- admin_content_text_levels_n_plus_1: 12 запросов → 1 GROUP BY

routers/assistant.py:
- assistant_admin_stats_n_plus_1: 10 запросов → 2 GROUP BY

routers/leaderboard.py:
- leaderboard_admin_stats_n_plus_1: 6 запросов → 1 GROUP BY

routers/achievements.py:
- init_achievements_n_plus_1: 104 запроса → 1 bulk upsert
- добавлен logger (отсутствовал)

Аудит v6: backend 6/6 закрыто
2026-09-25 10:10:11 +00:00
Drobysh 555bf44db2 🌊 Волна 19: backend — 6 фиксов (hints + N+1 + logger) 2026-09-25 10:09:13 +00:00
6 changed files with 141 additions and 79 deletions
+26
View File
@@ -643,6 +643,32 @@ async def init_db():
) )
""") """)
# 🔧 ФИКС (25.09.2026): ensure_achievements_code_key —
# фикс init_achievements_n_plus_1 использует ON CONFLICT (code).
# UNIQUE-инфраструктура для колонки code должна существовать.
# В CREATE TABLE выше уже есть UNIQUE NOT NULL — но если таблица
# была создана старой версией кода без UNIQUE, добавляем констрейнт.
await conn.execute("""
DO $$
BEGIN
IF NOT EXISTS (
SELECT 1 FROM pg_constraint
WHERE conname = 'achievements_code_key'
) AND NOT EXISTS (
SELECT 1 FROM pg_constraint
WHERE conrelid = 'achievements'::regclass
AND contype IN ('u', 'p')
AND conkey = ARRAY[
(SELECT attnum FROM pg_attribute
WHERE attrelid = 'achievements'::regclass
AND attname = 'code')
]
) THEN
ALTER TABLE achievements ADD CONSTRAINT achievements_code_key UNIQUE (code);
END IF;
END $$;
""")
# ============ user_achievements ============ # ============ user_achievements ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS user_achievements ( CREATE TABLE IF NOT EXISTS user_achievements (
+40 -37
View File
@@ -1,7 +1,11 @@
import logging
from fastapi import APIRouter, Request, HTTPException from fastapi import APIRouter, Request, HTTPException
from auth import require_auth from auth import require_auth
from database import get_pool from database import get_pool
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/achievements", tags=["achievements"]) router = APIRouter(prefix="/achievements", tags=["achievements"])
# ============ Данные 52 достижений ============ # ============ Данные 52 достижений ============
@@ -281,46 +285,45 @@ ACHIEVEMENTS_DATA = [
async def init_achievements(): async def init_achievements():
"""Добавляет новые достижения, не трогая существующие""" """Добавляет/обновляет достижения одним bulk upsert."""
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
for a in ACHIEVEMENTS_DATA: # 🔧 ФИКС (25.09.2026): init_achievements_n_plus_1 —
exists = await conn.fetchval( # 52 SELECT + 52 INSERT/UPDATE (104 запроса) → 1 bulk upsert.
"SELECT 1 FROM achievements WHERE code = $1", a["code"] # Требует 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: for a in ACHIEVEMENTS_DATA
await conn.execute( ]
"""INSERT INTO achievements (code, category, icon,
name_pl, name_ru, name_uk, name_en, await conn.executemany("""
description_pl, description_ru, description_uk, description_en, INSERT INTO achievements
requirement_type, requirement_value) (code, category, icon,
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)""", name_pl, name_ru, name_uk, name_en,
a["code"], a["category"], a["icon"], description_pl, description_ru, description_uk, description_en,
a["name_pl"], a["name_ru"], a["name_uk"], a["name_en"], requirement_type, requirement_value)
a["desc_pl"], a["desc_ru"], a["desc_uk"], a["desc_en"], VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
a["type"], a["value"] ON CONFLICT (code) DO UPDATE SET
) category = EXCLUDED.category,
else: icon = EXCLUDED.icon,
# 🔧 НОВОЕ: Обновляем существующие достижения (на случай изменения названий) name_pl = EXCLUDED.name_pl,
await conn.execute(""" name_ru = EXCLUDED.name_ru,
UPDATE achievements SET name_uk = EXCLUDED.name_uk,
category = $2, name_en = EXCLUDED.name_en,
icon = $3, description_pl = EXCLUDED.description_pl,
name_pl = $4, description_ru = EXCLUDED.description_ru,
name_ru = $5, description_uk = EXCLUDED.description_uk,
name_uk = $6, description_en = EXCLUDED.description_en,
name_en = $7, requirement_type = EXCLUDED.requirement_type,
description_pl = $8, requirement_value = EXCLUDED.requirement_value
description_ru = $9, """, rows)
description_uk = $10,
description_en = $11, logger.info(f"[achievements] init: upserted {len(rows)} achievements")
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"])
@router.get("") @router.get("")
+20 -7
View File
@@ -408,19 +408,32 @@ async def get_text_levels(request: Request):
ORDER BY sort_order 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 = [] result = []
for lvl in level_rows: for lvl in level_rows:
code = lvl["code"] code = lvl["code"]
count = await conn.fetchval( stat = stats_map.get(code)
"SELECT COUNT(*) FROM sentences WHERE level = $1", code last_edited = stat["last_edited"] if stat else None
) or 0
last_edited = await conn.fetchval(
"SELECT MAX(edited_at) FROM sentences WHERE level = $1", code
)
result.append({ result.append({
"code": code, "code": code,
"name_ru": lvl["name_ru"], "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, "last_edited": last_edited.isoformat() if last_edited else None,
}) })
+20 -10
View File
@@ -439,17 +439,27 @@ async def get_admin_stats(request: Request):
) active ) active
""") or 0 """) or 0
# Языки # 🔧 ФИКС (25.09.2026): assistant_admin_stats_n_plus_1 —
language_counts = {} # 2 GROUP BY вместо 10 COUNT-запросов.
for lang in ["pl", "ru", "uk", "en"]: LANGUAGES = ["pl", "ru", "uk", "en"]
count = await conn.fetchval("SELECT COUNT(*) FROM users WHERE app_language = $1", lang) or 0
language_counts[lang] = count
# Уровни lang_rows = await conn.fetch("""
level_counts = {} SELECT app_language, COUNT(*) as cnt
for level in LEVELS: FROM users
count = await conn.fetchval("SELECT COUNT(*) FROM users WHERE current_level = $1", level) or 0 WHERE app_language = ANY($1::text[])
level_counts[level] = count 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 { return {
"total_users": total_users, "total_users": total_users,
+25 -18
View File
@@ -48,19 +48,6 @@ async def get_first_letter_hint(request: Request, level_id: int):
if not words: if not words:
raise HTTPException(404, "No words found for this level") 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"] word_paths = level["word_paths"]
if isinstance(word_paths, str): if isinstance(word_paths, str):
import json import json
@@ -85,6 +72,21 @@ async def get_first_letter_hint(request: Request, level_id: int):
if not found_word: if not found_word:
raise HTTPException(404, "No word paths found for this level") 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 { return {
"status": "ok", "status": "ok",
"word": found_word, "word": found_word,
@@ -126,6 +128,16 @@ async def get_word_list(request: Request, level_id: int):
if hints_already_used >= MAX_HINTS: if hints_already_used >= MAX_HINTS:
raise HTTPException(403, "Hint limit reached") 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: if progress:
await conn.execute( await conn.execute(
"UPDATE user_progress SET hints_used = hints_used + 1 WHERE user_id = $1 AND level_id = $2", "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 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( user = await conn.fetchrow(
"SELECT app_language FROM users WHERE telegram_id = $1", telegram_id "SELECT app_language FROM users WHERE telegram_id = $1", telegram_id
+10 -7
View File
@@ -298,13 +298,16 @@ async def get_admin_stats(request: Request):
WHERE a.code = 'open_teacher_menu' WHERE a.code = 'open_teacher_menu'
""") or 0 """) or 0
# Количество пользователей по уровням # 🔧 ФИКС (25.09.2026): leaderboard_admin_stats_n_plus_1 —
level_counts = {} # 1 GROUP BY вместо 6 COUNT-запросов.
for lvl in LEVELS: level_rows = await conn.fetch("""
count = await conn.fetchval( SELECT current_level, COUNT(*) as cnt
"SELECT COUNT(*) FROM users WHERE current_level = $1", lvl FROM users
) or 0 WHERE current_level = ANY($1::text[])
level_counts[lvl] = count 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 { return {
"total_users": total_users, "total_users": total_users,