Добавлен адаптер к tbank и формирование ссылки на оплату

This commit is contained in:
Раис Юсупалиев
2026-04-12 18:56:41 +03:00
parent ab0b66e1c2
commit 2b201a08be
34 changed files with 1322 additions and 268 deletions
+28 -14
View File
@@ -8,10 +8,11 @@ from app.adapters.address_suggestions.yandex_geosuggest import (
YandexGeosuggestAddressSuggestionProvider,
)
from app.adapters.delivery_providers.cdek import CDEKProvider
from app.adapters.tbank import TBankAdapter
from app.config import Settings
from app.controllers.http_client import build_controller_http_client
from app.repositories.cache.redis_cache import PriceCache
from app.schemas.order import OrderCreateRequest, OrderCreateResponse
from app.schemas.payment import InitPaymentRequest, InitPaymentResponse
from app.schemas.request import AddressSuggestRequest, DeliveryCalculationRequest
from app.schemas.response import AddressSuggestion, DeliveryPrice
from app.services.aggregator import (
@@ -20,7 +21,8 @@ from app.services.aggregator import (
AggregatorServiceError,
InvalidAddressSuggestRequestError,
InvalidDeliveryRequestError,
InvalidOrderCreateRequestError,
InvalidInitPaymentRequestError,
InitPaymentUnavailableError,
UnsupportedAddressSuggestionCountryError,
)
@@ -38,6 +40,10 @@ def _build_aggregator_service(settings: Settings) -> AggregatorService:
http_client=http_client,
adapter_config=settings.adapter,
)
payment_adapter = TBankAdapter.from_config(
http_client=http_client,
config=settings.tbank_payment,
)
dadata_provider = DadataAddressSuggestionProvider.from_config(
http_client=http_client,
config=settings.address_suggestions.dadata,
@@ -55,7 +61,7 @@ def _build_aggregator_service(settings: Settings) -> AggregatorService:
service = AggregatorService(
providers=providers,
cache=cache,
order_adapter=cdek_provider,
payment_adapter=payment_adapter,
address_suggestion_providers=(
dadata_provider,
yandex_geosuggest_provider,
@@ -146,28 +152,36 @@ async def suggest_addresses(
@router.post(
"/order",
response_model=OrderCreateResponse,
"/init-payment",
response_model=InitPaymentResponse,
)
async def create_delivery_order(
order_request: OrderCreateRequest,
async def init_payment(
payment_request: InitPaymentRequest,
service: AggregatorService = Depends(get_aggregator_service),
) -> OrderCreateResponse:
) -> InitPaymentResponse:
try:
return await service.create_order(order_request)
except InvalidOrderCreateRequestError as exc:
return await service.init_payment(payment_request)
except InvalidInitPaymentRequestError as exc:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail={
"code": "invalid_order_create_request",
"message": "Order request contains invalid or unsupported CDEK data.",
"code": "invalid_init_payment_request",
"message": "Payment request contains invalid or unsupported TBank data.",
},
) from exc
except InitPaymentUnavailableError as exc:
raise HTTPException(
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
detail={
"code": "init_payment_unavailable",
"message": "Payment initialization is temporarily unavailable.",
},
) from exc
except AggregatorServiceError as exc:
raise HTTPException(
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
detail={
"code": "order_creation_unavailable",
"message": "CDEK order creation is temporarily unavailable.",
"code": "init_payment_unavailable",
"message": "Payment initialization is temporarily unavailable.",
},
) from exc