Fringg
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
74 lines
1.8 KiB
Python
74 lines
1.8 KiB
Python
from datetime import datetime
|
|
|
|
import structlog
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database.models import PublicOffer
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def get_public_offer(db: AsyncSession, language: str) -> PublicOffer | None:
|
|
result = await db.execute(select(PublicOffer).where(PublicOffer.language == language))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def upsert_public_offer(
|
|
db: AsyncSession,
|
|
language: str,
|
|
content: str,
|
|
*,
|
|
enable_if_new: bool = True,
|
|
) -> PublicOffer:
|
|
offer = await get_public_offer(db, language)
|
|
|
|
if offer:
|
|
offer.content = content or ''
|
|
offer.updated_at = datetime.utcnow()
|
|
else:
|
|
offer = PublicOffer(
|
|
language=language,
|
|
content=content or '',
|
|
is_enabled=bool(enable_if_new),
|
|
)
|
|
db.add(offer)
|
|
|
|
await db.commit()
|
|
await db.refresh(offer)
|
|
|
|
logger.info('✅ Публичная оферта для языка обновлена (ID:)', language=language, offer_id=offer.id)
|
|
|
|
return offer
|
|
|
|
|
|
async def set_public_offer_enabled(
|
|
db: AsyncSession,
|
|
language: str,
|
|
enabled: bool,
|
|
) -> PublicOffer:
|
|
offer = await get_public_offer(db, language)
|
|
|
|
if offer:
|
|
offer.is_enabled = bool(enabled)
|
|
offer.updated_at = datetime.utcnow()
|
|
else:
|
|
offer = PublicOffer(
|
|
language=language,
|
|
content='',
|
|
is_enabled=bool(enabled),
|
|
)
|
|
db.add(offer)
|
|
|
|
await db.commit()
|
|
await db.refresh(offer)
|
|
|
|
logger.info(
|
|
'✅ Статус публичной оферты для языка %s обновлен: %s',
|
|
language,
|
|
'enabled' if offer.is_enabled else 'disabled',
|
|
)
|
|
|
|
return offer
|