jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-25 17:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems with automatic management of Schlage locks (#127689)

Browse Source 
Use the correct identifiers for existing lock devices
This commit is contained in:
David Knowles 2024-10-06 01:42:39 -04:00 committed by GitHub
parent 8f96256e86
commit f6850c36fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/schlage/coordinator.py
View File

@ -90,13 +90,21 @@ class SchlageDataUpdateCoordinator(DataUpdateCoordinator[SchlageData]):
devices = dr.async_entries_for_config_entry(
device_registry, self.config_entry.entry_id
)
previous_locks = {device.id for device in devices}
previous_locks = set()
previous_locks_by_lock_id = {}
for device in devices:
for domain, identifier in device.identifiers:
if domain == DOMAIN:
previous_locks.add(identifier)
previous_locks_by_lock_id[identifier] = device
continue
current_locks = set(self.data.locks.keys())
if removed_locks := previous_locks - current_locks:
LOGGER.debug("Removed locks: %s", ", ".join(removed_locks))
for device_id in removed_locks:
for lock_id in removed_locks:
device_registry.async_update_device(
device_id=device_id,
device_id=previous_locks_by_lock_id[lock_id].id,
remove_config_entry_id=self.config_entry.entry_id,
)

22
tests/components/schlage/test_init.py
View File

@ -12,6 +12,7 @@ from syrupy.assertion import SnapshotAssertion
from homeassistant.components.schlage.const import DOMAIN, UPDATE_INTERVAL
from homeassistant.config_entries import ConfigEntry, ConfigEntryState
from homeassistant.core import HomeAssistant
import homeassistant.helpers.device_registry as dr
from homeassistant.helpers.device_registry import DeviceRegistry
from tests.common import MockConfigEntry, async_fire_time_changed
@ -125,6 +126,10 @@ async def test_auto_add_device(
"""Test new devices are auto-added to the device registry."""
device = device_registry.async_get_device(identifiers={(DOMAIN, "test")})
assert device is not None
all_devices = dr.async_entries_for_config_entry(
device_registry, mock_added_config_entry.entry_id
)
assert len(all_devices) == 1
mock_lock_attrs["device_id"] = "test2"
new_mock_lock = create_autospec(Lock)
@ -139,19 +144,21 @@ async def test_auto_add_device(
new_device = device_registry.async_get_device(identifiers={(DOMAIN, "test2")})
assert new_device is not None
all_devices = dr.async_entries_for_config_entry(
device_registry, mock_added_config_entry.entry_id
)
assert len(all_devices) == 2
async def test_auto_remove_device(
hass: HomeAssistant,
device_registry: DeviceRegistry,
mock_added_config_entry: ConfigEntry,
mock_schlage: Mock,
mock_lock: Mock,
mock_lock_attrs: dict[str, Any],
freezer: FrozenDateTimeFactory,
) -> None:
"""Test new devices are auto-added to the device registry."""
device = device_registry.async_get_device(identifiers={(DOMAIN, "test")})
assert device is not None
assert device_registry.async_get_device(identifiers={(DOMAIN, "test")}) is not None
mock_schlage.locks.return_value = []
@ -160,5 +167,8 @@ async def test_auto_remove_device(
async_fire_time_changed(hass)
await hass.async_block_till_done(wait_background_tasks=True)
new_device = device_registry.async_get_device(identifiers={(DOMAIN, "test")})
assert new_device is None
assert device_registry.async_get_device(identifiers={(DOMAIN, "test")}) is None
all_devices = dr.async_entries_for_config_entry(
device_registry, mock_added_config_entry.entry_id
)
assert len(all_devices) == 0