Рефактор

tests/config/fixtures/config.default.yaml

@@ -11,9 +11,12 @@ business_logic:
 repository:
   redis_dsn: "redis://localhost:6379/0"
 
-adapter:
-  cdek_client_id: "yaml-id"
-  cdek_client_secret: "yaml-secret"
+delivery_providers:
+  cdek:
+    client_id: "yaml-id"
+    client_secret: "yaml-secret"
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.invalid_price_multiplier.yaml

@@ -14,14 +14,17 @@ repository:
   redis_dsn: "redis://localhost:6379/0"
   price_cache_ttl_seconds: 900
 
-adapter:
-  cdek_base_url: "https://api.cdek.ru/v2"
-  cdek_client_id: "test-client-id"
-  cdek_client_secret: "test-client-secret"
-  cdek_retry_attempts: 2
-  cdek_retry_backoff_seconds: 0.2
-  cdek_timeout_seconds: 10.0
-  cdek_cache_ttl_seconds: 900
+delivery_providers:
+  cdek:
+    base_url: "https://api.cdek.ru/v2"
+    client_id: "test-client-id"
+    client_secret: "test-client-secret"
+    retry_attempts: 2
+    retry_backoff_seconds: 0.2
+    timeout_seconds: 10.0
+    cache_ttl_seconds: 900
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.missing_address_suggestions.yaml

@@ -14,14 +14,17 @@ repository:
   redis_dsn: "redis://localhost:6379/0"
   price_cache_ttl_seconds: 900
 
-adapter:
-  cdek_base_url: "https://api.cdek.ru/v2"
-  cdek_client_id: "test-client-id"
-  cdek_client_secret: "test-client-secret"
-  cdek_retry_attempts: 2
-  cdek_retry_backoff_seconds: 0.2
-  cdek_timeout_seconds: 10.0
-  cdek_cache_ttl_seconds: 900
+delivery_providers:
+  cdek:
+    base_url: "https://api.cdek.ru/v2"
+    client_id: "test-client-id"
+    client_secret: "test-client-secret"
+    retry_attempts: 2
+    retry_backoff_seconds: 0.2
+    timeout_seconds: 10.0
+    cache_ttl_seconds: 900
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.missing_observability.yaml

@@ -14,14 +14,17 @@ repository:
   redis_dsn: "redis://localhost:6379/0"
   price_cache_ttl_seconds: 900
 
-adapter:
-  cdek_base_url: "https://api.cdek.ru/v2"
-  cdek_client_id: "test-client-id"
-  cdek_client_secret: "test-client-secret"
-  cdek_retry_attempts: 2
-  cdek_retry_backoff_seconds: 0.2
-  cdek_timeout_seconds: 10.0
-  cdek_cache_ttl_seconds: 900
+delivery_providers:
+  cdek:
+    base_url: "https://api.cdek.ru/v2"
+    client_id: "test-client-id"
+    client_secret: "test-client-secret"
+    retry_attempts: 2
+    retry_backoff_seconds: 0.2
+    timeout_seconds: 10.0
+    cache_ttl_seconds: 900
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.missing_observability_endpoint.yaml

@@ -14,14 +14,17 @@ repository:
   redis_dsn: "redis://localhost:6379/0"
   price_cache_ttl_seconds: 900
 
-adapter:
-  cdek_base_url: "https://api.cdek.ru/v2"
-  cdek_client_id: "test-client-id"
-  cdek_client_secret: "test-client-secret"
-  cdek_retry_attempts: 2
-  cdek_retry_backoff_seconds: 0.2
-  cdek_timeout_seconds: 10.0
-  cdek_cache_ttl_seconds: 900
+delivery_providers:
+  cdek:
+    base_url: "https://api.cdek.ru/v2"
+    client_id: "test-client-id"
+    client_secret: "test-client-secret"
+    retry_attempts: 2
+    retry_backoff_seconds: 0.2
+    timeout_seconds: 10.0
+    cache_ttl_seconds: 900
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.missing_price_multiplier.yaml

@@ -13,14 +13,17 @@ repository:
   redis_dsn: "redis://localhost:6379/0"
   price_cache_ttl_seconds: 900
 
