Ukladani letu, query na seznam letist
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
from typing import List
|
||||
from sqlalchemy import select
|
||||
from strawberry.dataloader import DataLoader
|
||||
from database import async_session
|
||||
from database.models import Airport
|
||||
|
||||
|
||||
async def load(ids: List[int]):
|
||||
async with async_session() as session:
|
||||
models = (await session.scalars(select(Airport).filter(Airport.id.in_(ids)))).all()
|
||||
|
||||
models_by_id = {model.id: model for model in models}
|
||||
return [models_by_id.get(id_) for id_ in ids]
|
||||
|
||||
|
||||
airport_dataloader = DataLoader(load_fn=load)
|
||||
@@ -1,4 +1,3 @@
|
||||
import os
|
||||
import uuid
|
||||
from typing import List, Optional
|
||||
import strawberry
|
||||
@@ -6,6 +5,9 @@ from strawberry.file_uploads import Upload
|
||||
from sqlalchemy import select
|
||||
from database import models
|
||||
from graphql_schema.sqlalchemy_to_strawberry_type import strawberry_sqlalchemy_type, strawberry_sqlalchemy_input
|
||||
from upload_utils import handle_img_upload, delete_file
|
||||
|
||||
AIRCRAFT_UPLOAD_DEST_PATH = "/app/uploads/aircrafts/"
|
||||
|
||||
|
||||
@strawberry_sqlalchemy_type(models.Aircraft)
|
||||
@@ -44,20 +46,6 @@ class AircraftQueries:
|
||||
return (await info.context.db.scalars(query)).one()
|
||||
|
||||
|
||||
def check_directories(path: str):
|
||||
if not os.path.isdir(path):
|
||||
os.makedirs(path)
|
||||
|
||||
|
||||
async def handle_img_upload(file: Upload, path: str, filename: str):
|
||||
check_directories(path)
|
||||
|
||||
content = await file.read()
|
||||
image = open(path + "/" + filename, "wb")
|
||||
image.write(content)
|
||||
image.close()
|
||||
|
||||
|
||||
@strawberry.type
|
||||
class CreateAircraftMutation:
|
||||
@strawberry_sqlalchemy_input(models.Aircraft, exclude_fields=['id', 'photo_filename'])
|
||||
@@ -68,21 +56,14 @@ class CreateAircraftMutation:
|
||||
async def create_aircraft(root, info, input: CreateAircraftInput) -> Aircraft:
|
||||
# TODO: kontrola organizace
|
||||
|
||||
filename = None
|
||||
input_data = input.to_dict()
|
||||
if input.photo:
|
||||
dest_path = "/app/uploads/aircrafts/"
|
||||
filename = f"{uuid.uuid4()}-{input.photo.filename}"
|
||||
await handle_img_upload(input.photo, dest_path, filename=filename)
|
||||
input_data['photo_filename'] = await handle_img_upload(input.photo, AIRCRAFT_UPLOAD_DEST_PATH)
|
||||
|
||||
return await models.Aircraft.create(
|
||||
info.context.db,
|
||||
data=dict(
|
||||
name=input.name,
|
||||
description=input.description,
|
||||
model=input.model,
|
||||
manufacturer=input.manufacturer,
|
||||
photo_filename=filename,
|
||||
organization_id=input.organization_id,
|
||||
**input_data,
|
||||
created_by_id=info.context.user_id,
|
||||
)
|
||||
)
|
||||
@@ -98,17 +79,16 @@ class EditAircraftMutation:
|
||||
async def edit_aircraft(root, info, id: int, input: EditAircraftInput) -> Aircraft:
|
||||
# TODO: kontrola organizace
|
||||
# TODO: kontrola opravneni na akci
|
||||
return await models.Aircraft.update(
|
||||
info.context.db,
|
||||
id,
|
||||
data=dict(
|
||||
name=input.name,
|
||||
description=input.description,
|
||||
model=input.model,
|
||||
manufacturer=input.manufacturer,
|
||||
organization_id=input.organization_id,
|
||||
)
|
||||
)
|
||||
|
||||
update_data = input.to_dict()
|
||||
aircraft = await models.Aircraft.get_one(info.context.db, id)
|
||||
|
||||
if input.photo:
|
||||
if aircraft.photo_filename:
|
||||
delete_file(AIRCRAFT_UPLOAD_DEST_PATH + "/" + aircraft.photo_filename, silent=True)
|
||||
update_data['photo_filename'] = await handle_img_upload(input.photo, AIRCRAFT_UPLOAD_DEST_PATH)
|
||||
|
||||
return await models.Aircraft.update(info.context.db, obj=aircraft, data=update_data)
|
||||
|
||||
|
||||
@strawberry.type
|
||||
@@ -118,4 +98,4 @@ class DeleteAircraftMutation:
|
||||
async def delete_aircraft(self, info, id: int) -> Aircraft:
|
||||
# TODO: kontrola opravneni na akci
|
||||
|
||||
return await models.Aircraft.update(info.context.db, id, data=dict(deleted=True))
|
||||
return await models.Aircraft.update(info.context.db, id=id, data=dict(deleted=True))
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
from typing import List
|
||||
import strawberry
|
||||
from sqlalchemy import select
|
||||
from database import models
|
||||
from graphql_schema.sqlalchemy_to_strawberry_type import strawberry_sqlalchemy_type
|
||||
|
||||
|
||||
@strawberry_sqlalchemy_type(models.Airport)
|
||||
class Airport:
|
||||
pass
|
||||
|
||||
|
||||
def get_base_query(user_id: int):
|
||||
return (
|
||||
select(models.Airport)
|
||||
.filter(models.Airport.deleted.is_(False))
|
||||
)
|
||||
|
||||
|
||||
@strawberry.type
|
||||
class AirportQueries:
|
||||
|
||||
@strawberry.field
|
||||
async def airports(root, info) -> List[Airport]:
|
||||
query = (
|
||||
get_base_query(info.context.user_id)
|
||||
.order_by(models.Airport.id.desc())
|
||||
)
|
||||
|
||||
return (await info.context.db.scalars(query)).all()
|
||||
|
||||
@strawberry.field
|
||||
async def airport(root, info, id: int) -> Airport:
|
||||
query = (
|
||||
get_base_query(info.context.user_id)
|
||||
.filter(models.Airport.id == id)
|
||||
)
|
||||
return (await info.context.db.scalars(query)).one()
|
||||
@@ -1,10 +1,14 @@
|
||||
from typing import List, Optional
|
||||
import strawberry
|
||||
from sqlalchemy import select
|
||||
from strawberry.file_uploads import Upload
|
||||
|
||||
from database import models
|
||||
from graphql_schema.dataloaders import copilots_dataloader
|
||||
from graphql_schema.dataloaders.aircraft import aircraft_dataloader
|
||||
from graphql_schema.dataloaders.airport import airport_dataloader
|
||||
from graphql_schema.entities.aircraft import Aircraft
|
||||
from graphql_schema.entities.airport import Airport
|
||||
from graphql_schema.entities.copilot import CopilotType
|
||||
from graphql_schema.sqlalchemy_to_strawberry_type import strawberry_sqlalchemy_type, strawberry_sqlalchemy_input
|
||||
|
||||
@@ -13,6 +17,11 @@ from graphql_schema.sqlalchemy_to_strawberry_type import strawberry_sqlalchemy_t
|
||||
|
||||
@strawberry_sqlalchemy_type(models.Flight)
|
||||
class Flight:
|
||||
async def load_takeoff_airport(root):
|
||||
return await airport_dataloader.load(root.takeoff_airport_id)
|
||||
|
||||
async def load_landing_airport(root):
|
||||
return await airport_dataloader.load(root.landing_airport_id)
|
||||
|
||||
async def load_aircraft(root):
|
||||
return await aircraft_dataloader.load(root.aircraft_id)
|
||||
@@ -22,6 +31,17 @@ class Flight:
|
||||
|
||||
copilot: Optional[CopilotType] = strawberry.field(resolver=load_copilot)
|
||||
aircraft: Aircraft = strawberry.field(resolver=load_aircraft)
|
||||
takeoff_airport: Airport = strawberry.field(resolver=load_takeoff_airport)
|
||||
landing_airport: Airport = strawberry.field(resolver=load_landing_airport)
|
||||
# take_off_airport = Airport
|
||||
|
||||
|
||||
def get_base_query(user_id: int):
|
||||
return (
|
||||
select(models.Flight)
|
||||
.filter(models.Flight.created_by_id == user_id)
|
||||
.order_by(models.Flight.id.desc())
|
||||
)
|
||||
|
||||
|
||||
@strawberry.type
|
||||
@@ -32,36 +52,31 @@ class FlightQueries:
|
||||
|
||||
@strawberry.field
|
||||
async def flights(root, info, filters: Optional[FlightFilters] = None) -> List[Flight]:
|
||||
query = (
|
||||
select(models.Flight)
|
||||
.filter(models.Flight.created_by_id == info.context.user_id)
|
||||
.order_by(models.Flight.id) # TODO: desc
|
||||
)
|
||||
query = get_base_query(info.context.user_id).order_by(models.Flight.id.desc())
|
||||
|
||||
return (await info.context.db.scalars(query)).all()
|
||||
|
||||
@strawberry.field
|
||||
async def flight(root, info, id: int) -> Flight:
|
||||
query = (
|
||||
select(models.Flight)
|
||||
get_base_query(info.context.user_id)
|
||||
.filter(models.Flight.id == id)
|
||||
.filter(models.Flight.created_by_id == info.context.user_id)
|
||||
)
|
||||
return (await info.context.db.scalars(query)).fetch_one()
|
||||
|
||||
|
||||
@strawberry.type
|
||||
class CreateFlightMutation:
|
||||
@strawberry_sqlalchemy_input(models.Flight, all_optional=True)
|
||||
class FlightInput:
|
||||
@strawberry_sqlalchemy_input(models.Flight, exclude_fields=["id"])
|
||||
class CreateFlightInput:
|
||||
# photos: Optional[List[Upload]]
|
||||
pass
|
||||
|
||||
@strawberry.mutation
|
||||
async def create_flight(self, info, input_: FlightInput) -> Flight:
|
||||
model = models.Flight(name=input_.name)
|
||||
async def create_flight(self, info, input: CreateFlightInput) -> Flight:
|
||||
input_data = input.to_dict()
|
||||
|
||||
db = info.context.db
|
||||
db.add(model)
|
||||
await db.commit()
|
||||
|
||||
return Flight(model)
|
||||
return await models.Flight.create(info.context.db, data={
|
||||
**input_data,
|
||||
"created_by_id": info.context.user_id
|
||||
})
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from strawberry.tools import merge_types
|
||||
from .entities.aircraft import AircraftQueries
|
||||
from .entities.airport import AirportQueries
|
||||
from .entities.copilot import CopilotQueries
|
||||
from .entities.flight import FlightQueries
|
||||
from .entities.user import UserQueries
|
||||
@@ -9,6 +10,7 @@ from .entities.user import UserQueries
|
||||
|
||||
Query = merge_types('Query', (
|
||||
AircraftQueries,
|
||||
AirportQueries,
|
||||
FlightQueries,
|
||||
CopilotQueries,
|
||||
UserQueries
|
||||
|
||||
@@ -1,20 +1,26 @@
|
||||
import typing
|
||||
from typing import List, Optional
|
||||
import strawberry
|
||||
from sqlalchemy import inspect
|
||||
import sqlalchemy
|
||||
from sqlalchemy import Column
|
||||
from database.models import BaseModel
|
||||
|
||||
|
||||
def get_columns_from_model(model: BaseModel, exclude_fields: List[str]) -> List[typing.Tuple[str, Column]]:
|
||||
return [(name, column) for name, column in sqlalchemy.inspect(model).columns.items() if name not in exclude_fields]
|
||||
|
||||
|
||||
def get_annotations_for_scalars(model: BaseModel, exclude_fields=None, force_optional: bool = False):
|
||||
if exclude_fields is None:
|
||||
exclude_fields = []
|
||||
|
||||
annotations_ = {}
|
||||
for name, column in inspect(model).columns.items():
|
||||
for name, column in get_columns_from_model(model, exclude_fields):
|
||||
is_optional = column.nullable or force_optional
|
||||
if name in exclude_fields:
|
||||
continue
|
||||
annotations_[name] = column.type.python_type if not is_optional else typing.Optional[column.type.python_type]
|
||||
try:
|
||||
annotations_[name] = column.type.python_type if not is_optional else typing.Optional[column.type.python_type]
|
||||
except NotImplementedError as e:
|
||||
print(f"Neimplementovano: {e}, {name=}")
|
||||
|
||||
return annotations_
|
||||
|
||||
@@ -41,14 +47,18 @@ def strawberry_sqlalchemy_input(
|
||||
if exclude_fields is None:
|
||||
exclude_fields = []
|
||||
|
||||
ignored_fields = ["created_at", "created_by_id", "updated_by_id", "updated_at", "deleted"]
|
||||
ignored_fields = exclude_fields + ["created_at", "created_by_id", "updated_by_id", "updated_at", "deleted"]
|
||||
|
||||
def to_dict(self):
|
||||
return {name: getattr(self, name) for name, _ in get_columns_from_model(model, ignored_fields)}
|
||||
|
||||
def wrapper(cls):
|
||||
cls.__annotations__.update(get_annotations_for_scalars(
|
||||
model,
|
||||
exclude_fields=exclude_fields + ignored_fields,
|
||||
exclude_fields=ignored_fields,
|
||||
force_optional=all_optional
|
||||
))
|
||||
cls.to_dict = to_dict
|
||||
return strawberry.input(cls)
|
||||
|
||||
return wrapper
|
||||
|
||||
Reference in New Issue
Block a user