machka-pasla
d6f707d386
- Added a recurring billing task to automatically charge users one day before subscription expiry, improving subscription management. - Introduced a new UserBilling model to store saved payment methods for off-session charges, enhancing user experience. - Updated YooKassa service to support saving payment methods and capturing payments for auto-renewals. - Enhanced subscription handling to toggle auto-renew settings and provide user feedback through localized messages. - Improved error handling and logging for payment method persistence and subscription renewal processes.
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
from typing import Optional, Dict, Any
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy import select, update
|
|
from sqlalchemy.sql import func
|
|
|
|
from db.models import UserBilling
|
|
|
|
|
|
async def get_user_billing(session: AsyncSession, user_id: int) -> Optional[UserBilling]:
|
|
stmt = select(UserBilling).where(UserBilling.user_id == user_id)
|
|
result = await session.execute(stmt)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def upsert_yk_payment_method(
|
|
session: AsyncSession,
|
|
*,
|
|
user_id: int,
|
|
payment_method_id: str,
|
|
card_last4: Optional[str] = None,
|
|
card_network: Optional[str] = None,
|
|
) -> UserBilling:
|
|
existing = await get_user_billing(session, user_id)
|
|
if existing:
|
|
existing.yookassa_payment_method_id = payment_method_id
|
|
existing.card_last4 = card_last4
|
|
existing.card_network = card_network
|
|
existing.updated_at = func.now()
|
|
await session.flush()
|
|
await session.refresh(existing)
|
|
return existing
|
|
record = UserBilling(
|
|
user_id=user_id,
|
|
yookassa_payment_method_id=payment_method_id,
|
|
card_last4=card_last4,
|
|
card_network=card_network,
|
|
)
|
|
session.add(record)
|
|
await session.flush()
|
|
await session.refresh(record)
|
|
return record
|