Skip to content

Commit ca0de61

Browse files
MisklerMiskler
committed
fix bugs and update tests
1 parent 3b18281 commit ca0de61

8 files changed

Lines changed: 502 additions & 3 deletions

‎pyaterochka_api/endpoints/advertising.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ async def promo_offers(self,
3030
"zooclub_promotion",
3131
"childrenclub_promotion",
3232
"barclub_promotion"] = "mainpage_promotion") -> FetchResponse:
33-
request_url = f"{self._parent.CATALOG_URL}/public/v1/promo-offers/?limit={limit}&web_version={str(web_version).lower()}&type={type_offers}"
33+
request_url = f"{self._parent.SECOND_API_URL}/public/v1/promo-offers/?limit={limit}&web_version={str(web_version).lower()}&type={type_offers}"
3434
return await self._parent._request(method=HttpMethod.GET, url=request_url)

‎pyaterochka_api/endpoints/geolocation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ async def find_store(self, longitude: float, latitude: float) -> FetchResponse:
3636

3737
async def suggest(self, query: str) -> FetchResponse:
3838
"""Начинайте вводить адрес, он предложит точные варианты"""
39-
request_url = f"{self._parent.CATALOG_URL}/maps/suggest/?text={urllib.parse.quote(query)}"
39+
request_url = f"{self._parent.MAIN_SITE_URL}/api/maps/suggest/?text={urllib.parse.quote(query)}"
4040
return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
4141

4242
async def geocode(self,

‎pyaterochka_api/manager.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ class PyaterochkaAPI:
3838
"""Дополнительные опции для браузера (см. https://camoufox.com/python/installation/)"""
3939
CATALOG_URL: str = "https://5d.5ka.ru/api"
4040
"""URL для работы с каталогом."""
41+
SECOND_API_URL: str = "https://api.5ka.ru/api"
42+
"""Видимо старый эндпоинт на котором сохранилась небольшая функциональность."""
4143
MAIN_SITE_URL: str = "https://5ka.ru"
4244
"""URL главной страницы сайта."""
4345

‎tests/__snapshots__/ClassGeolocation.find_store.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"shop_address": "Москва, Новоалексеевская, 12с1",
3+
"store_city": "msk",
4+
"sap_code": "J200",
5+
"has_delivery": true,
6+
"has_24h_delivery": false
7+
}

‎tests/__snapshots__/ClassGeolocation.find_store.schema.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/2020-12/schema",
3+
"type": "object",
4+
"properties": {
5+
"shop_address": {
6+
"type": "string"
7+
},
8+
"store_city": {
9+
"type": "string"
10+
},
11+
"sap_code": {
12+
"type": "string"
13+
},
14+
"has_delivery": {
15+
"type": "boolean"
16+
},
17+
"has_24h_delivery": {
18+
"type": "boolean"
19+
}
20+
},
21+
"required": [
22+
"has_24h_delivery",
23+
"has_delivery",
24+
"sap_code",
25+
"shop_address",
26+
"store_city"
27+
]
28+
}

‎tests/__snapshots__/ClassGeolocation.suggest.json‎

