fix: Fixed issue where event entities were not being restored properly

custom_components/octopus_energy/api_client/__init__.py

@@ -290,7 +290,7 @@
 def get_valid_from(rate):
   return rate["valid_from"]
 
-def get_from(rate):
+def get_start(rate):
   return rate["start"]
 
 def rates_to_thirty_minute_increments(data, period_from: datetime, period_to: datetime, tariff_code: str, price_cap: float = None):
@@ -626,7 +626,7 @@ async def async_get_electricity_standard_rates(self, product_code, tariff_code,
             if has_more_rates:
               page = page + 1
 
-    results.sort(key=get_from)
+    results.sort(key=get_start)
     return results
 
   async def async_get_electricity_day_night_rates(self, product_code, tariff_code, is_smart_meter, period_from, period_to):
@@ -659,7 +659,7 @@ async def async_get_electricity_day_night_rates(self, product_code, tariff_code,
             results.append(rate)
 
     # Because we retrieve our day and night periods separately over a 2 day period, we need to sort our rates 
-    results.sort(key=get_from)
+    results.sort(key=get_start)
 
     return results
 

custom_components/octopus_energy/const.py

@@ -72,8 +72,6 @@
 
 STORAGE_COMPLETED_DISPATCHES_NAME = "octopus_energy.{}-completed-intelligent-dispatches.json"
 
-STORAGE_COMPLETED_DISPATCHES_NAME = "octopus_energy.{}-completed-intelligent-dispatches.json"
-
 REGEX_HOURS = "^[0-9]+(\\.[0-9]+)*$"
 REGEX_TIME = "^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$"
 REGEX_ENTITY_NAME = "^[a-z0-9_]+$"

custom_components/octopus_energy/electricity/rates_current_day.py

@@ -49,8 +49,6 @@ async def async_added_to_hass(self):
 
       _LOGGER.debug(f'Restored OctopusEnergyElectricityCurrentDayRates state: {self._state}')
 
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/electricity/rates_next_day.py

@@ -48,9 +48,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyElectricityNextDayRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/electricity/rates_previous_consumption.py

@@ -56,9 +56,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyElectricityPreviousConsumptionRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/electricity/rates_previous_consumption_override.py

@@ -56,9 +56,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyElectricityPreviousConsumptionOverrideRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/electricity/rates_previous_day.py

@@ -48,9 +48,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyElectricityPreviousDayRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/gas/rates_current_day.py

@@ -48,9 +48,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyGasCurrentDayRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/gas/rates_previous_consumption.py

@@ -56,9 +56,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyGasPreviousConsumptionRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/gas/rates_previous_consumption_override.py

@@ -56,9 +56,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyGasPreviousConsumptionOverrideRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/gas/rates_previous_day.py

@@ -48,9 +48,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyGasPreviousDayRates state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback

custom_components/octopus_energy/octoplus/saving_sessions_events.py

@@ -49,9 +49,7 @@ async def async_added_to_hass(self):
       self._attributes = dict_to_typed_dict(state.attributes)
 
       _LOGGER.debug(f'Restored OctopusEnergyOctoplusSavingSessionEvents state: {self._state}')
-
-  async def async_added_to_hass(self) -> None:
-    """Register callbacks."""
+
     self._hass.bus.async_listen(self._attr_event_types[0], self._async_handle_event)
 
   @callback