2c3ffc8c8a
Full integration across bot, cabinet, admin panel and landing pages: - Config: 16 OVERPAY_* settings (API URL, credentials, P12 cert path, project ID, currency, amount limits, webhook path, payment methods) - Service: overpay_service.py with httpx mTLS (P12 cert) + Basic Auth, create_payment, get_payment, refund_payment methods - Payment mixin: OverpayPaymentMixin with create, webhook processing, finalize (balance credit + notifications), status check - Model: OverpayPayment table + OVERPAY enum value - CRUD: 9 standard operations (create, get_by_*, for_update, link) - Bot handler: start_overpay_topup + process_overpay_payment_amount - Handler registration: route_payment_by_method + callback registration - Webhook: POST /overpay-webhook with DB-based anti-spoofing validation - Cabinet: balance topup + guest payment dispatch - Keyboard: payment method button in bot - Admin: settings category + test payment button - Infrastructure: payment_method_config_service, system_settings_service, payment_verification_service, payment_search_service - Migration 0064: create overpay_payments table Overpay API specifics: amount as string "100.00" (not kopeks), success status "charged", HPP redirect via resultUrl
158 lines
5.1 KiB
Python
158 lines
5.1 KiB
Python
"""CRUD операции для платежей Overpay."""
|
|
|
|
from datetime import UTC, datetime
|
|
|
|
import structlog
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database.models import OverpayPayment
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def create_overpay_payment(
|
|
db: AsyncSession,
|
|
*,
|
|
user_id: int | None,
|
|
order_id: str,
|
|
amount_kopeks: int,
|
|
currency: str = 'RUB',
|
|
description: str | None = None,
|
|
payment_url: str | None = None,
|
|
payment_method: str | None = None,
|
|
overpay_payment_id: str | None = None,
|
|
expires_at: datetime | None = None,
|
|
metadata_json: dict | None = None,
|
|
) -> OverpayPayment:
|
|
"""Создает запись о платеже Overpay."""
|
|
payment = OverpayPayment(
|
|
user_id=user_id,
|
|
order_id=order_id,
|
|
amount_kopeks=amount_kopeks,
|
|
currency=currency,
|
|
description=description,
|
|
payment_url=payment_url,
|
|
payment_method=payment_method,
|
|
overpay_payment_id=overpay_payment_id,
|
|
expires_at=expires_at,
|
|
metadata_json=metadata_json,
|
|
status='pending',
|
|
is_paid=False,
|
|
)
|
|
db.add(payment)
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
logger.info('Создан платеж Overpay', order_id=order_id, user_id=user_id)
|
|
return payment
|
|
|
|
|
|
async def get_overpay_payment_by_order_id(db: AsyncSession, order_id: str) -> OverpayPayment | None:
|
|
"""Получает платеж по order_id (internal)."""
|
|
result = await db.execute(select(OverpayPayment).where(OverpayPayment.order_id == order_id))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_overpay_payment_by_overpay_id(db: AsyncSession, overpay_payment_id: str) -> OverpayPayment | None:
|
|
"""Получает платеж по ID от Overpay."""
|
|
result = await db.execute(select(OverpayPayment).where(OverpayPayment.overpay_payment_id == overpay_payment_id))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_overpay_payment_by_id(db: AsyncSession, payment_id: int) -> OverpayPayment | None:
|
|
"""Получает платеж по ID."""
|
|
result = await db.execute(select(OverpayPayment).where(OverpayPayment.id == payment_id))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_overpay_payment_by_id_for_update(db: AsyncSession, payment_id: int) -> OverpayPayment | None:
|
|
"""Получает платеж по ID с блокировкой FOR UPDATE."""
|
|
result = await db.execute(
|
|
select(OverpayPayment)
|
|
.where(OverpayPayment.id == payment_id)
|
|
.with_for_update()
|
|
.execution_options(populate_existing=True)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def update_overpay_payment_status(
|
|
db: AsyncSession,
|
|
payment: OverpayPayment,
|
|
*,
|
|
status: str,
|
|
is_paid: bool | None = None,
|
|
overpay_payment_id: str | None = None,
|
|
payment_method: str | None = None,
|
|
callback_payload: dict | None = None,
|
|
transaction_id: int | None = None,
|
|
) -> OverpayPayment:
|
|
"""Обновляет статус платежа."""
|
|
payment.status = status
|
|
payment.updated_at = datetime.now(UTC)
|
|
|
|
if is_paid is not None:
|
|
payment.is_paid = is_paid
|
|
if is_paid:
|
|
payment.paid_at = datetime.now(UTC)
|
|
if overpay_payment_id is not None:
|
|
payment.overpay_payment_id = overpay_payment_id
|
|
if payment_method is not None:
|
|
payment.payment_method = payment_method
|
|
if callback_payload is not None:
|
|
payment.callback_payload = callback_payload
|
|
if transaction_id is not None:
|
|
payment.transaction_id = transaction_id
|
|
|
|
await db.commit()
|
|
await db.refresh(payment)
|
|
logger.info(
|
|
'Обновлен статус платежа Overpay',
|
|
order_id=payment.order_id,
|
|
status=status,
|
|
is_paid=payment.is_paid,
|
|
)
|
|
return payment
|
|
|
|
|
|
async def get_pending_overpay_payments(db: AsyncSession, user_id: int) -> list[OverpayPayment]:
|
|
"""Получает незавершенные платежи пользователя."""
|
|
result = await db.execute(
|
|
select(OverpayPayment).where(
|
|
OverpayPayment.user_id == user_id,
|
|
OverpayPayment.status == 'pending',
|
|
OverpayPayment.is_paid == False,
|
|
)
|
|
)
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def get_expired_pending_overpay_payments(
|
|
db: AsyncSession,
|
|
) -> list[OverpayPayment]:
|
|
"""Получает просроченные платежи в статусе pending."""
|
|
now = datetime.now(UTC)
|
|
result = await db.execute(
|
|
select(OverpayPayment).where(
|
|
OverpayPayment.status == 'pending',
|
|
OverpayPayment.is_paid == False,
|
|
OverpayPayment.expires_at < now,
|
|
)
|
|
)
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def link_overpay_payment_to_transaction(
|
|
db: AsyncSession,
|
|
*,
|
|
payment: OverpayPayment,
|
|
transaction_id: int,
|
|
) -> OverpayPayment:
|
|
"""Связывает платеж с транзакцией."""
|
|
payment.transaction_id = transaction_id
|
|
payment.updated_at = datetime.now(UTC)
|
|
await db.flush()
|
|
await db.refresh(payment)
|
|
return payment
|