mirror of
https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git
synced 2026-03-01 07:42:30 +00:00
1f0fef114b
- Add ContextVarsMiddleware for automatic user_id/chat_id/username binding via structlog contextvars (aiogram) and http_method/http_path (FastAPI) - Use bound_contextvars() context manager instead of clear_contextvars() to safely restore previous state instead of wiping all context - Register ContextVarsMiddleware as outermost middleware (before GlobalError) so all error logs include user context - Replace structlog.get_logger() with structlog.get_logger(__name__) across 270 calls in 265 files for meaningful logger names - Switch wrapper_class from BoundLogger to make_filtering_bound_logger() for pre-processor level filtering (performance optimization) - Migrate 1411 %-style positional arg logger calls to structlog kwargs style across 161 files via AST script - Migrate log_rotation_service.py from stdlib logging to structlog - Add payment module prefixes to TelegramNotifierProcessor.IGNORED_LOGGER_PREFIXES and ExcludePaymentFilter.PAYMENT_MODULES to prevent payment data leaking to Telegram notifications and general log files - Fix LoggingMiddleware: add from_user null-safety for channel posts, switch time.time() to time.monotonic() for duration measurement - Remove duplicate logger assignments in purchase.py, config.py, inline.py, and admin/payments.py
145 lines
3.8 KiB
Python
145 lines
3.8 KiB
Python
from collections.abc import Iterable
|
|
from datetime import datetime
|
|
|
|
import structlog
|
|
from sqlalchemy import delete, func, select, update
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database.models import FaqPage, FaqSetting
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def get_faq_setting(db: AsyncSession, language: str) -> FaqSetting | None:
|
|
result = await db.execute(select(FaqSetting).where(FaqSetting.language == language))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def set_faq_enabled(db: AsyncSession, language: str, enabled: bool) -> FaqSetting:
|
|
setting = await get_faq_setting(db, language)
|
|
|
|
if setting:
|
|
setting.is_enabled = bool(enabled)
|
|
setting.updated_at = datetime.utcnow()
|
|
else:
|
|
setting = FaqSetting(
|
|
language=language,
|
|
is_enabled=bool(enabled),
|
|
)
|
|
db.add(setting)
|
|
|
|
await db.commit()
|
|
await db.refresh(setting)
|
|
|
|
logger.info(
|
|
'✅ Статус FAQ для языка %s обновлен: %s',
|
|
language,
|
|
'enabled' if setting.is_enabled else 'disabled',
|
|
)
|
|
|
|
return setting
|
|
|
|
|
|
async def upsert_faq_setting(db: AsyncSession, language: str, enabled: bool) -> FaqSetting:
|
|
return await set_faq_enabled(db, language, enabled)
|
|
|
|
|
|
async def get_faq_pages(
|
|
db: AsyncSession,
|
|
language: str,
|
|
*,
|
|
include_inactive: bool = False,
|
|
) -> list[FaqPage]:
|
|
query = select(FaqPage).where(FaqPage.language == language)
|
|
|
|
if not include_inactive:
|
|
query = query.where(FaqPage.is_active.is_(True))
|
|
|
|
query = query.order_by(FaqPage.display_order.asc(), FaqPage.id.asc())
|
|
|
|
result = await db.execute(query)
|
|
pages = list(result.scalars().all())
|
|
return pages
|
|
|
|
|
|
async def get_faq_page_by_id(db: AsyncSession, page_id: int) -> FaqPage | None:
|
|
result = await db.execute(select(FaqPage).where(FaqPage.id == page_id))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def create_faq_page(
|
|
db: AsyncSession,
|
|
*,
|
|
language: str,
|
|
title: str,
|
|
content: str,
|
|
display_order: int | None = None,
|
|
is_active: bool = True,
|
|
) -> FaqPage:
|
|
if display_order is None:
|
|
result = await db.execute(select(func.max(FaqPage.display_order)).where(FaqPage.language == language))
|
|
max_order = result.scalar() or 0
|
|
display_order = max_order + 1
|
|
|
|
page = FaqPage(
|
|
language=language,
|
|
title=title,
|
|
content=content,
|
|
display_order=display_order,
|
|
is_active=is_active,
|
|
)
|
|
|
|
db.add(page)
|
|
await db.commit()
|
|
await db.refresh(page)
|
|
|
|
logger.info('✅ Создана страница FAQ для языка', page_id=page.id, language=language)
|
|
|
|
return page
|
|
|
|
|
|
async def update_faq_page(
|
|
db: AsyncSession,
|
|
page: FaqPage,
|
|
*,
|
|
title: str | None = None,
|
|
content: str | None = None,
|
|
display_order: int | None = None,
|
|
is_active: bool | None = None,
|
|
) -> FaqPage:
|
|
if title is not None:
|
|
page.title = title
|
|
if content is not None:
|
|
page.content = content
|
|
if display_order is not None:
|
|
page.display_order = display_order
|
|
if is_active is not None:
|
|
page.is_active = bool(is_active)
|
|
|
|
page.updated_at = datetime.utcnow()
|
|
|
|
await db.commit()
|
|
await db.refresh(page)
|
|
|
|
logger.info('✅ Страница FAQ обновлена', page_id=page.id)
|
|
|
|
return page
|
|
|
|
|
|
async def delete_faq_page(db: AsyncSession, page_id: int) -> None:
|
|
await db.execute(delete(FaqPage).where(FaqPage.id == page_id))
|
|
await db.commit()
|
|
logger.info('🗑️ Страница FAQ удалена', page_id=page_id)
|
|
|
|
|
|
async def bulk_update_order(
|
|
db: AsyncSession,
|
|
pages: Iterable[tuple[int, int]],
|
|
) -> None:
|
|
for page_id, order in pages:
|
|
await db.execute(
|
|
update(FaqPage).where(FaqPage.id == page_id).values(display_order=order, updated_at=datetime.utcnow())
|
|
)
|
|
await db.commit()
|