2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix route item schema

Browse source
This commit is contained in:
Gwendolyn 2023-12-03 20:36:40 +01:00
parent 1fb84414f8
commit 67be6f1131
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/c3nav/routing/newapi/routing.py
View file

@ -74,10 +74,19 @@ class RouteParametersSchema(Schema):
class RouteItemSchema(Schema): class RouteItemSchema(Schema):
id: PositiveInt id: PositiveInt
coordinates: Coordinates3D coordinates: Coordinates3D
way_type: Optional[dict] # todo: improve waytype: Optional[dict] = None # todo: improve
space: Optional[dict] = APIField(title="new space being entered") space: Optional[dict] = APIField(None, title="new space being entered")
level: Optional[dict] = APIField(title="new level being entered") level: Optional[dict] = APIField(None, title="new level being entered")
descriptions: list[NonEmptyStr] descriptions: list[tuple[
Annotated[NonEmptyStr, APIField(
title="icon name",
description="any material design icon name"
)],
Annotated[NonEmptyStr, APIField(
title="instruction",
description="navigation instruction"
)]
]]
class RouteSchema(Schema): class RouteSchema(Schema):
@ -124,7 +133,8 @@ def get_route(request, parameters: RouteParametersSchema):
return APIRequestValidationFailed("\n".join(form.errors)) return APIRequestValidationFailed("\n".join(form.errors))
options = RouteOptions.get_for_request(request) options = RouteOptions.get_for_request(request)
_new_update_route_options(options, parameters.options_override) if parameters.options_override is not None:
_new_update_route_options(options, parameters.options_override)
try: try:
route = Router.load().get_route(origin=form.cleaned_data['origin'], route = Router.load().get_route(origin=form.cleaned_data['origin'],
@ -165,8 +175,8 @@ def get_route(request, parameters: RouteParametersSchema):
request=parameters, request=parameters,
options=_new_serialize_route_options(options), options=_new_serialize_route_options(options),
report_issue_url=reverse('site.report_create', kwargs={ report_issue_url=reverse('site.report_create', kwargs={
'origin': request.POST['origin'], 'origin': parameters.origin,
'destination': request.POST['destination'], 'destination': parameters.destination,
'options': options.serialize_string() 'options': options.serialize_string()
}), }),
result=route.serialize(locations=visible_locations_for_request(request)), result=route.serialize(locations=visible_locations_for_request(request)),