Рефактор

app/controllers/v1/delivery.py

@@ -10,8 +10,10 @@ from app.adapters.address_suggestions.tomtom import TomTomAddressSuggestionProvi
 from app.adapters.address_suggestions.yandex_geosuggest import (
     YandexGeosuggestAddressSuggestionProvider,
 )
-from app.adapters.delivery_providers.cdek import CDEKProvider
-from app.adapters.delivery_providers.cse import CSEProvider
+from app.adapters.delivery_providers.registry import (
+    build_delivery_provider_registry,
+    resolve_delivery_provider_timeout_seconds,
+)
 from app.adapters.email import SMTPEmailSender
 from app.adapters.tbank import TBankAdapter
 from app.config import Settings
@@ -49,15 +51,13 @@ _AGGREGATOR_SERVICE_STATE_KEY = "aggregator_service"
 
 def _build_aggregator_service(settings: Settings) -> AggregatorService:
     http_client = build_controller_http_client(
-        timeout_seconds=settings.adapter.cdek_timeout_seconds
+        timeout_seconds=resolve_delivery_provider_timeout_seconds(
+            settings.delivery_providers
+        )
     )
-    cdek_provider = CDEKProvider.from_adapter_config(
+    delivery_provider_registry = build_delivery_provider_registry(
         http_client=http_client,
-        adapter_config=settings.adapter,
-    )
-    cse_provider = CSEProvider.from_adapter_config(
-        http_client=http_client,
-        adapter_config=settings.adapter,
+        config=settings.delivery_providers,
     )
     payment_adapter = TBankAdapter.from_config(
         http_client=http_client,
@@ -75,7 +75,6 @@ def _build_aggregator_service(settings: Settings) -> AggregatorService:
         http_client=http_client,
         config=settings.address_suggestions.tomtom,
     )
-    providers = (cdek_provider, cse_provider)
     cache = PriceCache.from_repository_config(
         settings.repository,
         metrics=get_cache_metrics(),
@@ -93,18 +92,16 @@ def _build_aggregator_service(settings: Settings) -> AggregatorService:
         timeout_seconds=settings.email.timeout_seconds,
     )
     service = AggregatorService(
-        providers=providers,
+        providers=delivery_provider_registry.providers,
         cache=cache,
         payment_adapter=payment_adapter,
-        payment_price_validation_adapters={
-            cdek_provider.name: cdek_provider,
-            cse_provider.name: cse_provider,
-        },
+        payment_price_validation_adapters=(
+            delivery_provider_registry.payment_price_validation_adapters
+        ),
         order_repository=order_repository,
-        order_registration_adapters={
-            cdek_provider.name: cdek_provider,
-            cse_provider.name: cse_provider,
-        },
+        order_registration_adapters=(
+            delivery_provider_registry.order_registration_adapters
+        ),
         email_sender=email_sender,
         address_suggestion_providers=(
             dadata_provider,