test + fix

Author: peterdudfield

nowcasting_datamodel/read/read.py

@@ -151,19 +151,6 @@ def get_latest_forecast(
         query = query.filter(LocationSQL.gsp_id == gsp_id)
         order_by_items.append(LocationSQL.gsp_id)
 
-    # get the correct forecast value table
-    if historic:
-        data_model_forecast_value = ForecastValueLatestSQL
-    else:
-        data_model_forecast_value = ForecastValueSQL
-
-    # join forecast values
-    query = query.join(data_model_forecast_value)
-
-    # filter by target time
-    if start_target_time is not None:
-        query = query.filter(data_model_forecast_value.target_time >= start_target_time)
-
     order_by_items.append(ForecastSQL.created_utc.desc())
 
     # this make the newest ones comes to the top
@@ -172,6 +159,23 @@ def get_latest_forecast(
     # get all results
     forecasts = query.first()
 
+    # filter on target time
+    if start_target_time is not None:
+
+        # get the correct forecast value table
+        if historic:
+            data_model_forecast_value = ForecastValueLatestSQL
+        else:
+            data_model_forecast_value = ForecastValueSQL
+
+        forecast_values = session.query(data_model_forecast_value).\
+            filter(data_model_forecast_value.target_time >= start_target_time).\
+            filter(forecasts.id == data_model_forecast_value.forecast_id). \
+            order_by(data_model_forecast_value.target_time).\
+            all()
+
+        forecasts.forecast_values_latest = forecast_values
+
     # sort list
     if forecasts is not None:
         if forecasts.forecast_values_latest is not None:

tests/read/test_read.py

@@ -109,7 +109,7 @@ def test_read_target_time(db_session):
         session=db_session,
         gsp_id=f.location.gsp_id,
         historic=True,
-        start_target_time=datetime(2022, 1, 1),
+        start_target_time=datetime(2022, 1, 1, 0, 30),
     )
     assert forecast_read is not None
     assert forecast_read.location.gsp_id == f.location.gsp_id
@@ -341,3 +341,4 @@ def test_update_latest_input_data_last_updated_freeze_no_data(db_session):
     input_data_last_updated = get_latest_input_data_last_updated(session=db_session)
     assert input_data_last_updated.pv.replace(tzinfo=None) == now.replace(tzinfo=None)
     assert input_data_last_updated.gsp.replace(tzinfo=None) == datetime(1960, 1, 1)
+    assert len(forecast_read.forecast_values_latest) == 1