Fringg
eb18994b7d
- Migrate 660+ datetime.utcnow() across 153 files to datetime.now(UTC) - Migrate 30+ datetime.now() without UTC to datetime.now(UTC) - Convert all 170 DateTime columns to DateTime(timezone=True) - Add migrate_datetime_to_timestamptz() in universal_migration with SET LOCAL timezone='UTC' safety - Remove 70+ .replace(tzinfo=None) workarounds - Fix utcfromtimestamp → fromtimestamp(..., tz=UTC) - Fix fromtimestamp() without tz= (system_logs, backup_service, referral_diagnostics) - Fix fromisoformat/isoparse to ensure aware output (platega, yookassa, wata, miniapp, nalogo) - Fix strptime() to add .replace(tzinfo=UTC) (backup_service, referral_diagnostics) - Fix datetime.combine() to include tzinfo=UTC (remnawave_sync, traffic_monitoring) - Fix datetime.max/datetime.min sentinels with .replace(tzinfo=UTC) - Rename panel_datetime_to_naive_utc → panel_datetime_to_utc - Remove DTZ003 from ruff ignore list
127 lines
4.3 KiB
Python
127 lines
4.3 KiB
Python
"""High level integration with PayPalych API."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime, timedelta
|
|
from decimal import Decimal
|
|
from typing import Any
|
|
|
|
import structlog
|
|
|
|
from app.config import settings
|
|
from app.external.pal24_client import Pal24APIError, Pal24Client
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
class Pal24Service:
|
|
"""Wrapper around :class:`Pal24Client` providing domain helpers."""
|
|
|
|
BILL_SUCCESS_STATES = {'SUCCESS', 'OVERPAID'}
|
|
BILL_FAILED_STATES = {'FAIL', 'CANCELLED'}
|
|
BILL_PENDING_STATES = {'NEW', 'PROCESS', 'UNDERPAID'}
|
|
|
|
def __init__(self, client: Pal24Client | None = None) -> None:
|
|
self.client = client or Pal24Client()
|
|
|
|
@property
|
|
def is_configured(self) -> bool:
|
|
return self.client.is_configured and settings.is_pal24_enabled()
|
|
|
|
async def create_bill(
|
|
self,
|
|
*,
|
|
amount_kopeks: int,
|
|
user_id: int,
|
|
order_id: str,
|
|
description: str,
|
|
ttl_seconds: int | None = None,
|
|
custom_payload: dict[str, Any] | None = None,
|
|
payer_email: str | None = None,
|
|
payment_method: str | None = None,
|
|
) -> dict[str, Any]:
|
|
if not self.is_configured:
|
|
raise Pal24APIError('Pal24 service is not configured')
|
|
|
|
amount_decimal = Pal24Client.normalize_amount(amount_kopeks)
|
|
extra_payload: dict[str, Any] = {
|
|
'custom': custom_payload or {},
|
|
'ttl': ttl_seconds,
|
|
}
|
|
|
|
if payer_email:
|
|
extra_payload['payer_email'] = payer_email
|
|
if payment_method:
|
|
extra_payload['payment_method'] = payment_method
|
|
|
|
filtered_payload = {k: v for k, v in extra_payload.items() if v not in (None, {})}
|
|
|
|
logger.info(
|
|
'Создаем Pal24 счет: user_id order_id amount ttl',
|
|
user_id=user_id,
|
|
order_id=order_id,
|
|
amount_decimal=amount_decimal,
|
|
ttl_seconds=ttl_seconds,
|
|
)
|
|
|
|
response = await self.client.create_bill(
|
|
amount=amount_decimal,
|
|
shop_id=settings.PAL24_SHOP_ID,
|
|
order_id=order_id,
|
|
description=description,
|
|
type_='normal',
|
|
**filtered_payload,
|
|
)
|
|
|
|
logger.info('Pal24 счет создан', response=response)
|
|
return response
|
|
|
|
async def get_bill_status(self, bill_id: str) -> dict[str, Any]:
|
|
logger.debug('Запрашиваем статус Pal24 счета', bill_id=bill_id)
|
|
return await self.client.get_bill_status(bill_id)
|
|
|
|
async def get_payment_status(self, payment_id: str) -> dict[str, Any]:
|
|
logger.debug('Запрашиваем статус Pal24 платежа', payment_id=payment_id)
|
|
return await self.client.get_payment_status(payment_id)
|
|
|
|
async def get_bill_payments(self, bill_id: str) -> dict[str, Any]:
|
|
"""Возвращает список платежей, связанных со счетом."""
|
|
|
|
logger.debug('Запрашиваем платежи Pal24 счёта', bill_id=bill_id)
|
|
return await self.client.get_bill_payments(bill_id)
|
|
|
|
@staticmethod
|
|
def parse_callback(payload: dict[str, Any]) -> dict[str, Any]:
|
|
required_fields = ['InvId', 'OutSum', 'Status', 'SignatureValue']
|
|
missing = [field for field in required_fields if field not in payload]
|
|
if missing:
|
|
raise Pal24APIError(f'Pal24 callback missing fields: {", ".join(missing)}')
|
|
|
|
inv_id = str(payload['InvId'])
|
|
out_sum = str(payload['OutSum'])
|
|
signature = str(payload['SignatureValue'])
|
|
|
|
if not Pal24Client.verify_signature(out_sum, inv_id, signature):
|
|
raise Pal24APIError('Pal24 callback signature mismatch')
|
|
|
|
logger.info(
|
|
'Получен Pal24 callback: InvId Status TrsId',
|
|
inv_id=inv_id,
|
|
payload=payload.get('Status'),
|
|
payload_2=payload.get('TrsId'),
|
|
)
|
|
|
|
return payload
|
|
|
|
@staticmethod
|
|
def convert_to_kopeks(amount: str) -> int:
|
|
decimal_amount = Decimal(str(amount))
|
|
return int((decimal_amount * Decimal(100)).quantize(Decimal(1)))
|
|
|
|
@staticmethod
|
|
def get_expiration(ttl_seconds: int | None) -> datetime | None:
|
|
if not ttl_seconds:
|
|
return None
|
|
return datetime.now(UTC) + timedelta(seconds=ttl_seconds)
|