From dc146e393cc8e6fe9b678792a3f7bef9eb5f8a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Diego=20Rodr=C3=ADguez=20Royo?=
 <jdrr1998@hotmail.com>
Date: Sat, 22 Mar 2025 12:42:54 +0100
Subject: [PATCH] Add coordinator context override to Home Connect entity
 constructor (#141104)

* Improve Home Connect entity constructor to allow coordinator context override

* Simplify context usage at entity constructor
---
 homeassistant/components/home_connect/button.py | 12 +++---------
 homeassistant/components/home_connect/entity.py |  6 +++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/home_connect/button.py b/homeassistant/components/home_connect/button.py
index 726ca8cf670..0bd31c6b7c9 100644
--- a/homeassistant/components/home_connect/button.py
+++ b/homeassistant/components/home_connect/button.py
@@ -1,6 +1,6 @@
 """Provides button entities for Home Connect."""
 
-from aiohomeconnect.model import CommandKey, EventKey
+from aiohomeconnect.model import CommandKey
 from aiohomeconnect.model.error import HomeConnectError
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
@@ -94,15 +94,9 @@ class HomeConnectButtonEntity(HomeConnectEntity, ButtonEntity):
         super().__init__(
             coordinator,
             appliance,
-            # The entity is subscribed to the appliance connected event,
-            # but it will receive also the disconnected event
-            ButtonEntityDescription(
-                key=EventKey.BSH_COMMON_APPLIANCE_CONNECTED,
-            ),
+            desc,
+            (appliance.info.ha_id,),
         )
-        self.entity_description = desc
-        self.appliance = appliance
-        self._attr_unique_id = f"{appliance.info.ha_id}-{desc.key}"
 
     def update_native_value(self) -> None:
         """Set the value of the entity."""
diff --git a/homeassistant/components/home_connect/entity.py b/homeassistant/components/home_connect/entity.py
index 8a0f9bd7640..facb3b14a9b 100644
--- a/homeassistant/components/home_connect/entity.py
+++ b/homeassistant/components/home_connect/entity.py
@@ -40,9 +40,13 @@ class HomeConnectEntity(CoordinatorEntity[HomeConnectCoordinator]):
         coordinator: HomeConnectCoordinator,
         appliance: HomeConnectApplianceData,
         desc: EntityDescription,
+        context_override: Any | None = None,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(coordinator, (appliance.info.ha_id, EventKey(desc.key)))
+        context = (appliance.info.ha_id, EventKey(desc.key))
+        if context_override is not None:
+            context = context_override
+        super().__init__(coordinator, context)
         self.appliance = appliance
         self.entity_description = desc
         self._attr_unique_id = f"{appliance.info.ha_id}-{desc.key}"