Lines changed: 313 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,313 @@
1+
{
2+
"suggest_reqid": "1763155247216276-1771185306-rtyzkge7q663gh4p",
3+
"results": [
4+
{
5+
"title": {
6+
"text": "улица Маршала Баграмяна"
7+
},
8+
"subtitle": {
9+
"text": "Армавир",
10+
"hl": [
11+
{
12+
"begin": 0,
13+
"end": 7
14+
}
15+
]
16+
},
17+
"tags": [
18+
"street"
19+
],
20+
"distance": {
21+
"value": 6299150.038,
22+
"text": "6299.15 км"
23+
},
24+
"address": {
25+
"formatted_address": "Армавир, улица Маршала Баграмяна",
26+
"component": [
27+
{
28+
"name": "Армения",
29+
"kind": [
30+
"COUNTRY"
31+
]
32+
},
33+
{
34+
"name": "Армавир",
35+
"kind": [
36+
"LOCALITY"
37+
]
38+
},
39+
{
40+
"name": "улица Маршала Баграмяна",
41+
"kind": [
42+
"STREET"
43+
]
44+
}
45+
]
46+
}
47+
},
48+
{
49+
"title": {
50+
"text": "улица Араратян"
51+
},
52+
"subtitle": {
53+
"text": "Армавир",
54+
"hl": [
55+
{
56+
"begin": 0,
57+
"end": 7
58+
}
59+
]
60+
},
61+
"tags": [
62+
"street"
63+
],
64+
"distance": {
65+
"value": 6299553.516,
66+
"text": "6299.55 км"
67+
},
68+
"address": {
69+
"formatted_address": "Армавир, улица Араратян",
70+
"component": [
71+
{
72+
"name": "Армения",
73+
"kind": [
74+
"COUNTRY"
75+
]
76+
},
77+
{
78+
"name": "Армавир",
79+
"kind": [
80+
"LOCALITY"
81+
]
82+
},
83+
{
84+
"name": "улица Араратян",
85+
"kind": [
86+
"STREET"
87+
]
88+
}
89+
]
90+
}
91+
},
92+
{
93+
"title": {
94+
"text": "улица Максима Горького"
95+
},
96+
"subtitle": {
97+
"text": "Армавир",
98+
"hl": [
99+
{
100+
"begin": 0,
101+
"end": 7
102+
}
103+
]
104+
},
105+
"tags": [
106+
"street"
107+
],
108+
"distance": {
109+
"value": 6300440.268,
110+
"text": "6300.44 км"
111+
},
112+
"address": {
113+
"formatted_address": "Армавир, улица Максима Горького",
114+
"component": [
115+
{
116+
"name": "Армения",
117+
"kind": [
118+
"COUNTRY"
119+
]
120+
},
121+
{
122+
"name": "Армавир",
123+
"kind": [
124+
"LOCALITY"
125+
]
126+
},
127+
{
128+
"name": "улица Максима Горького",
129+
"kind": [
130+
"STREET"
131+
]
132+
}
133+
]
134+
}
135+
},
136+
{
137+
"title": {
138+
"text": "улица Мгера Мкртчяана"
139+
},
140+
"subtitle": {
141+
"text": "Армавир",
142+
"hl": [
143+
{
144+
"begin": 0,
145+
"end": 7
146+
}
147+
]
148+
},
149+
"tags": [
150+
"street"
151+
],
152+
"distance": {
153+
"value": 6300293.668,
154+
"text": "6300.29 км"
155+
},
156+
"address": {
157+
"formatted_address": "Армавир, улица Мгера Мкртчяана",
158+
"component": [
159+
{
160+
"name": "Армения",
161+
"kind": [
162+
"COUNTRY"
163+
]
164+
},
165+
{
166+
"name": "Армавир",
167+
"kind": [
168+
"LOCALITY"
169+
]
170+
},
171+
{
172+
"name": "улица Мгера Мкртчяана",
173+
"kind": [
174+
"STREET"
175+
]
176+
}
177+
]
178+
}
179+
},
180+
{
181+
"title": {
182+
"text": "улица Саят-Новы"
183+
},
184+
"subtitle": {
185+
"text": "Армавир",
186+
"hl": [
187+
{
188+
"begin": 0,
189+
"end": 7
190+
}
191+
]
192+
},
193+
"tags": [
194+
"street"
195+
],
196+
"distance": {
197+
"value": 6299630.395,
198+
"text": "6299.63 км"
199+
},
200+
"address": {
201+
"formatted_address": "Армавир, улица Саят-Новы",
202+
"component": [
203+
{
204+
"name": "Армения",
205+
"kind": [
206+
"COUNTRY"
207+
]
208+
},
209+
{
210+
"name": "Армавир",
211+
"kind": [
212+
"LOCALITY"
213+
]
214+
},
215+
{
216+
"name": "улица Саят-Новы",
217+
"kind": [
218+
"STREET"
219+
]
220+
}
221+
]
222+
}
223+
},
224+
{
225+
"title": {
226+
"text": "Армавирская улица",
227+
"hl": [
228+
{
229+
"begin": 0,
230+
"end": 7
231+
}
232+
]
233+
},
234+
"subtitle": {
235+
"text": "Москва"
236+
},
237+
"tags": [
238+
"street"
239+
],
240+
"distance": {
241+
"value": 7056627.137,
242+
"text": "7056.63 км"
243+
},
244+
"address": {
245+
"formatted_address": "Москва, Армавирская улица",
246+
"component": [
247+
{
248+
"name": "Россия",
249+
"kind": [
250+
"COUNTRY"
251+
]
252+
},
253+
{
254+
"name": "Москва",
255+
"kind": [
256+
"LOCALITY"
257+
]
258+
},
259+
{
260+
"name": "Армавирская улица",
261+
"kind": [
262+
"STREET"
263+
]
264+
}
265+
]
266+
}
267+
},
268+
{
269+
"title": {
270+
"text": "улица Лермонтова, переулок 4"
271+
},
272+
"subtitle": {
273+
"text": "Армавир",
274+
"hl": [
275+
{
276+
"begin": 0,
277+
"end": 7
278+
}
279+
]
280+
},
281+
"tags": [
282+
"street"
283+
],
284+
"distance": {
285+
"value": 6300288.565,
286+
"text": "6300.29 км"
287+
},
288+
"address": {
289+
"formatted_address": "Армавир, улица Лермонтова, переулок 4",
290+
"component": [
291+
{
292+
"name": "Армения",
293+
"kind": [
294+
"COUNTRY"
295+
]
296+
},
297+
{
298+
"name": "Армавир",
299+
"kind": [
300+
"LOCALITY"
301+
]
302+
},
303+
{
304+
"name": "улица Лермонтова, переулок 4",
305+
"kind": [
306+
"STREET"
307+
]
308+
}
309+
]
310+
}
311+
}
312+
]
313+
}

0 commit comments

Comments
 (0)