Merge pull request #522 from LACMTA:dev

Refactor get_route_details and get_stop_times_by_route_code_and_agency functions

fastapi/app/crud.py

@@ -163,18 +163,17 @@ async def get_route_details(db: AsyncSession, route_code: str, direction_id: int
 	result = db.execute(query, {'p_route_code': route_code, 'p_direction_id': direction_id, 'p_day_type': day_type.value, 'p_input_time': p_time.strftime("%H:%M:%S"), 'p_num_results': num_results})
 	raw_data = result.fetchall()
 
-	stop_times = defaultdict(list)
+	stop_times = []
 	shape_ids = set()
 	for row in raw_data:
 		stop_name, departure_times, shape_id = row
 		shape_ids.add(shape_id)
+		times = []
 		for time in departure_times:
-			if time not in stop_times[stop_name]:
-				stop_times[stop_name].append(time)
-		stop_times[stop_name].sort()
-
-	# Prepare the list of stop times and shape_ids
-	stop_times_list = [(stop_name, times, shape_id) for stop_name, times in stop_times.items()]
+			if time not in times:
+				times.append(time)
+		times.sort()
+		stop_times.append([stop_name, {'times': times, 'shape_id': shape_id}])
 
 	# Query the trip_shapes table for the geometries of the distinct shape_ids
 	query = text("SELECT shape_id, ST_AsGeoJSON(geometry) FROM metro_api.trip_shapes WHERE shape_id IN :shape_ids")
@@ -195,7 +194,7 @@ async def get_route_details(db: AsyncSession, route_code: str, direction_id: int
 
 	# Prepare the final data
 	final_data = {
-		'stop_times': stop_times_list,
+		'stop_times': stop_times,
 		'geometries': geometries,
 		'debug_info': debug_info,
 	}
@@ -629,37 +628,33 @@ def get_gtfs_rt_trips_by_trip_id(db, trip_id: str,agency_id: str):
     return result
 
 
-
-def get_stops_id(db, stop_code: str,agency_id: str):
+async def get_stops_id(db, stop_code: str, agency_id: str):
     result = []
     if stop_code == 'list':
-        the_query = db.query(models.Stops).filter(models.Stops.agency_id == agency_id).all()
-        for row in the_query:
-            result.append(row.stop_code)
+        data = await get_all_data_async(db, models.Stops, agency_id)
+        for item in data:
+            result.append(item['stop_code'])
         return result
     elif stop_code == 'all':
-        the_query = db.query(models.Stops).filter(models.Stops.agency_id == agency_id).all()
-        for row in the_query:
+        data = await get_all_data_async(db, models.Stops, agency_id)
+        for item in data:
             this_object = {}
             this_object['type'] = 'Feature' 
-            this_object['geometry']= JsonReturn(geo.mapping(shape.to_shape((row.geometry))))
-            del row.geometry
-            this_object['properties'] = row
+            this_object['geometry']= item['geometry']
+            del item['geometry']
+            this_object['properties'] = item
             result.append(this_object)
         return result
     else:
-        the_query = db.query(models.Stops).filter(models.Stops.stop_code == stop_code,models.Stops.agency_id == agency_id).all()
-        for row in the_query:
+        data = await get_data_async(db, models.Stops, agency_id, 'stop_code', stop_code)
+        for item in data:
             this_object = {}
             this_object['type'] = 'Feature' 
-            this_object['geometry']= JsonReturn(geo.mapping(shape.to_shape((row.geometry))))
-            del row.geometry
-            this_object['properties'] = row
+            this_object['geometry']= item['geometry']
+            del item['geometry']
+            this_object['properties'] = item
             result.append(this_object)
     return result
-    # user_dict = models.User[username]
-    # return schemas.UserInDB(**user_dict)
-
 
 
 ##### trip_shapes_info_endpoint handling start #####

fastapi/app/main.py

@@ -903,20 +903,24 @@ async def get_calendar_dates_from_db(db: Session = Depends(get_db)):
     calendar_dates = jsonable_encoder(result)
     return JSONResponse(content={"calendar_dates":calendar_dates})
 
-@app.get("/{agency_id}/stop_times/route_code/{route_code}",tags=["Static data"],response_model=Page[schemas.StopTimes])
-async def get_stop_times_by_route_code_and_agency(agency_id: AgencyIdEnum,route_code, db: Session = Depends(get_db)):
-    result = crud.get_stop_times_by_route_code(db,route_code,agency_id.value)
+@app.get("/{agency_id}/stop_times/route_code/{route_code}",tags=["Static data"])
+async def get_stop_times_by_route_code_and_agency(agency_id: AgencyIdEnum, route_code, async_db: AsyncSession = Depends(get_async_db)):
+    result = await crud.get_data_async(async_db, models.StopTimes, agency_id.value, 'route_code', route_code)
     return result
 
-
-@app.get("/{agency_id}/stop_times/trip_id/{trip_id}",tags=["Static data"],response_model=Page[schemas.StopTimes])
-async def get_stop_times_by_trip_id_and_agency(agency_id: AgencyIdEnum,trip_id, db: Session = Depends(get_db)):
-    result = crud.get_stop_times_by_trip_id(db,trip_id,agency_id.value)
+@app.get("/{agency_id}/stop_times/trip_id/{trip_id}",tags=["Static data"])
+async def get_stop_times_by_trip_id_and_agency(agency_id: AgencyIdEnum,trip_id, async_db: AsyncSession = Depends(get_async_db)):
+    if trip_id == 'list':
+        result = await crud.get_list_of_unique_values_async(async_db, models.StopTimes, agency_id.value, 'trip_id')
+    elif trip_id == 'all':
+        result = await crud.get_all_data_async(async_db, models.StopTimes, agency_id.value)
+    else:
+        result = await crud.get_data_async(async_db, models.StopTimes, agency_id.value, 'trip_id', trip_id)
     return result
 
 @app.get("/{agency_id}/stops/{stop_id}",tags=["Static data"])
-async def get_stops(agency_id: AgencyIdEnum,stop_id, db: Session = Depends(get_db)):
-    result = crud.get_stops_id(db,stop_id,agency_id.value)
+async def get_stops(agency_id: AgencyIdEnum, stop_id, db: AsyncSession = Depends(get_async_db)):
+    result = await crud.get_stops_id(db, stop_id, agency_id.value)
     return result
 
 @app.get("/{agency_id}/trips/{trip_id}",tags=["Static data"])