Добавлен yandex geosuggest
This commit is contained in:
@@ -35,13 +35,15 @@ def _install_service_override(app, service: StubAggregatorService) -> None:
|
||||
app.dependency_overrides[get_aggregator_service] = override_service
|
||||
|
||||
|
||||
def _valid_payload() -> dict[str, object]:
|
||||
return {
|
||||
def _valid_payload(**overrides: object) -> dict[str, object]:
|
||||
payload = {
|
||||
"country_code": "RU",
|
||||
"city": "Moscow",
|
||||
"query": "Lenina",
|
||||
"limit": 5,
|
||||
}
|
||||
payload.update(overrides)
|
||||
return payload
|
||||
|
||||
|
||||
def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
@@ -62,24 +64,16 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
return cls()
|
||||
|
||||
class StubAddressProvider:
|
||||
name = "dadata"
|
||||
|
||||
def __init__(self) -> None:
|
||||
def __init__(self, name: str, response: list[AddressSuggestion]) -> None:
|
||||
self.name = name
|
||||
self._response = response
|
||||
self.calls: list[AddressSuggestRequest] = []
|
||||
|
||||
async def suggest(
|
||||
self, request: AddressSuggestRequest
|
||||
) -> list[AddressSuggestion]:
|
||||
self.calls.append(request)
|
||||
return [
|
||||
AddressSuggestion(
|
||||
address="107241, Moscow, Khabarovskaya 1",
|
||||
street="Khabarovskaya",
|
||||
house="1",
|
||||
flat="25",
|
||||
postal_code="107241",
|
||||
)
|
||||
]
|
||||
return self._response
|
||||
|
||||
class StubDadataAddressSuggestionProvider:
|
||||
@classmethod
|
||||
@@ -91,7 +85,19 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
) -> StubAddressProvider:
|
||||
assert http_client is stub_http_client
|
||||
_ = config
|
||||
return stub_address_provider
|
||||
return stub_dadata_provider
|
||||
|
||||
class StubYandexGeosuggestAddressSuggestionProvider:
|
||||
@classmethod
|
||||
def from_config(
|
||||
cls,
|
||||
*,
|
||||
http_client,
|
||||
config,
|
||||
) -> StubAddressProvider:
|
||||
assert http_client is stub_http_client
|
||||
_ = config
|
||||
return stub_yandex_provider
|
||||
|
||||
class StubCache:
|
||||
async def get(self, key: str) -> object | None:
|
||||
@@ -110,7 +116,28 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
return StubCache()
|
||||
|
||||
stub_http_client = StubHttpClient()
|
||||
stub_address_provider = StubAddressProvider()
|
||||
stub_dadata_provider = StubAddressProvider(
|
||||
"dadata",
|
||||
[
|
||||
AddressSuggestion(
|
||||
address="107241, Moscow, Khabarovskaya 1",
|
||||
street="Khabarovskaya",
|
||||
house="1",
|
||||
flat="25",
|
||||
postal_code="107241",
|
||||
)
|
||||
],
|
||||
)
|
||||
stub_yandex_provider = StubAddressProvider(
|
||||
"yandex_geosuggest",
|
||||
[
|
||||
AddressSuggestion(
|
||||
address="Tumanyan Street, 12, Yerevan",
|
||||
street="Tumanyan Street",
|
||||
house="12",
|
||||
)
|
||||
],
|
||||
)
|
||||
http_client_timeouts: list[float] = []
|
||||
|
||||
def fake_build_controller_http_client(timeout_seconds: float) -> StubHttpClient:
|
||||
@@ -128,9 +155,19 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
"DadataAddressSuggestionProvider",
|
||||
StubDadataAddressSuggestionProvider,
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
delivery_controller,
|
||||
"YandexGeosuggestAddressSuggestionProvider",
|
||||
StubYandexGeosuggestAddressSuggestionProvider,
|
||||
)
|
||||
monkeypatch.setattr(delivery_controller, "PriceCache", StubPriceCache)
|
||||
|
||||
app = create_app()
|
||||
request_payload = _valid_payload(
|
||||
country_code="AM",
|
||||
city="Yerevan",
|
||||
query="Tumanyan 12",
|
||||
)
|
||||
|
||||
async def run_request() -> httpx.Response:
|
||||
transport = httpx.ASGITransport(app=app)
|
||||
@@ -140,7 +177,7 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
) as client:
|
||||
return await client.post(
|
||||
"/api/v1/delivery/suggest-address",
|
||||
json=_valid_payload(),
|
||||
json=request_payload,
|
||||
)
|
||||
|
||||
response = asyncio.run(run_request())
|
||||
@@ -148,15 +185,16 @@ def test_post_address_suggest_uses_registered_provider_in_default_dependency(
|
||||
assert response.status_code == 200
|
||||
assert response.json() == [
|
||||
{
|
||||
"address": "107241, Moscow, Khabarovskaya 1",
|
||||
"street": "Khabarovskaya",
|
||||
"house": "1",
|
||||
"flat": "25",
|
||||
"postal_code": "107241",
|
||||
"address": "Tumanyan Street, 12, Yerevan",
|
||||
"street": "Tumanyan Street",
|
||||
"house": "12",
|
||||
"flat": None,
|
||||
"postal_code": None,
|
||||
}
|
||||
]
|
||||
assert http_client_timeouts == [10.0]
|
||||
assert stub_address_provider.calls == [AddressSuggestRequest(**_valid_payload())]
|
||||
assert stub_dadata_provider.calls == []
|
||||
assert stub_yandex_provider.calls == [AddressSuggestRequest(**request_payload)]
|
||||
|
||||
|
||||
def test_post_address_suggest_returns_response_and_delegates_to_service() -> None:
|
||||
|
||||
Reference in New Issue
Block a user