-adapter:
-  cdek_base_url: "https://api.cdek.ru/v2"
-  cdek_client_id: "test-client-id"
-  cdek_client_secret: "test-client-secret"
-  cdek_retry_attempts: 2
-  cdek_retry_backoff_seconds: 0.2
-  cdek_timeout_seconds: 10.0
-  cdek_cache_ttl_seconds: 900
+delivery_providers:
+  cdek:
+    base_url: "https://api.cdek.ru/v2"
+    client_id: "test-client-id"
+    client_secret: "test-client-secret"
+    retry_attempts: 2
+    retry_backoff_seconds: 0.2
+    timeout_seconds: 10.0
+    cache_ttl_seconds: 900
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/fixtures/config.test.override.yaml

@@ -11,9 +11,12 @@ business_logic:
 repository:
   redis_dsn: "redis://localhost:6379/0"
 
-adapter:
-  cdek_client_id: "test-id"
-  cdek_client_secret: "test-secret"
+delivery_providers:
+  cdek:
+    client_id: "test-id"
+    client_secret: "test-secret"
+  cse:
+    enabled: false
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"

tests/config/test_config_sections.py

@@ -132,7 +132,7 @@ business_logic:
 
 repository: {{}}
 
-adapter: {{}}
+delivery_providers: {{}}
 
 tbank_payment:
   init_url: "https://securepay.tinkoff.ru/v2/Init"
@@ -174,13 +174,31 @@ def test_configuration_sections_are_loaded_from_yaml_file(
     assert settings.business_logic.provider_price_multiplier == Decimal("1.0")
     assert settings.repository.redis_dsn == "redis://localhost:6379/0"
     assert settings.repository.price_cache_ttl_seconds == 900
-    assert settings.adapter.cdek_base_url == "https://api.cdek.ru/v2"
-    assert settings.adapter.cdek_client_id == "test-client-id"
-    assert settings.adapter.cdek_client_secret == "test-client-secret"
-    assert settings.adapter.cdek_retry_attempts == 2
-    assert settings.adapter.cdek_retry_backoff_seconds == 0.2
-    assert settings.adapter.cdek_timeout_seconds == 10.0
-    assert settings.adapter.cdek_cache_ttl_seconds == 900
+    assert settings.delivery_providers.cdek.enabled is True
+    assert settings.delivery_providers.cdek.base_url == "https://api.cdek.ru/v2"
+    assert settings.delivery_providers.cdek.client_id == "test-client-id"
+    assert settings.delivery_providers.cdek.client_secret == "test-client-secret"
+    assert settings.delivery_providers.cdek.retry_attempts == 2
+    assert settings.delivery_providers.cdek.retry_backoff_seconds == 0.2
+    assert settings.delivery_providers.cdek.timeout_seconds == 10.0
+    assert settings.delivery_providers.cdek.cache_ttl_seconds == 900
+    assert settings.delivery_providers.cse.enabled is True
+    assert (
+        settings.delivery_providers.cse.base_url
+        == "http://lk-test.cse.ru/1c/ws/web1c.1cws"
+    )
+    assert settings.delivery_providers.cse.login == "test"
+    assert settings.delivery_providers.cse.password == "2016"
+    assert settings.delivery_providers.cse.retry_attempts == 2
+    assert settings.delivery_providers.cse.retry_backoff_seconds == 0.2
+    assert settings.delivery_providers.cse.timeout_seconds == 10.0
+    assert settings.delivery_providers.cse.cache_ttl_seconds == 900
+    assert settings.delivery_providers.cse.payer == "0"
+    assert settings.delivery_providers.cse.payment_method == "1"
+    assert (
+        settings.delivery_providers.cse.shipping_method
+        == "5052d0b3-5ea3-46f2-823f-1472686a51dd"
+    )
     assert settings.tbank_payment.init_url == "https://securepay.tinkoff.ru/v2/Init"
     assert (
         settings.tbank_payment.notification_url
@@ -233,7 +251,7 @@ def test_get_settings_fails_when_required_yaml_section_is_missing(
         get_settings()
 
     locations = {tuple(item["loc"]) for item in error.value.errors()}
-    assert ("adapter",) in locations
+    assert ("delivery_providers",) in locations
     get_settings.cache_clear()
 
 
@@ -287,7 +305,7 @@ def test_get_settings_uses_config_test_yaml_in_pytest_environment(
     assert settings.service.provider_timeout_seconds == 17.0
     assert settings.controller.api_prefix == "/from-config-test-yaml"
     assert settings.business_logic.provider_price_multiplier == Decimal("1.25")
-    assert settings.adapter.cdek_client_id == "test-id"
+    assert settings.delivery_providers.cdek.client_id == "test-id"
     assert settings.tbank_payment.auth.terminal_key == "override-terminal-key"
     assert settings.tbank_payment.auth.password == "override-password"
     assert (