6deab7dd8c
Мультиязычность:
- Миграция 0021: текстовые поля лендингов → JSON с ключами локалей
- Утилита resolve_locale_text с fallback-цепочкой (lang → ru → en → first)
- Админ API: dict[str, str] для title/subtitle/footer/meta/features
- Публичный API: ?lang= параметр, резолвит в плоские строки
- Обратная совместимость: plain strings → {"ru": value}
Гостевые платежи:
- Миграция 0022: user_id nullable во всех платёжных таблицах
- Поддержка всех провайдеров кроме Stars
- Общий хелпер try_fulfill_guest_purchase в common.py
- YooKassa переведена на общий хелпер
Исправления по ревью:
- CryptoBot: guest fulfillment после FOR UPDATE lock
- _patch_guest_metadata: commit вместо flush
- Freekassa/KassaAI: metadata как dict вместо JSON-строки
- purchase_token маскирован в логах
- None → "guest" в order_id
- Rate limit на GET /landing/{slug}
- Маскирование contact_value
173 lines
4.9 KiB
Python
173 lines
4.9 KiB
Python
from datetime import UTC, datetime
|
|
from typing import Any
|
|
|
|
import structlog
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.database.models import HeleketPayment
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def create_heleket_payment(
|
|
db: AsyncSession,
|
|
*,
|
|
user_id: int | None,
|
|
uuid: str,
|
|
order_id: str,
|
|
amount: str,
|
|
currency: str,
|
|
status: str,
|
|
payer_amount: str | None = None,
|
|
payer_currency: str | None = None,
|
|
exchange_rate: float | None = None,
|
|
discount_percent: int | None = None,
|
|
payment_url: str | None = None,
|
|
expires_at: datetime | None = None,
|
|
metadata: dict[str, Any] | None = None,
|
|
) -> HeleketPayment:
|
|
payment = HeleketPayment(
|
|
user_id=user_id,
|
|
uuid=uuid,
|
|
order_id=order_id,
|
|
amount=amount,
|
|
currency=currency,
|
|
status=status,
|
|
payer_amount=payer_amount,
|
|
payer_currency=payer_currency,
|
|
exchange_rate=exchange_rate,
|
|
discount_percent=discount_percent,
|
|
payment_url=payment_url,
|
|
expires_at=expires_at,
|
|
metadata_json=metadata or {},
|
|
)
|
|
|
|
db.add(payment)
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
|
|
logger.info(
|
|
'Создан Heleket платеж: uuid= order_id= amount= для пользователя',
|
|
uuid=uuid,
|
|
order_id=order_id,
|
|
amount=amount,
|
|
currency=currency,
|
|
user_id=user_id,
|
|
)
|
|
|
|
return payment
|
|
|
|
|
|
async def get_heleket_payment_by_uuid(
|
|
db: AsyncSession,
|
|
uuid: str,
|
|
) -> HeleketPayment | None:
|
|
result = await db.execute(
|
|
select(HeleketPayment).options(selectinload(HeleketPayment.user)).where(HeleketPayment.uuid == uuid)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_heleket_payment_by_order_id(
|
|
db: AsyncSession,
|
|
order_id: str,
|
|
) -> HeleketPayment | None:
|
|
result = await db.execute(
|
|
select(HeleketPayment).options(selectinload(HeleketPayment.user)).where(HeleketPayment.order_id == order_id)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_heleket_payment_by_id(
|
|
db: AsyncSession,
|
|
payment_id: int,
|
|
) -> HeleketPayment | None:
|
|
result = await db.execute(
|
|
select(HeleketPayment).options(selectinload(HeleketPayment.user)).where(HeleketPayment.id == payment_id)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_heleket_payment_by_id_for_update(db: AsyncSession, payment_id: int) -> HeleketPayment | None:
|
|
result = await db.execute(select(HeleketPayment).where(HeleketPayment.id == payment_id).with_for_update())
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def update_heleket_payment(
|
|
db: AsyncSession,
|
|
uuid: str,
|
|
*,
|
|
status: str | None = None,
|
|
payer_amount: str | None = None,
|
|
payer_currency: str | None = None,
|
|
exchange_rate: float | None = None,
|
|
discount_percent: int | None = None,
|
|
paid_at: datetime | None = None,
|
|
payment_url: str | None = None,
|
|
metadata: dict[str, Any] | None = None,
|
|
) -> HeleketPayment | None:
|
|
payment = await get_heleket_payment_by_uuid(db, uuid)
|
|
|
|
if not payment:
|
|
logger.error('Heleket платеж с uuid= не найден', uuid=uuid)
|
|
return None
|
|
|
|
if status is not None:
|
|
payment.status = status
|
|
if payer_amount is not None:
|
|
payment.payer_amount = payer_amount
|
|
if payer_currency is not None:
|
|
payment.payer_currency = payer_currency
|
|
if exchange_rate is not None:
|
|
payment.exchange_rate = exchange_rate
|
|
if discount_percent is not None:
|
|
payment.discount_percent = discount_percent
|
|
if payment_url is not None:
|
|
payment.payment_url = payment_url
|
|
if metadata is not None:
|
|
existing = dict(payment.metadata_json or {})
|
|
existing.update(metadata)
|
|
payment.metadata_json = existing
|
|
if paid_at is not None:
|
|
payment.paid_at = paid_at
|
|
|
|
payment.updated_at = datetime.now(UTC)
|
|
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
|
|
logger.info(
|
|
'Обновлен Heleket платеж : статус= payer_amount',
|
|
uuid=uuid,
|
|
payment_status=payment.status,
|
|
payer_amount=payment.payer_amount,
|
|
payer_currency=payment.payer_currency,
|
|
)
|
|
|
|
return payment
|
|
|
|
|
|
async def link_heleket_payment_to_transaction(
|
|
db: AsyncSession,
|
|
uuid: str,
|
|
transaction_id: int,
|
|
) -> HeleketPayment | None:
|
|
payment = await get_heleket_payment_by_uuid(db, uuid)
|
|
|
|
if not payment:
|
|
logger.error('Не найден Heleket платеж для связи с транзакцией', uuid=uuid)
|
|
return None
|
|
|
|
payment.transaction_id = transaction_id
|
|
payment.updated_at = datetime.now(UTC)
|
|
|
|
await db.flush()
|
|
await db.refresh(payment)
|
|
|
|
logger.info('Heleket платеж связан с транзакцией', uuid=uuid, transaction_id=transaction_id)
|
|
|
|
return payment
|