Adrien/carrramba-encore-rate
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

♻️ Fix /stop/ endpoints inconsistency

Browse Source
This commit is contained in:
Adrien
2023-05-08 13:44:44 +02:00
parent 93047c8706
commit d15fee75ca
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/main.py
View File

@@ -175,15 +175,14 @@ async def get_stop(
) )
) )
# print(f"{stops = }", flush=True)
formatted.extend(_format_stop(stop) for stop in stops.values()) formatted.extend(_format_stop(stop) for stop in stops.values())
return formatted return formatted
# TODO: Cache response for 30 secs ? # TODO: Cache response for 30 secs ?
@app.get("/stop/nextPassages/{stop_id}") @app.get("/stop/{stop_id}/nextPassages")
async def get_next_passages(stop_id: str) -> NextPassagesSchema | None: async def get_next_passages(stop_id: int) -> NextPassagesSchema | None:
res = await idfm_interface.get_next_passages(stop_id) res = await idfm_interface.get_next_passages(stop_id)
if res is None: if res is None:
return None return None
@@ -250,8 +249,7 @@ async def get_stop_destinations(
return destinations return destinations
# TODO: Rename endpoint -> /stop/{stop_id}/shape @app.get("/stop/{stop_id}/shape")
@app.get("/stop_shape/{stop_id}")
async def get_stop_shape(stop_id: int) -> StopShapeSchema | None: async def get_stop_shape(stop_id: int) -> StopShapeSchema | None:
connection_area = None connection_area = None

4
frontend/src/businessData.tsx
View File

@@ -93,7 +93,7 @@ export function BusinessDataProvider(props: { children: JSX.Element }) {
const refreshPassages = async (stopId: number): Promise<void> => { const refreshPassages = async (stopId: number): Promise<void> => {
const httpOptions = { headers: { "Content-Type": "application/json" } }; const httpOptions = { headers: { "Content-Type": "application/json" } };
console.log(`Fetching data for ${stopId}`); console.log(`Fetching data for ${stopId}`);
const data = await fetch(`${serverUrl()}/stop/nextPassages/${stopId}`, httpOptions); const data = await fetch(`${serverUrl()}/stop/${stopId}/nextPassages`, httpOptions);
const response = await data.json(); const response = await data.json();
_cleanupPassages(response.passages); _cleanupPassages(response.passages);
addPassages(response.passages); addPassages(response.passages);
@@ -183,7 +183,7 @@ ${linePassagesDestination.length} here... refresh all them.`);
let shape = store.stopShapes[stopId]; let shape = store.stopShapes[stopId];
if (shape === undefined) { if (shape === undefined) {
console.log(`No shape found for ${stopId} stop... fetch it from backend.`); console.log(`No shape found for ${stopId} stop... fetch it from backend.`);
const data = await fetch(`${serverUrl()}/stop_shape/${stopId}`, { const data = await fetch(`${serverUrl()}/stop/${stopId}/shape`, {
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}); });
shape = await data.json(); shape = await data.json();