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
199 lines
5.6 KiB
Python
199 lines
5.6 KiB
Python
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
|
|
import structlog
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.config import settings
|
|
from app.database.crud.subscription import decrement_subscription_server_counts
|
|
from app.database.crud.user import add_user_balance, subtract_user_balance
|
|
from app.database.models import Subscription, TransactionType, User
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
class TrialPaymentError(Exception):
|
|
"""Base exception for trial activation payment issues."""
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class TrialPaymentInsufficientFunds(TrialPaymentError):
|
|
required_amount: int
|
|
balance_amount: int
|
|
|
|
@property
|
|
def missing_amount(self) -> int:
|
|
return max(0, self.required_amount - self.balance_amount)
|
|
|
|
|
|
class TrialPaymentChargeFailed(TrialPaymentError):
|
|
"""Raised when balance charge could not be completed."""
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class TrialActivationReversionResult:
|
|
refunded: bool = True
|
|
subscription_rolled_back: bool = True
|
|
|
|
|
|
def get_trial_activation_charge_amount() -> int:
|
|
"""Returns the configured activation charge in kopeks if payment is enabled."""
|
|
|
|
if not settings.is_trial_paid_activation_enabled():
|
|
return 0
|
|
|
|
try:
|
|
price_kopeks = int(settings.get_trial_activation_price() or 0)
|
|
except (TypeError, ValueError): # pragma: no cover - defensive
|
|
price_kopeks = 0
|
|
|
|
return max(0, price_kopeks)
|
|
|
|
|
|
def preview_trial_activation_charge(user: User) -> int:
|
|
"""Validates that the user can afford the trial activation charge."""
|
|
|
|
price_kopeks = get_trial_activation_charge_amount()
|
|
if price_kopeks <= 0:
|
|
return 0
|
|
|
|
balance = int(getattr(user, 'balance_kopeks', 0) or 0)
|
|
if balance < price_kopeks:
|
|
raise TrialPaymentInsufficientFunds(price_kopeks, balance)
|
|
|
|
return price_kopeks
|
|
|
|
|
|
async def charge_trial_activation_if_required(
|
|
db: AsyncSession,
|
|
user: User,
|
|
*,
|
|
description: str | None = None,
|
|
) -> int:
|
|
"""Charges the user's balance if paid trial activation is enabled.
|
|
|
|
Returns the charged amount in kopeks. If payment is not required or the
|
|
configured price is zero, the function returns ``0``.
|
|
"""
|
|
|
|
price_kopeks = preview_trial_activation_charge(user)
|
|
if price_kopeks <= 0:
|
|
return 0
|
|
|
|
charge_description = description or 'Активация триальной подписки'
|
|
|
|
success = await subtract_user_balance(
|
|
db,
|
|
user,
|
|
price_kopeks,
|
|
charge_description,
|
|
)
|
|
if not success:
|
|
raise TrialPaymentChargeFailed
|
|
|
|
# subtract_user_balance обновляет пользователя, но на всякий случай приводим к int
|
|
return int(price_kopeks)
|
|
|
|
|
|
async def refund_trial_activation_charge(
|
|
db: AsyncSession,
|
|
user: User,
|
|
amount_kopeks: int,
|
|
*,
|
|
description: str | None = None,
|
|
) -> bool:
|
|
"""Refunds a previously charged trial activation amount back to the user."""
|
|
|
|
if amount_kopeks <= 0:
|
|
return True
|
|
|
|
refund_description = description or 'Возврат оплаты за активацию триальной подписки'
|
|
|
|
success = await add_user_balance(
|
|
db,
|
|
user,
|
|
amount_kopeks,
|
|
refund_description,
|
|
transaction_type=TransactionType.REFUND,
|
|
)
|
|
|
|
if not success:
|
|
logger.error(
|
|
'Failed to refund kopeks for user during trial activation rollback',
|
|
amount_kopeks=amount_kopeks,
|
|
getattr=getattr(user, 'id', '<unknown>'),
|
|
)
|
|
|
|
return success
|
|
|
|
|
|
async def rollback_trial_subscription_activation(
|
|
db: AsyncSession,
|
|
subscription: Subscription | None,
|
|
) -> bool:
|
|
"""Attempts to undo a previously created trial subscription.
|
|
|
|
Returns ``True`` when the rollback succeeds or when ``subscription`` is
|
|
falsy. In case of a database failure the function returns ``False`` after
|
|
logging the error so callers can decide how to proceed.
|
|
"""
|
|
|
|
if not subscription:
|
|
return True
|
|
|
|
try:
|
|
await decrement_subscription_server_counts(db, subscription)
|
|
except Exception as error: # pragma: no cover - defensive logging
|
|
logger.error(
|
|
'Failed to decrement server counters during trial rollback for', user_id=subscription.user_id, error=error
|
|
)
|
|
|
|
try:
|
|
await db.delete(subscription)
|
|
await db.commit()
|
|
except Exception as error: # pragma: no cover - defensive logging
|
|
logger.error(
|
|
'Failed to remove trial subscription after charge failure',
|
|
getattr=getattr(subscription, 'id', '<unknown>'),
|
|
error=error,
|
|
)
|
|
await db.rollback()
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
async def revert_trial_activation(
|
|
db: AsyncSession,
|
|
user: User,
|
|
subscription: Subscription | None,
|
|
charged_amount: int,
|
|
*,
|
|
refund_description: str | None = None,
|
|
) -> TrialActivationReversionResult:
|
|
"""Rolls back a trial subscription and refunds any charged amount."""
|
|
|
|
rollback_success = await rollback_trial_subscription_activation(db, subscription)
|
|
refund_success = await refund_trial_activation_charge(
|
|
db,
|
|
user,
|
|
charged_amount,
|
|
description=refund_description,
|
|
)
|
|
|
|
try:
|
|
await db.refresh(user)
|
|
except Exception as error: # pragma: no cover - defensive logging
|
|
logger.warning(
|
|
'Failed to refresh user after reverting trial activation',
|
|
getattr=getattr(user, 'id', '<unknown>'),
|
|
error=error,
|
|
)
|
|
|
|
return TrialActivationReversionResult(
|
|
refunded=refund_success,
|
|
subscription_rolled_back=rollback_success,
|
|
)
|