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
53 lines
1.7 KiB
Python
53 lines
1.7 KiB
Python
from typing import Optional
|
|
|
|
import structlog
|
|
from aiogram import types
|
|
from aiogram.fsm.context import FSMContext
|
|
|
|
from app.keyboards.inline import get_subscription_confirm_keyboard
|
|
from app.localization.texts import get_texts
|
|
from app.services.subscription_checkout_service import save_subscription_checkout_draft
|
|
from app.states import SubscriptionStates
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def present_subscription_summary(
|
|
callback: types.CallbackQuery,
|
|
state: FSMContext,
|
|
db_user,
|
|
texts: Optional = None,
|
|
) -> bool:
|
|
"""Render the subscription purchase summary and switch to the confirmation state.
|
|
|
|
Returns ``True`` when the summary is shown successfully and ``False`` if
|
|
calculation failed (an error is shown to the user in this case).
|
|
"""
|
|
|
|
if texts is None:
|
|
texts = get_texts(db_user.language)
|
|
|
|
data = await state.get_data()
|
|
|
|
from .pricing import _prepare_subscription_summary
|
|
|
|
try:
|
|
summary_text, prepared_data = await _prepare_subscription_summary(db_user, data, texts)
|
|
except ValueError as exc:
|
|
logger.error('Ошибка в расчете цены подписки для пользователя', telegram_id=db_user.telegram_id, exc=exc)
|
|
await callback.answer('Ошибка расчета цены. Обратитесь в поддержку.', show_alert=True)
|
|
return False
|
|
|
|
await state.set_data(prepared_data)
|
|
await save_subscription_checkout_draft(db_user.id, prepared_data)
|
|
|
|
await callback.message.edit_text(
|
|
summary_text,
|
|
reply_markup=get_subscription_confirm_keyboard(db_user.language),
|
|
parse_mode='HTML',
|
|
)
|
|
|
|
await state.set_state(SubscriptionStates.confirming_purchase)
|
|
return True
|