Stahovani pocasi, drobne upravy

src/background_jobs/weather.py

@@ -6,19 +6,14 @@ from external.weather import weather_api
 from logger import log
 
 
-async def download_weather(date_time: datetime, flight_id: int, airport_id: int, type_: Literal['landing', 'takeoff']):
-    async with get_session() as db:
-        airport = await models.Airport.get_one(db, id=airport_id)
-        gps = (airport.gps_latitude, airport.gps_longitude)
-
+async def get_weather(date_time: datetime, gps: tuple[float, float]):
     try:
         weather = await weather_api.get_weather_for_hour(date_time.astimezone(), gps=gps)
-        log.warning(weather)
     except Exception as e:
         log.error(f"Error in downloading weather: {e}")
         return None
 
-    data = {
+    return {
         "datetime": weather['datetime'],
         "qnh": weather['pressure_msl'],
         "temperature_surface": weather['temperature_2m'],
@@ -30,6 +25,14 @@ async def download_weather(date_time: datetime, flight_id: int, airport_id: int,
         "wind_direction_surface": weather['winddirection_10m'],
     }
 
+
+async def download_weather_for_flight(date_time: datetime, flight_id: int, airport_id: int, type_: Literal['landing', 'takeoff']):
+    async with get_session() as db:
+        airport = await models.Airport.get_one(db, id=airport_id)
+        gps = (airport.gps_latitude, airport.gps_longitude)
+
+    data = await get_weather(date_time, gps)
+
     async with get_session() as db:
         flight = await models.Flight.get_one(db, id=flight_id)
         existing_weather_id = getattr(flight, f'{type_}_weather_info_id')
@@ -39,3 +42,20 @@ async def download_weather(date_time: datetime, flight_id: int, airport_id: int,
         else:
             weather_model = await models.WeatherInfo.create(db, data=data)
             await models.Flight.update(db, obj=flight, data={f"{type_}_weather_info_id": weather_model.id})
+
+
+async def download_weather_for_plan(date_time: datetime, flight_plan_id: int, gps: tuple[float, float]):
+    data = await get_weather(date_time, gps)
+
+    async with get_session() as db:
+        plan = await models.FlightPlan.get_one(db, id=flight_plan_id)
+
+        if plan.weather_info_id:
+            await models.WeatherInfo.update(db, id=plan.weather_info.id, data=data)
+        else:
+            weather_model = await models.WeatherInfo.create(db, data=data)
+            await models.FlightPlan.update(
+                db,
+                obj=plan,
+                data={"weather_info_id": weather_model.id}
+            )