From c988d3d427e829d6d24f40c1ad4d7e3f6dbddb56 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 4 Feb 2024 14:11:56 -0600 Subject: [PATCH] Avoid linear search of entity registry in guardian (#109634) --- homeassistant/components/guardian/util.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/guardian/util.py b/homeassistant/components/guardian/util.py index ffa57322551..a5e91dce813 100644 --- a/homeassistant/components/guardian/util.py +++ b/homeassistant/components/guardian/util.py @@ -48,9 +48,10 @@ def async_finish_entity_domain_replacements( try: [registry_entry] = [ registry_entry - for registry_entry in ent_reg.entities.values() - if registry_entry.config_entry_id == entry.entry_id - and registry_entry.domain == strategy.old_domain + for registry_entry in er.async_entries_for_config_entry( + ent_reg, entry.entry_id + ) + if registry_entry.domain == strategy.old_domain and registry_entry.unique_id == strategy.old_unique_id ] except ValueError: