From 6d34bdc84b78f61218dfe9d55a228844b46afe39 Mon Sep 17 00:00:00 2001 From: Abdussamet Kocak Date: Mon, 20 Jan 2020 21:26:57 +0300 Subject: [PATCH] Tweak routes --- app/api.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/app/api.py b/app/api.py index 2cb6f32..ac0814e 100644 --- a/app/api.py +++ b/app/api.py @@ -32,34 +32,25 @@ async def list_cities_in_country( return cities -@api.get('/diyanet/location/{country}', response_model=List[Location]) -async def list_locations_for_country( +@api.get('/diyanet/locations', response_model=List[Location]) +async def list_locations( country: str, - conn: sqlite3.Connection = Depends(get_connection) -): - items = diyanetdb.find_locations(conn, country=country) - return items - - -@api.get('/diyanet/location/{country}/{city}', response_model=List[Location]) -async def list_locations_for_city( - country: str, - city: str, + city: str = None, conn: sqlite3.Connection = Depends(get_connection) ): items = diyanetdb.find_locations(conn, country=country, city=city) return items -@api.get('/diyanet/prayertimes', response_model=List[PrayerTimes]) -async def get_prayer_times(location_id: int): - times = diyanet.get_prayer_times(location_id) - return times - - @api.get('/diyanet/search', response_model=List[PrayerTimes]) async def search_location( q: str, conn: sqlite3.Connection = Depends(get_connection)): locations = diyanetdb.find_location_by_name(conn, q) return locations + + +@api.get('/diyanet/prayertimes', response_model=List[PrayerTimes]) +async def get_prayer_times(location_id: int): + times = await diyanet.get_prayer_times(location_id) + return times