From 6a870e691bf27359eabcd02c2377b1a1c8c4838b Mon Sep 17 00:00:00 2001 From: Drobysh Date: Wed, 23 Sep 2026 15:27:37 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8A=20=D0=92=D0=BE=D0=BB=D0=BD=D0=B0?= =?UTF-8?q?=208:=20backend=20=D0=BA=D0=B0=D1=87=D0=B5=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D0=BE=20(4=20=D0=B1=D0=B0=D0=B3=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - admin_level_counts_n_plus_1: один GROUP BY вместо 6 запросов (admin.py) - duplicate_index_typing_progress: удалён дубль индекса (database.py) - teacher_create_table_on_every_request: DDL в init_db (teacher.py + database.py) - on_event_deprecated: lifespan-контекст (main.py) drop_matview_on_startup + leaderboard_refresh_30s — уже в Волне 1. Аудит: Issue #4, backend 4/20 задач --- database.py | 5 +- main.py | 184 ++++++++++++++++++++++++--------------------- routers/admin.py | 18 +++-- routers/teacher.py | 16 +--- 4 files changed, 116 insertions(+), 107 deletions(-) diff --git a/database.py b/database.py index 4320d1a..e3abc35 100644 --- a/database.py +++ b/database.py @@ -215,8 +215,9 @@ async def init_db(): ) """) - # ============ Индекс для typing_progress ============ - await conn.execute("CREATE INDEX IF NOT EXISTS idx_typing_progress_user ON typing_progress(user_id)") + # 🔧 ФИКС (23.09.2026): duplicate_index_typing_progress — индекс idx_typing_progress_user + # уже создаётся в общем блоке индексов ниже. Убираем дубль здесь. + # await conn.execute("CREATE INDEX IF NOT EXISTS idx_typing_progress_user ON typing_progress(user_id)") # ============ chat_history ============ await conn.execute(""" diff --git a/main.py b/main.py index 6343a5e..e831c5e 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ import os import re import time from collections import defaultdict +from contextlib import asynccontextmanager from pathlib import Path from fastapi import FastAPI, Request, HTTPException from fastapi.middleware.cors import CORSMiddleware @@ -47,8 +48,6 @@ if SENTRY_DSN: else: logger.warning("SENTRY_DSN not set — Sentry disabled") -app = FastAPI(title="Filwords PL API") - # ============ Rate Limiting ============ class RateLimiter: @@ -117,6 +116,105 @@ class RateLimiter: rate_limiter = RateLimiter() +# ============ Фоновое обновление кэша рейтинга ============ +async def refresh_leaderboard_cache_loop(): + await asyncio.sleep(10) + while True: + try: + from database import get_pool + pool = await get_pool() + async with pool.acquire() as conn: + await conn.execute("REFRESH MATERIALIZED VIEW CONCURRENTLY leaderboard_cache") + except Exception as e: + logger.error(f"Failed to refresh leaderboard cache: {e}") + # 🔧 ФИКС (23.09.2026): leaderboard_refresh_30s — refresh каждые 30с + # нагружал БД ради рейтинга, который меняется редко. Теперь 5 минут. + await asyncio.sleep(300) + + +# 🔧 ФИКС (23.09.2026): on_event_deprecated — переходим на lifespan-контекст. +# @app.on_event("startup") устарел и будет удалён в новых версиях FastAPI. +@asynccontextmanager +async def lifespan(app: FastAPI): + # ============ Startup ============ + await init_db() + await init_sentences() + await init_achievements() + await init_learning_data() + + asyncio.create_task(rate_limiter.start_cleanup()) + + from database import get_pool + pool = await get_pool() + async with pool.acquire() as conn: + # 🔧 ФИКС (23.09.2026): drop_matview_on_startup — раньше DROP + CREATE + # на каждом рестарте. Теперь только CREATE IF NOT EXISTS. + # При изменении определения — отдельная миграция. + await conn.execute(""" + CREATE MATERIALIZED VIEW IF NOT EXISTS leaderboard_cache AS + SELECT + u.telegram_id, + u.username, + u.current_level, + COALESCE(ws.total, 0) + COALESCE(s.total, 0) + COALESCE(wq.total, 0) + COALESCE(bw.total, 0) as total_score, + COALESCE(ws.total, 0) as wordsearch_score, + COALESCE(s.total, 0) as sentence_score, + COALESCE(wq.total, 0) as wordquiz_score, + COALESCE(wq.words_guessed, 0) as words_guessed, + COALESCE(bw.total, 0) as bubblewords_score, + COALESCE(bw.levels_completed, 0) as bubble_levels_completed + FROM users u + LEFT JOIN ( + SELECT user_id, SUM(score) as total + FROM user_progress + WHERE completed_at IS NOT NULL + GROUP BY user_id + ) ws ON u.telegram_id = ws.user_id + LEFT JOIN ( + SELECT user_id, SUM(score) as total + FROM sentence_progress + WHERE completed_at IS NOT NULL + GROUP BY user_id + ) s ON u.telegram_id = s.user_id + LEFT JOIN ( + SELECT user_id, total_score as total, words_guessed + FROM word_quiz_progress + ) wq ON u.telegram_id = wq.user_id + LEFT JOIN ( + SELECT user_id, total_score as total, levels_completed + FROM bubble_words_progress + ) bw ON u.telegram_id = bw.user_id + WHERE COALESCE(ws.total, 0) + COALESCE(s.total, 0) + COALESCE(wq.total, 0) + COALESCE(bw.total, 0) > 0 + ORDER BY total_score DESC + """) + + await conn.execute(""" + CREATE UNIQUE INDEX IF NOT EXISTS idx_leaderboard_cache_user + ON leaderboard_cache (telegram_id) + """) + + logger.info("Leaderboard cache created") + + refresh_task = asyncio.create_task(refresh_leaderboard_cache_loop()) + + logger.info(f"Filwords API v{APP_VERSION} started") + + yield + + # ============ Shutdown ============ + # 🔧 ФИКС (23.09.2026): отменяем фоновые задачи при остановке. + refresh_task.cancel() + try: + await refresh_task + except asyncio.CancelledError: + logger.info("Leaderboard refresh task cancelled") + + logger.info(f"Filwords API v{APP_VERSION} stopped") + + +app = FastAPI(title="Filwords PL API", lifespan=lifespan) + + # ============ Rate Limiting Middleware ============ @app.middleware("http") async def rate_limit_middleware(request: Request, call_next): @@ -198,88 +296,6 @@ app.include_router(feed.router) app.include_router(admin_content.router) -# ============ Фоновое обновление кэша рейтинга ============ -async def refresh_leaderboard_cache_loop(): - await asyncio.sleep(10) - while True: - try: - from database import get_pool - pool = await get_pool() - async with pool.acquire() as conn: - await conn.execute("REFRESH MATERIALIZED VIEW CONCURRENTLY leaderboard_cache") - except Exception as e: - logger.error(f"Failed to refresh leaderboard cache: {e}") - # 🔧 ФИКС (23.09.2026): leaderboard_refresh_30s — refresh каждые 30с - # нагружал БД ради рейтинга, который меняется редко. Теперь 5 минут. - await asyncio.sleep(300) - - -# ============ Startup ============ -@app.on_event("startup") -async def startup(): - await init_db() - await init_sentences() - await init_achievements() - await init_learning_data() - - asyncio.create_task(rate_limiter.start_cleanup()) - - from database import get_pool - pool = await get_pool() - async with pool.acquire() as conn: - # 🔧 ФИКС (23.09.2026): drop_matview_on_startup — раньше DROP + CREATE - # на каждом рестарте. Теперь только CREATE IF NOT EXISTS. - # При изменении определения — отдельная миграция. - await conn.execute(""" - CREATE MATERIALIZED VIEW IF NOT EXISTS leaderboard_cache AS - SELECT - u.telegram_id, - u.username, - u.current_level, - COALESCE(ws.total, 0) + COALESCE(s.total, 0) + COALESCE(wq.total, 0) + COALESCE(bw.total, 0) as total_score, - COALESCE(ws.total, 0) as wordsearch_score, - COALESCE(s.total, 0) as sentence_score, - COALESCE(wq.total, 0) as wordquiz_score, - COALESCE(wq.words_guessed, 0) as words_guessed, - COALESCE(bw.total, 0) as bubblewords_score, - COALESCE(bw.levels_completed, 0) as bubble_levels_completed - FROM users u - LEFT JOIN ( - SELECT user_id, SUM(score) as total - FROM user_progress - WHERE completed_at IS NOT NULL - GROUP BY user_id - ) ws ON u.telegram_id = ws.user_id - LEFT JOIN ( - SELECT user_id, SUM(score) as total - FROM sentence_progress - WHERE completed_at IS NOT NULL - GROUP BY user_id - ) s ON u.telegram_id = s.user_id - LEFT JOIN ( - SELECT user_id, total_score as total, words_guessed - FROM word_quiz_progress - ) wq ON u.telegram_id = wq.user_id - LEFT JOIN ( - SELECT user_id, total_score as total, levels_completed - FROM bubble_words_progress - ) bw ON u.telegram_id = bw.user_id - WHERE COALESCE(ws.total, 0) + COALESCE(s.total, 0) + COALESCE(wq.total, 0) + COALESCE(bw.total, 0) > 0 - ORDER BY total_score DESC - """) - - await conn.execute(""" - CREATE UNIQUE INDEX IF NOT EXISTS idx_leaderboard_cache_user - ON leaderboard_cache (telegram_id) - """) - - logger.info("Leaderboard cache created") - - asyncio.create_task(refresh_leaderboard_cache_loop()) - - logger.info(f"Filwords API v{APP_VERSION} started") - - # ============ Базовые эндпоинты ============ @app.get("/") async def root(): diff --git a/routers/admin.py b/routers/admin.py index 6560eda..4171976 100644 --- a/routers/admin.py +++ b/routers/admin.py @@ -73,13 +73,17 @@ async def get_admin_dashboard(request: Request): ) active """) or 0 - # Распределение по уровням - level_counts = {} - for lvl in ["A1", "A2", "B1", "B2", "C1", "C2"]: - count = await conn.fetchval( - "SELECT COUNT(*) FROM users WHERE current_level = $1", lvl - ) or 0 - level_counts[lvl] = count + # 🔧 ФИКС (23.09.2026): admin_level_counts_n_plus_1 — раньше 6 отдельных + # COUNT(*) в цикле. Теперь один GROUP BY + сборка dict в Python. + level_counts = {"A1": 0, "A2": 0, "B1": 0, "B2": 0, "C1": 0, "C2": 0} + rows = await conn.fetch(""" + SELECT current_level, COUNT(*) as cnt + FROM users + WHERE current_level = ANY($1::text[]) + GROUP BY current_level + """, ["A1", "A2", "B1", "B2", "C1", "C2"]) + for row in rows: + level_counts[row["current_level"]] = row["cnt"] return { "total_users": total_users, diff --git a/routers/teacher.py b/routers/teacher.py index a66228f..d058ffb 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -316,20 +316,8 @@ async def get_phrase_of_day(request: Request): lang = await get_user_lang(conn, telegram_id) # 🔧 ФИКС (23.09.2026): teacher_create_table_on_every_request — - # DDL выполнялся на КАЖДЫЙ GET /teacher/phrase-of-day. - # Таблица должна создаваться в миграции/init_db (database.py), а не в рантайме. - # TODO: перенести CREATE TABLE в database.py::init_db(). - # Пока — оставлено для совместимости, но убрать при следующей миграции. - await conn.execute(""" - CREATE TABLE IF NOT EXISTS daily_phrases ( - id SERIAL PRIMARY KEY, - phrase_date DATE UNIQUE NOT NULL, - phrase_pl TEXT NOT NULL, - translations JSONB NOT NULL DEFAULT '{}', - grammar_breakdowns JSONB NOT NULL DEFAULT '{}', - created_at TIMESTAMP DEFAULT NOW() - ) - """) + # DDL перенесён в database.py::init_db(). Раньше выполнялся на КАЖДЫЙ + # GET /teacher/phrase-of-day. Теперь — только при старте приложения. today = datetime.now(timezone.utc).date()