From e798cdefa8205f98fb7f31ac36db028ef1da6e4a Mon Sep 17 00:00:00 2001 From: Dave Pearce Date: Fri, 30 Jun 2023 14:34:32 +0000 Subject: [PATCH 1/4] Add unique_id to Wirelesstag entities. --- homeassistant/components/wirelesstag/binary_sensor.py | 1 + homeassistant/components/wirelesstag/sensor.py | 1 + homeassistant/components/wirelesstag/switch.py | 1 + 3 files changed, 3 insertions(+) diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py index 82c3a25590adf2..2a187349e1cb12 100644 --- a/homeassistant/components/wirelesstag/binary_sensor.py +++ b/homeassistant/components/wirelesstag/binary_sensor.py @@ -100,6 +100,7 @@ def __init__(self, api, tag, sensor_type): super().__init__(api, tag) self._sensor_type = sensor_type self._name = f"{self._tag.name} {self.event.human_readable_name}" + self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{self._sensor_type}" async def async_added_to_hass(self) -> None: """Register callbacks.""" diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py index e4505e59666a06..a4fbc2ef683ee9 100644 --- a/homeassistant/components/wirelesstag/sensor.py +++ b/homeassistant/components/wirelesstag/sensor.py @@ -100,6 +100,7 @@ def __init__(self, api, tag, description): self._sensor_type = description.key self.entity_description = description self._name = self._tag.name + self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{self._sensor_type}" # I want to see entity_id as: # sensor.wirelesstag_bedroom_temperature diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py index 26c7d9384a6b6a..aa53272cec9813 100644 --- a/homeassistant/components/wirelesstag/switch.py +++ b/homeassistant/components/wirelesstag/switch.py @@ -82,6 +82,7 @@ def __init__(self, api, tag, description: SwitchEntityDescription) -> None: super().__init__(api, tag) self.entity_description = description self._name = f"{self._tag.name} {description.name}" + self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{description.key}" def turn_on(self, **kwargs: Any) -> None: """Turn on the switch.""" From e26942f643097d630f1484e7a7dd58e90004a238 Mon Sep 17 00:00:00 2001 From: Dave Pearce Date: Fri, 30 Jun 2023 14:51:49 -0400 Subject: [PATCH 2/4] Update homeassistant/components/wirelesstag/binary_sensor.py Co-authored-by: Paulus Schoutsen --- homeassistant/components/wirelesstag/binary_sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py index 2a187349e1cb12..711c2987735b9d 100644 --- a/homeassistant/components/wirelesstag/binary_sensor.py +++ b/homeassistant/components/wirelesstag/binary_sensor.py @@ -100,7 +100,7 @@ def __init__(self, api, tag, sensor_type): super().__init__(api, tag) self._sensor_type = sensor_type self._name = f"{self._tag.name} {self.event.human_readable_name}" - self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{self._sensor_type}" + self._attr_unique_id = f"{self.tag_id}_{self._sensor_type}" async def async_added_to_hass(self) -> None: """Register callbacks.""" From 20ef798d255591a538db16858fa07727921dc1f8 Mon Sep 17 00:00:00 2001 From: Dave Pearce Date: Fri, 30 Jun 2023 14:52:06 -0400 Subject: [PATCH 3/4] Update homeassistant/components/wirelesstag/sensor.py Co-authored-by: Paulus Schoutsen --- homeassistant/components/wirelesstag/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py index a4fbc2ef683ee9..fd9a7898f920f8 100644 --- a/homeassistant/components/wirelesstag/sensor.py +++ b/homeassistant/components/wirelesstag/sensor.py @@ -100,7 +100,7 @@ def __init__(self, api, tag, description): self._sensor_type = description.key self.entity_description = description self._name = self._tag.name - self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{self._sensor_type}" + self._attr_unique_id = f"{self.tag_id}_{self._sensor_type}" # I want to see entity_id as: # sensor.wirelesstag_bedroom_temperature From 96d6de486ef0c34e865178ad7b977354ebcaced6 Mon Sep 17 00:00:00 2001 From: Dave Pearce Date: Fri, 30 Jun 2023 14:52:12 -0400 Subject: [PATCH 4/4] Update homeassistant/components/wirelesstag/switch.py Co-authored-by: Paulus Schoutsen --- homeassistant/components/wirelesstag/switch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py index aa53272cec9813..df0f72aca186c1 100644 --- a/homeassistant/components/wirelesstag/switch.py +++ b/homeassistant/components/wirelesstag/switch.py @@ -82,7 +82,7 @@ def __init__(self, api, tag, description: SwitchEntityDescription) -> None: super().__init__(api, tag) self.entity_description = description self._name = f"{self._tag.name} {description.name}" - self._attr_unique_id = f"{WIRELESSTAG_DOMAIN}_{self.tag_id}_{description.key}" + self._attr_unique_id = f"{self.tag_id}_{description.key}" def turn_on(self, **kwargs: Any) -> None: """Turn on the switch."""