Fix Nord Pool sensor resolution for next/previous price (home-assistant#155119)

Author: gjohansson-ST

homeassistant/components/nordpool/sensor.py

@@ -4,7 +4,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from homeassistant.components.sensor import (
     EntityCategory,
@@ -54,10 +54,11 @@ def get_prices(
     current_price_entries: dict[str, float] = {}
     next_price_entries: dict[str, float] = {}
     current_time = dt_util.utcnow()
-    previous_time = current_time - timedelta(hours=1)
-    next_time = current_time + timedelta(hours=1)
     LOGGER.debug("Price data: %s", data)
     for entry in data:
+        resolution = entry.end - entry.start
+        previous_time = current_time - resolution
+        next_time = current_time + resolution
         if entry.start <= current_time <= entry.end:
             current_price_entries = entry.entry
         if entry.start <= previous_time <= entry.end:

tests/components/nordpool/snapshots/test_sensor.ambr

@@ -414,7 +414,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1.21814',
+    'state': '1.42403',
   })
 # ---
 # name: test_sensor[sensor.nord_pool_se3_off_peak_1_average-entry]
@@ -1255,7 +1255,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '3.82803',
+    'state': '2.30807',
   })
 # ---
 # name: test_sensor[sensor.nord_pool_se4_currency-entry]
@@ -1673,7 +1673,7 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '1.40502',
+    'state': '1.64617',
   })
 # ---
 # name: test_sensor[sensor.nord_pool_se4_off_peak_1_average-entry]
@@ -2514,6 +2514,6 @@
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,
-    'state': '4.44274',
+    'state': '2.67764',
   })
 # ---

tests/components/nordpool/test_sensor.py

@@ -59,8 +59,8 @@ async def test_sensor_no_next_price(hass: HomeAssistant, load_int: ConfigEntry)
     assert last_price is not None
     assert next_price is not None
     assert current_price.state == "0.78568"  # SE3 2025-10-01T21:45:00Z
-    assert last_price.state == "0.82171"  # SE3 2025-10-01T21:30:00Z
-    assert next_price.state == "0.81174"  # SE3 2025-10-01T22:00:00Z
+    assert last_price.state == "0.82005"  # SE3 2025-10-01T21:30:00Z
+    assert next_price.state == "0.93322"  # SE3 2025-10-01T22:00:00Z
 
 
 @pytest.mark.freeze_time("2025-10-02T00:00:00+02:00")
@@ -78,8 +78,8 @@ async def test_sensor_no_previous_price(
     assert last_price is not None
     assert next_price is not None
     assert current_price.state == "0.93322"  # SE3 2025-10-01T22:00:00Z
-    assert last_price.state == "0.8605"  # SE3 2025-10-01T21:45:00Z
-    assert next_price.state == "0.83513"  # SE3 2025-10-01T22:15:00Z
+    assert last_price.state == "0.78568"  # SE3 2025-10-01T21:45:00Z
+    assert next_price.state == "0.85422"  # SE3 2025-10-01T22:15:00Z
 
 
 @pytest.mark.freeze_time("2025-10-01T11:00:01+01:00")
@@ -102,8 +102,8 @@ async def test_sensor_empty_response(
     assert last_price is not None
     assert next_price is not None
     assert current_price.state == "0.67405"
-    assert last_price.state == "0.8616"
-    assert next_price.state == "0.63736"
+    assert last_price.state == "0.60774"
+    assert next_price.state == "0.63858"
 
     aioclient_mock.clear_requests()
     aioclient_mock.request(
@@ -154,8 +154,8 @@ async def test_sensor_empty_response(
     assert last_price is not None
     assert next_price is not None
     assert current_price.state == "0.63736"
-    assert last_price.state == "0.67405"
-    assert next_price.state == "0.62233"
+    assert last_price.state == "0.63482"
+    assert next_price.state == "0.66068"
 
     aioclient_mock.clear_requests()
     aioclient_mock.request(
@@ -207,5 +207,5 @@ async def test_sensor_empty_response(
     assert last_price is not None
     assert next_price is not None
     assert current_price.state == "0.78568"
-    assert last_price.state == "0.82171"
+    assert last_price.state == "0.82005"
     assert next_price.state == STATE_UNKNOWN