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
134 lines
3.9 KiB
Python
134 lines
3.9 KiB
Python
from datetime import datetime
|
|
|
|
import structlog
|
|
from sqlalchemy import and_, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.database.models import CryptoBotPayment
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def create_cryptobot_payment(
|
|
db: AsyncSession,
|
|
user_id: int,
|
|
invoice_id: str,
|
|
amount: str,
|
|
asset: str,
|
|
status: str = 'active',
|
|
description: str | None = None,
|
|
payload: str | None = None,
|
|
bot_invoice_url: str | None = None,
|
|
mini_app_invoice_url: str | None = None,
|
|
web_app_invoice_url: str | None = None,
|
|
) -> CryptoBotPayment:
|
|
payment = CryptoBotPayment(
|
|
user_id=user_id,
|
|
invoice_id=invoice_id,
|
|
amount=amount,
|
|
asset=asset,
|
|
status=status,
|
|
description=description,
|
|
payload=payload,
|
|
bot_invoice_url=bot_invoice_url,
|
|
mini_app_invoice_url=mini_app_invoice_url,
|
|
web_app_invoice_url=web_app_invoice_url,
|
|
)
|
|
|
|
db.add(payment)
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
|
|
logger.info(
|
|
'Создан CryptoBot платеж: на для пользователя',
|
|
invoice_id=invoice_id,
|
|
amount=amount,
|
|
asset=asset,
|
|
user_id=user_id,
|
|
)
|
|
return payment
|
|
|
|
|
|
async def get_cryptobot_payment_by_invoice_id(db: AsyncSession, invoice_id: str) -> CryptoBotPayment | None:
|
|
result = await db.execute(
|
|
select(CryptoBotPayment)
|
|
.options(selectinload(CryptoBotPayment.user))
|
|
.where(CryptoBotPayment.invoice_id == invoice_id)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_cryptobot_payment_by_id(db: AsyncSession, payment_id: int) -> CryptoBotPayment | None:
|
|
result = await db.execute(
|
|
select(CryptoBotPayment).options(selectinload(CryptoBotPayment.user)).where(CryptoBotPayment.id == payment_id)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def update_cryptobot_payment_status(
|
|
db: AsyncSession, invoice_id: str, status: str, paid_at: datetime | None = None
|
|
) -> CryptoBotPayment | None:
|
|
payment = await get_cryptobot_payment_by_invoice_id(db, invoice_id)
|
|
|
|
if not payment:
|
|
return None
|
|
|
|
payment.status = status
|
|
payment.updated_at = datetime.utcnow()
|
|
|
|
if status == 'paid' and paid_at:
|
|
payment.paid_at = paid_at
|
|
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
|
|
logger.info('Обновлен статус CryptoBot платежа', invoice_id=invoice_id, status=status)
|
|
return payment
|
|
|
|
|
|
async def link_cryptobot_payment_to_transaction(
|
|
db: AsyncSession, invoice_id: str, transaction_id: int
|
|
) -> CryptoBotPayment | None:
|
|
payment = await get_cryptobot_payment_by_invoice_id(db, invoice_id)
|
|
|
|
if not payment:
|
|
return None
|
|
|
|
payment.transaction_id = transaction_id
|
|
payment.updated_at = datetime.utcnow()
|
|
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
|
|
logger.info('Связан CryptoBot платеж с транзакцией', invoice_id=invoice_id, transaction_id=transaction_id)
|
|
return payment
|
|
|
|
|
|
async def get_user_cryptobot_payments(
|
|
db: AsyncSession, user_id: int, limit: int = 50, offset: int = 0
|
|
) -> list[CryptoBotPayment]:
|
|
result = await db.execute(
|
|
select(CryptoBotPayment)
|
|
.where(CryptoBotPayment.user_id == user_id)
|
|
.order_by(CryptoBotPayment.created_at.desc())
|
|
.offset(offset)
|
|
.limit(limit)
|
|
)
|
|
return result.scalars().all()
|
|
|
|
|
|
async def get_pending_cryptobot_payments(db: AsyncSession, older_than_hours: int = 24) -> list[CryptoBotPayment]:
|
|
from datetime import timedelta
|
|
|
|
cutoff_time = datetime.utcnow() - timedelta(hours=older_than_hours)
|
|
|
|
result = await db.execute(
|
|
select(CryptoBotPayment)
|
|
.options(selectinload(CryptoBotPayment.user))
|
|
.where(and_(CryptoBotPayment.status == 'active', CryptoBotPayment.created_at < cutoff_time))
|
|
.order_by(CryptoBotPayment.created_at)
|
|
)
|
|
return result.scalars().all()
|