From 21dd6fa53d7b40214681b5fbd59a7f088bb68b28 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sat, 8 Feb 2025 15:43:03 +0100 Subject: [PATCH] Explicitly pass in the config_entry in flick_electric coordinator (#137816) * explicitly pass in the config_entry in coordinator * Apply suggestions from code review Co-authored-by: Jan Bouwhuis --------- Co-authored-by: Jan Bouwhuis --- homeassistant/components/flick_electric/__init__.py | 9 ++++----- .../components/flick_electric/coordinator.py | 12 ++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/flick_electric/__init__.py b/homeassistant/components/flick_electric/__init__.py index 3ffddee1c7d..ad772c06b2e 100644 --- a/homeassistant/components/flick_electric/__init__.py +++ b/homeassistant/components/flick_electric/__init__.py @@ -9,7 +9,6 @@ from pyflick import FlickAPI from pyflick.authentication import SimpleFlickAuth from pyflick.const import DEFAULT_CLIENT_ID, DEFAULT_CLIENT_SECRET -from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_ACCESS_TOKEN, CONF_CLIENT_ID, @@ -35,9 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FlickConfigEntry) -> boo """Set up Flick Electric from a config entry.""" auth = HassFlickAuth(hass, entry) - coordinator = FlickElectricDataCoordinator( - hass, FlickAPI(auth), entry.data[CONF_SUPPLY_NODE_REF] - ) + coordinator = FlickElectricDataCoordinator(hass, entry, FlickAPI(auth)) await coordinator.async_config_entry_first_refresh() @@ -53,7 +50,9 @@ async def async_unload_entry(hass: HomeAssistant, entry: FlickConfigEntry) -> bo return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) -async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool: +async def async_migrate_entry( + hass: HomeAssistant, config_entry: FlickConfigEntry +) -> bool: """Migrate old entry.""" _LOGGER.debug( "Migrating configuration from version %s.%s", diff --git a/homeassistant/components/flick_electric/coordinator.py b/homeassistant/components/flick_electric/coordinator.py index 474efc5297d..114b364635f 100644 --- a/homeassistant/components/flick_electric/coordinator.py +++ b/homeassistant/components/flick_electric/coordinator.py @@ -13,6 +13,8 @@ from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed +from .const import CONF_SUPPLY_NODE_REF + _LOGGER = logging.getLogger(__name__) SCAN_INTERVAL = timedelta(minutes=5) @@ -23,17 +25,23 @@ type FlickConfigEntry = ConfigEntry[FlickElectricDataCoordinator] class FlickElectricDataCoordinator(DataUpdateCoordinator[FlickPrice]): """Coordinator for flick power price.""" + config_entry: FlickConfigEntry + def __init__( - self, hass: HomeAssistant, api: FlickAPI, supply_node_ref: str + self, + hass: HomeAssistant, + config_entry: FlickConfigEntry, + api: FlickAPI, ) -> None: """Initialize FlickElectricDataCoordinator.""" super().__init__( hass, _LOGGER, + config_entry=config_entry, name="Flick Electric", update_interval=SCAN_INTERVAL, ) - self.supply_node_ref = supply_node_ref + self.supply_node_ref = config_entry.data[CONF_SUPPLY_NODE_REF] self._api = api async def _async_update_data(self) -> FlickPrice: