From 19d89c89528d5aabcbed7e83370a75dbd313e3b6 Mon Sep 17 00:00:00 2001
From: Brett Adams <Bre77@users.noreply.github.com>
Date: Sat, 28 Jun 2025 03:43:03 +1000
Subject: [PATCH] Fix energy history in Teslemetry (#147646)

---
 .../components/teslemetry/coordinator.py      | 12 ++++----
 tests/components/teslemetry/const.py          |  1 +
 .../fixtures/energy_history_empty.json        |  8 +++++
 tests/components/teslemetry/test_sensor.py    | 30 +++++++++++++++++--
 4 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 tests/components/teslemetry/fixtures/energy_history_empty.json

diff --git a/homeassistant/components/teslemetry/coordinator.py b/homeassistant/components/teslemetry/coordinator.py
index c31bdc2a34e..e6b453402e9 100644
--- a/homeassistant/components/teslemetry/coordinator.py
+++ b/homeassistant/components/teslemetry/coordinator.py
@@ -194,14 +194,14 @@ class TeslemetryEnergyHistoryCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         except TeslaFleetError as e:
             raise UpdateFailed(e.message) from e
 
+        if not data or not isinstance(data.get("time_series"), list):
+            raise UpdateFailed("Received invalid data")
+
         # Add all time periods together
-        output = dict.fromkeys(ENERGY_HISTORY_FIELDS, None)
-        for period in data.get("time_series", []):
+        output = dict.fromkeys(ENERGY_HISTORY_FIELDS, 0)
+        for period in data["time_series"]:
             for key in ENERGY_HISTORY_FIELDS:
                 if key in period:
-                    if output[key] is None:
-                        output[key] = period[key]
-                    else:
-                        output[key] += period[key]
+                    output[key] += period[key]
 
         return output
diff --git a/tests/components/teslemetry/const.py b/tests/components/teslemetry/const.py
index b658c1e2271..3bfa452e38d 100644
--- a/tests/components/teslemetry/const.py
+++ b/tests/components/teslemetry/const.py
@@ -20,6 +20,7 @@ VEHICLE_DATA_ALT = load_json_object_fixture("vehicle_data_alt.json", DOMAIN)
 LIVE_STATUS = load_json_object_fixture("live_status.json", DOMAIN)
 SITE_INFO = load_json_object_fixture("site_info.json", DOMAIN)
 ENERGY_HISTORY = load_json_object_fixture("energy_history.json", DOMAIN)
+ENERGY_HISTORY_EMPTY = load_json_object_fixture("energy_history_empty.json", DOMAIN)
 
 COMMAND_OK = {"response": {"result": True, "reason": ""}}
 COMMAND_REASON = {"response": {"result": False, "reason": "already closed"}}
diff --git a/tests/components/teslemetry/fixtures/energy_history_empty.json b/tests/components/teslemetry/fixtures/energy_history_empty.json
new file mode 100644
index 00000000000..cc54000115a
--- /dev/null
+++ b/tests/components/teslemetry/fixtures/energy_history_empty.json
@@ -0,0 +1,8 @@
+{
+  "response": {
+    "serial_number": "xxxxxx",
+    "period": "day",
+    "installation_time_zone": "Australia/Brisbane",
+    "time_series": null
+  }
+}
diff --git a/tests/components/teslemetry/test_sensor.py b/tests/components/teslemetry/test_sensor.py
index f50dc93bde4..d2d6d88b3e3 100644
--- a/tests/components/teslemetry/test_sensor.py
+++ b/tests/components/teslemetry/test_sensor.py
@@ -8,12 +8,13 @@ from syrupy.assertion import SnapshotAssertion
 from teslemetry_stream import Signal
 
 from homeassistant.components.teslemetry.coordinator import VEHICLE_INTERVAL
-from homeassistant.const import Platform
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
 from . import assert_entities, assert_entities_alt, setup_platform
-from .const import VEHICLE_DATA_ALT
+from .const import ENERGY_HISTORY_EMPTY, VEHICLE_DATA_ALT
 
 from tests.common import async_fire_time_changed
 
@@ -101,3 +102,28 @@ async def test_sensors_streaming(
     ):
         state = hass.states.get(entity_id)
         assert state.state == snapshot(name=f"{entity_id}-state")
+
+
+async def test_energy_history_no_time_series(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_energy_history: AsyncMock,
+) -> None:
+    """Test energy history coordinator when time_series is not a list."""
+    # Mock energy history to return data without time_series as a list
+
+    entry = await setup_platform(hass, [Platform.SENSOR])
+    assert entry.state is ConfigEntryState.LOADED
+
+    entity_id = "sensor.energy_site_battery_discharged"
+    state = hass.states.get(entity_id)
+    assert state.state == "0.036"
+
+    mock_energy_history.return_value = ENERGY_HISTORY_EMPTY
+
+    freezer.tick(VEHICLE_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+    assert state.state == STATE_UNAVAILABLE