Fix device ID handling in device_trigger

jason0x43 · Jun 3, 2022 · 005ffa0 · 005ffa0
1 parent 7ead476
commit 005ffa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/custom_components/hubitat/device_trigger.py b/custom_components/hubitat/device_trigger.py
@@ -16,6 +16,8 @@
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, cast
 import voluptuous as vol
 
+from custom_components.hubitat.util import get_hubitat_device_id
+
 from homeassistant.components.automation import (
     AutomationActionType,
     AutomationTriggerInfo,
@@ -201,11 +203,7 @@ def get_hubitat_device(
     if device is None:
         return None, None
 
-    hubitat_id = None
-    for identifier in device.identifiers:
-        if identifier[0] == DOMAIN:
-            hubitat_id = identifier[1]
-            break
+    hubitat_id = get_hubitat_device_id(device)
 
     if hubitat_id is None:
         _LOGGER.debug("Couldn't find Hubitat ID for device %s", device_id)

diff --git a/custom_components/hubitat/util.py b/custom_components/hubitat/util.py
@@ -36,9 +36,7 @@ def get_hub_device_id(hub: HasToken, device: Union[str, Device]) -> str:
 
 
 def get_hubitat_device_id(device: DeviceEntry) -> Optional[str]:
-    for ids in device.identifiers:
-        id_set = ids[0]
-
+    for id_set in device.identifiers:
         if id_set[0] == DOMAIN:
             # The second identifier is hub_id:device_id
             if ":" in id_set[1]: