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
96 lines
2.5 KiB
Python
96 lines
2.5 KiB
Python
from __future__ import annotations
|
|
|
|
import structlog
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.database.models import PromoOfferLog
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def log_promo_offer_action(
|
|
db: AsyncSession,
|
|
*,
|
|
user_id: int | None,
|
|
offer_id: int | None,
|
|
action: str,
|
|
source: str | None = None,
|
|
percent: int | None = None,
|
|
effect_type: str | None = None,
|
|
details: dict[str, object] | None = None,
|
|
commit: bool = True,
|
|
) -> PromoOfferLog:
|
|
"""Persist a promo offer log entry."""
|
|
|
|
entry = PromoOfferLog(
|
|
user_id=user_id,
|
|
offer_id=offer_id,
|
|
action=action,
|
|
source=source,
|
|
percent=percent,
|
|
effect_type=effect_type,
|
|
details=(details or {}).copy(),
|
|
)
|
|
db.add(entry)
|
|
|
|
if commit:
|
|
try:
|
|
await db.commit()
|
|
await db.refresh(entry)
|
|
except Exception:
|
|
logger.exception('Failed to commit promo offer log entry')
|
|
raise
|
|
|
|
return entry
|
|
|
|
|
|
async def list_promo_offer_logs(
|
|
db: AsyncSession,
|
|
offset: int = 0,
|
|
limit: int = 20,
|
|
*,
|
|
user_id: int | None = None,
|
|
offer_id: int | None = None,
|
|
action: str | None = None,
|
|
source: str | None = None,
|
|
) -> tuple[list[PromoOfferLog], int]:
|
|
stmt = (
|
|
select(PromoOfferLog)
|
|
.options(
|
|
selectinload(PromoOfferLog.user),
|
|
selectinload(PromoOfferLog.offer),
|
|
)
|
|
.order_by(PromoOfferLog.created_at.desc())
|
|
.offset(offset)
|
|
.limit(limit)
|
|
)
|
|
|
|
if user_id is not None:
|
|
stmt = stmt.where(PromoOfferLog.user_id == user_id)
|
|
if offer_id is not None:
|
|
stmt = stmt.where(PromoOfferLog.offer_id == offer_id)
|
|
if action:
|
|
stmt = stmt.where(PromoOfferLog.action == action)
|
|
if source:
|
|
stmt = stmt.where(PromoOfferLog.source == source)
|
|
|
|
result = await db.execute(stmt)
|
|
logs = result.scalars().all()
|
|
|
|
count_stmt = select(func.count(PromoOfferLog.id))
|
|
if user_id is not None:
|
|
count_stmt = count_stmt.where(PromoOfferLog.user_id == user_id)
|
|
if offer_id is not None:
|
|
count_stmt = count_stmt.where(PromoOfferLog.offer_id == offer_id)
|
|
if action:
|
|
count_stmt = count_stmt.where(PromoOfferLog.action == action)
|
|
if source:
|
|
count_stmt = count_stmt.where(PromoOfferLog.source == source)
|
|
|
|
total = (await db.execute(count_stmt)).scalar() or 0
|
|
|
|
return logs, total
|