poletani.cz/api
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lepsi stahovani informaci o pocasi

Browse Source
This commit is contained in:
Michal Kváček
2024-09-30 06:43:11 +02:00
parent 186dbd0720
commit ca3f6ef07c
14 changed files with 198 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphql_schema/dataloaders/single_model.py
+1 -1
View File
@@ -14,7 +14,7 @@ airport_dataloader = create_dataloader(models.Airport)
aircraft_dataloader = create_dataloader(models.Aircraft)
event_dataloader = create_dataloader(models.Event)
organizations_dataloader = create_dataloader(models.Organization)
airport_weather_info_loader = create_dataloader(models.WeatherInfo)
weather_info_loader = create_dataloader(models.WeatherInfo)
track_dataloader = create_dataloader(models.Track)
poi_dataloader = create_dataloader(models.PointOfInterest)
poi_type_dataloader = create_dataloader(models.PointOfInterestType)
src/graphql_schema/entities/aircraft.py
+2 -2
View File
@@ -62,9 +62,9 @@ class AircraftMutation:
@error_logging
@authenticated_user_only()
async def edit_aircraft(root, info, id: int, input: EditAircraftInput) -> Aircraft:
return await AircraftMutationResolver().update(id, user_id=info.context.user_id, data=input)
return await AircraftMutationResolver().update(id, info.context, data=input)
@strawberry.mutation
@authenticated_user_only()
async def delete_aircraft(self, info, id: int) -> Aircraft:
return await AircraftMutationResolver().delete(info.context.user_id, id)
return await AircraftMutationResolver().delete(info.context, id)
src/graphql_schema/entities/airport.py
-1
View File
@@ -11,7 +11,6 @@ from graphql_schema.entities.types.types import Airport
class AirportQueries:
@strawberry.field()
@error_logging
# @authenticated_user_only()
async def airports(root, info) -> List[Airport]:
return await BaseQueryResolver(Airport, models.Airport).get_list(info.context.user_id)
src/graphql_schema/entities/flight_plan.py
+1 -1
View File
@@ -50,4 +50,4 @@ class FlightPlanMutation:
@error_logging
@authenticated_user_only()
async def edit_flight_plan(root, info, id: int, input: EditFlightPlanInput) -> FlightPlan:
return await FlightPlanMutationResolver().update(id, input, info.context.user_id)
return await FlightPlanMutationResolver().update(info.context, id, input)
src/graphql_schema/entities/resolvers/aircraft.py
+2 -4
View File
@@ -1,8 +1,6 @@
from operator import or_
from typing import Set, Optional
from sqlalchemy import and_
from database import models
from database.transaction import get_session
from graphql_schema.entities.helpers.combobox import handle_combobox_save
@@ -77,7 +75,7 @@ class AircraftMutationResolver(BaseMutationResolver):
return await self._do_create(db, data=input_data)
async def update(self, id: int, user_id: int, data: EditAircraftInput) -> Aircraft:
async def update(self, context, id: int, data: EditAircraftInput) -> Aircraft:
update_data = data.to_dict()
async with get_session() as db:
if data.organization:
@@ -85,7 +83,7 @@ class AircraftMutationResolver(BaseMutationResolver):
db,
models.Organization,
input=data.organization,
user_id=user_id,
user_id=context.user_id,
)
return await self._do_update(db, id, update_data)
src/graphql_schema/entities/resolvers/base.py
+3 -3
View File
@@ -116,14 +116,14 @@ class BaseMutationResolver(BaseResolver):
async with get_session() as db:
return await self._do_create(db, input_data)
async def update(self, id: int, data: BaseGraphqlInputType, user_id: int) -> GQL_TYPE:
async def update(self, context, id: int, data: BaseGraphqlInputType, user_id: int) -> GQL_TYPE:
async with get_session() as db:
item = await self._get_one(db, id, user_id)
return await self._do_update(db, item, data.to_dict())
async def delete(self, user_id: int, id: int, **kwargs) -> GQL_TYPE:
async def delete(self, context, id: int, **kwargs) -> GQL_TYPE:
async with get_session() as db:
model = await self._get_one(db, id, user_id)
model = await self._get_one(db, id, context.user_id)
if hasattr(self.model, "deleted"):
model = await self.model.update(db, obj=model, data=dict(deleted=True))
src/graphql_schema/entities/resolvers/flight.py
+1 -1
View File
@@ -109,7 +109,7 @@ class FlightMutationResolver(BaseMutationResolver):
if input.track is not None:
await handle_track_edit(db=db, flight_id=flight.id, track=input.track, user_id=user_id)
if data['gpx_track_filename']:
if 'gpx_track_filename' in data:
await save_track_from_gpx_to_db(gpx_filename=data['gpx_track_filename'], flight_id=flight.id)
schedule_background_tasks(flight.id, data, context)
src/graphql_schema/entities/resolvers/flight_plan.py
+72 -56
View File
@@ -10,6 +10,8 @@ from graphql_schema.entities.resolvers.base import BaseMutationResolver, BaseQue
from graphql_schema.entities.resolvers.flight import handle_aircraft_save
from graphql_schema.entities.types.mutation_input import CreateFlightPlanInput, EditFlightPlanInput
from graphql_schema.entities.types.types import FlightPlan
from utils.flight_plan_helpers import refresh_markers_weather_info
from utils.list_utils import evenly_spaced_elements
from utils.str_utils import random_str
@@ -47,61 +49,24 @@ class FlightPlanMutationResolver(BaseMutationResolver):
def __init__(self):
super().__init__(graphql_type=FlightPlan, model=models.FlightPlan)
@staticmethod
async def save_markers(db, flight_plan: models.FlightPlan, markers: list):
position = 0
for marker in markers:
if marker.type == 'poi':
assert bool(marker.point_of_interest_id)
if marker.type == 'airport':
assert bool(marker.airport_id)
await models.FlightPlanMarker.create(db, data={
"position": position,
"flight_plan_id": flight_plan.id,
"airport_id": marker.airport_id,
"point_of_interest_id": marker.point_of_interest_id,
"type": marker.type,
"name": marker.name,
"gps_latitude": marker.gps_latitude,
"gps_longitude": marker.gps_longitude
})
position += 1
@staticmethod
async def reset_plan_markers(db, flight_plan: models.FlightPlan):
await db.execute(
delete(models.FlightPlanMarker)
.filter(models.FlightPlanMarker.flight_plan_id == flight_plan.id)
)
async def create(self, context, data: CreateFlightPlanInput) -> FlightPlan:
input_data = data.to_dict()
input_data['created_by_id'] = context.user_id
async with get_session() as db:
flight_plan = await self._do_create(db, data=input_data)
await self.save_markers(db, flight_plan, data.markers)
markers = await self.save_markers(db, flight_plan, data.markers)
await refresh_markers_weather_info(
planned_takeoff_datetime=flight_plan.planned_takeoff_datetime,
planned_speed=flight_plan.planned_speed,
markers=markers,
background_tasks=context.background_tasks
)
return flight_plan
async def save_copilots(self, db, flight_plan_id: int, copilots: list, user_id: int):
await db.execute(delete(flight_plan_has_copilot).filter_by(flight_plan_id=flight_plan_id))
copilots = await asyncio.gather(*[
handle_combobox_save(db, models.Copilot, copilot, user_id) for copilot in copilots
])
for copilot_id in copilots:
await db.execute(insert(flight_plan_has_copilot).values(
flight_plan_id=flight_plan_id,
copilot_id=copilot_id,
token=random_str(64)
))
async def update(self, id: int, data: EditFlightPlanInput, user_id: int) -> FlightPlan:
async def update(self, context, id: int, data: EditFlightPlanInput) -> FlightPlan:
input_data = data.to_dict()
user_id = context.user_id
async with get_session() as db:
flight_plan_model = await self._get_one(db, id=id, created_by_id=user_id)
@@ -109,19 +74,29 @@ class FlightPlanMutationResolver(BaseMutationResolver):
if data.aircraft is not None:
input_data['aircraft_id'] = await handle_aircraft_save(db, user_id, data.aircraft)
markers = []
if data.markers is not None:
await self.reset_plan_markers(db, flight_plan_model)
await self.save_markers(db, flight_plan_model, data.markers)
markers = await self.save_markers(db, flight_plan_model, data.markers)
await refresh_markers_weather_info(
planned_takeoff_datetime=flight_plan_model.planned_takeoff_datetime,
planned_speed=flight_plan_model.planned_speed,
markers=markers,
background_tasks=context.background_tasks
)
if flight_plan_model.is_default_name:
if data.markers:
markers = data.markers
else:
markers = (await db.scalars(select(models.FlightPlanMarker).filter(models.FlightPlanMarker.flight_plan_id == id))).all()
if not markers:
markers = await db.scalars(
select(models.FlightPlanMarker)
.filter(models.FlightPlanMarker.flight_plan_id == id)
).all()
used_markers = evenly_spaced_elements(markers, 5)
input_data['name'] = " - ".join(m.name for m in used_markers)
# TODO: pokud se zmenila rychlost nebo datum/cas letu, je potreba stahnout nove pocasi!
if data.copilots is not None:
await self.save_copilots(
db,
@@ -134,8 +109,49 @@ class FlightPlanMutationResolver(BaseMutationResolver):
return flight_plan
def evenly_spaced_elements(lst: list, count: int) -> list:
if count > len(lst):
return lst
interval = (len(lst) - 1) / (count - 1) if count > 1 else 0
return [lst[int(round(i * interval))] for i in range(count)]
@staticmethod
async def save_markers(db, flight_plan: models.FlightPlan, markers: list):
position = 0
marker_objects = []
for marker in markers:
if marker.type == 'poi':
assert bool(marker.point_of_interest_id)
if marker.type == 'airport':
assert bool(marker.airport_id)
marker_obj = await models.FlightPlanMarker.create(db, data={
"position": position,
"flight_plan_id": flight_plan.id,
"airport_id": marker.airport_id,
"point_of_interest_id": marker.point_of_interest_id,
"type": marker.type,
"name": marker.name,
"gps_latitude": marker.gps_latitude,
"gps_longitude": marker.gps_longitude
})
marker_objects.append(marker_obj)
position += 1
return marker_objects
@staticmethod
async def reset_plan_markers(db, flight_plan: models.FlightPlan):
await db.execute(
delete(models.FlightPlanMarker)
.filter(models.FlightPlanMarker.flight_plan_id == flight_plan.id)
)
async def save_copilots(self, db, flight_plan_id: int, copilots: list, user_id: int):
await db.execute(delete(flight_plan_has_copilot).filter_by(flight_plan_id=flight_plan_id))
copilots = await asyncio.gather(*[
handle_combobox_save(db, models.Copilot, copilot, user_id) for copilot in copilots
])
for copilot_id in copilots:
await db.execute(insert(flight_plan_has_copilot).values(
flight_plan_id=flight_plan_id,
copilot_id=copilot_id,
token=random_str(64)
))
src/graphql_schema/entities/types/types.py
+6 -4
View File
@@ -17,7 +17,7 @@ from graphql_schema.dataloaders.multi_models import (
)
from graphql_schema.dataloaders.single_model import (
poi_dataloader, poi_type_dataloader, event_dataloader, aircraft_dataloader, airport_dataloader,
airport_weather_info_loader, organizations_dataloader, flight_dataloader, photo_adjustment_dataloader,
weather_info_loader, organizations_dataloader, flight_dataloader, photo_adjustment_dataloader,
photo_dataloader, user_dataloader, track_dataloader
)
from graphql_schema.permissions import IsAuthenticated
@@ -162,10 +162,10 @@ class Flight:
title_photo: Optional[Photo] = strawberry.field(resolver=lambda root: photo_dataloader.load(root.title_photo_id))
turn_points: List[FlightTurnPoint] = strawberry.field(resolver=lambda root: flight_turn_points_dataloader.load(root.id))
takeoff_weather_info: Optional[WeatherInfo] = strawberry.field(
resolver=lambda root: airport_weather_info_loader.load(root.takeoff_weather_info_id)
resolver=lambda root: weather_info_loader.load(root.takeoff_weather_info_id)
)
landing_weather_info: Optional[WeatherInfo] = strawberry.field(
resolver=lambda root: airport_weather_info_loader.load(root.landing_weather_info_id)
resolver=lambda root: weather_info_loader.load(root.landing_weather_info_id)
)
photos: List[Photo] = strawberry.field(resolver=lambda root: photos_dataloader.load(root.id))
track: Optional[Track] = strawberry.field(resolver=lambda root: track_dataloader.load(root.track_id))
@@ -181,7 +181,9 @@ class Flight:
@strawberry_sqlalchemy_type(model=models.FlightPlanMarker)
class FlightPlanMarker:
pass
weather_info: Optional[WeatherInfo] = strawberry.field(
resolver=lambda root: weather_info_loader.load(root.weather_info_id)
)
@strawberry.type