Slugy, webp, hromada zmen

src/graphql_schema/entities/flight.py

@@ -10,6 +10,7 @@ from graphql_schema.entities.resolvers.flight import handle_aircraft_save, Fligh
 from graphql_schema.entities.types.mutation_input import EditFlightInput, CreateFlightInput
 from graphql_schema.entities.types.types import Flight
 from .helpers.combobox import handle_combobox_save
+from .helpers.detail import get_detail_filters
 from .helpers.pagination import PaginationWindow, get_pagination_window
 
 
@@ -50,12 +51,21 @@ class FlightQueries:
     @strawberry.field()
     @error_logging
     @allow_public
-    async def flight(root, info, id: int, username: Optional[str] = None, public: Optional[bool] = False) -> Flight:
+    async def flight(
+            root, info,
+            id: Optional[int] = None,
+            url_slug: Optional[str] = None,
+            username: Optional[str] = None,
+            public: Optional[bool] = False
+    ) -> Flight:
+        filter_params = get_detail_filters(id, url_slug)
+        if username:
+            filter_params['username'] = username
+
         return await FlightQueryResolver().get_one(
-            id,
             user_id=info.context.user_id,
-            username=username,
-            public=public
+            only_public=public,
+            **filter_params
         )
 
 
@@ -65,43 +75,7 @@ class FlightMutation:
     @error_logging
     @authenticated_user_only()
     async def create_flight(self, info, input: CreateFlightInput) -> Flight:
-        data = input.to_dict()
-        user_id = info.context.user_id
-        async with get_session() as db:
-            aircraft_id = await handle_aircraft_save(db, info.context.user_id, input.aircraft)
-
-            # TODO: tohle je blbost, bude to vyrabet dve stejne instance!
-            takeoff_airport_id, landing_airport_id = await asyncio.gather(
-                handle_combobox_save(
-                    db, models.Airport, input.takeoff_airport, user_id, name_column="icao_code",
-                    extra_data={"name": input.takeoff_airport.name}
-                ),
-                handle_combobox_save(
-                    db, models.Airport, input.landing_airport, user_id, name_column="icao_code",
-                    extra_data={"name": input.landing_airport.name}
-                )
-            )
-
-        data.update({
-            "takeoff_airport_id": takeoff_airport_id,
-            "landing_airport_id": landing_airport_id,
-            "aircraft_id": aircraft_id,
-            "has_terrain_elevation": False,
-            "name": "",
-            "description": ""
-        })
-        flight = await FlightMutationResolver().create(data, info.context.user_id)
-
-        info.context.background_tasks.add_task(
-            download_weather,
-            flight_id=flight.id, airport_id=takeoff_airport_id, date_time=flight.takeoff_datetime, type_="takeoff"
-        )
-        info.context.background_tasks.add_task(
-            download_weather,
-            flight_id=flight.id, airport_id=landing_airport_id, date_time=flight.landing_datetime, type_="landing"
-        )
-
-        return flight
+        return await FlightMutationResolver().create(info.context, input)
 
     @strawberry.mutation
     @error_logging