preload forecast values too

Author: peterdudfield

nowcasting_datamodel/read/read.py

@@ -226,16 +226,18 @@ def get_all_gsp_ids_latest_forecast(
 
     query = query.filter(ForecastSQL.historic == historic)
 
-    if preload_children:
-        query = query.options(joinedload(ForecastSQL.location))
-        query = query.options(joinedload(ForecastSQL.model))
-        query = query.options(joinedload(ForecastSQL.input_data_last_updated))
-
     if start_target_time is not None:
         query = filter_query_on_target_time(
             query=query, start_target_time=start_target_time, historic=historic
         )
 
+    if preload_children:
+        query = query.options(joinedload(ForecastSQL.location))
+        query = query.options(joinedload(ForecastSQL.model))
+        query = query.options(joinedload(ForecastSQL.input_data_last_updated))
+        query = query.options(joinedload(ForecastSQL.forecast_values))
+        query = query.options(joinedload(ForecastSQL.forecast_values_latest))
+
     query = query.order_by(LocationSQL.gsp_id, desc(ForecastSQL.created_utc))
 
     forecasts = query.populate_existing().all()