Sosees04ka/PIbd-32_Kashin_M.I_API_CourseWork
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил id

Browse Source
This commit is contained in:
maksim
2024-06-09 16:42:05 +04:00
parent b390ed9c29
commit 84b1f81cc9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
genetic_algorithm/genetic_algorithm.py
View File

@@ -185,6 +185,7 @@ def genetic_algorithm(start, end, graph, flights_data, type, departure_date, pop
for flight in flights_data: for flight in flights_data:
if flight['departurePoint'] == path[i] and flight['destinationPoint'] == path[i + 1]: if flight['departurePoint'] == path[i] and flight['destinationPoint'] == path[i + 1]:
path_data.append({ path_data.append({
"id": flight['id'],
"departurePoint": flight['departurePoint'], "departurePoint": flight['departurePoint'],
"destinationPoint": flight['destinationPoint'] "destinationPoint": flight['destinationPoint']
}) })

6
router_flight.py
View File

@@ -11,7 +11,7 @@ router = APIRouter(
) )
@router.post("/get/", response_model=List[TripOption]) @router.post("/get/", response_model=List[List[TripOption]])
async def get_flight(request: TripRequest): async def get_flight(request: TripRequest):
graphTo, graphBack, start_point, end_point, flightsDataTo, flightsDataBack, departure_date, departure_date_return = load_graph_from_request( graphTo, graphBack, start_point, end_point, flightsDataTo, flightsDataBack, departure_date, departure_date_return = load_graph_from_request(
request) request)
@@ -28,7 +28,7 @@ async def get_flight(request: TripRequest):
for back_trip in resultFrom: for back_trip in resultFrom:
to_segments = [FlightSegment(**segment) for segment in to_trip["to"]] to_segments = [FlightSegment(**segment) for segment in to_trip["to"]]
back_segments = [FlightSegment(**segment) for segment in back_trip["back"]] back_segments = [FlightSegment(**segment) for segment in back_trip["back"]]
trip_options.append(TripOption(to=to_segments, back=back_segments)) trip_options.append([TripOption(to=to_segments, back=back_segments)])
return trip_options return trip_options
@@ -38,7 +38,7 @@ async def get_flight(request: TripRequest):
if not resultTo: if not resultTo:
raise HTTPException(status_code=404, detail="No valid paths found") raise HTTPException(status_code=404, detail="No valid paths found")
trip_options = [TripOption(to=[FlightSegment(**segment) for segment in trip["to"]], back=[]) for trip in trip_options = [[TripOption(to=[FlightSegment(**segment) for segment in trip["to"]], back=[])] for trip in
resultTo] resultTo]
return trip_options return trip_options

1
schemas.py
View File

@@ -47,6 +47,7 @@ class Review(BaseModel):
name_ru: str name_ru: str
class FlightSegment(BaseModel): class FlightSegment(BaseModel):
id: int
departurePoint: str departurePoint: str
destinationPoint: str destinationPoint: str