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

Fix area registry indexing when there is a name collision (#125050)

Browse Source
This commit is contained in:
Artur Pragacz 2024-09-02 21:23:07 +02:00 committed by Bram Kragten
parent 4c5ba0617a
commit 94d2da1685
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/helpers/area_registry.py
View File

@ -153,22 +153,23 @@ class AreaRegistryItems(NormalizedNameBaseRegistryItems[AreaEntry]):
def _index_entry(self, key: str, entry: AreaEntry) -> None:
"""Index an entry."""
super()._index_entry(key, entry)
if entry.floor_id is not None:
self._floors_index[entry.floor_id][key] = True
for label in entry.labels:
self._labels_index[label][key] = True
super()._index_entry(key, entry)
def _unindex_entry(
self, key: str, replacement_entry: AreaEntry | None = None
) -> None:
# always call base class before other indices
super()._unindex_entry(key, replacement_entry)
entry = self.data[key]
if labels := entry.labels:
for label in labels:
self._unindex_entry_value(key, label, self._labels_index)
if floor_id := entry.floor_id:
self._unindex_entry_value(key, floor_id, self._floors_index)
return super()._unindex_entry(key, replacement_entry)
def get_areas_for_label(self, label: str) -> list[AreaEntry]:
"""Get areas for label."""

7
tests/helpers/test_area_registry.py
View File

@ -242,9 +242,12 @@ async def test_update_area_with_same_name_change_case(
async def test_update_area_with_name_already_in_use(
area_registry: ar.AreaRegistry,
floor_registry: fr.FloorRegistry,
) -> None:
"""Make sure that we can't update an area with a name already in use."""
area1 = area_registry.async_create("mock1")
floor = floor_registry.async_create("mock")
floor_id = floor.floor_id
area1 = area_registry.async_create("mock1", floor_id=floor_id)
area2 = area_registry.async_create("mock2")
with pytest.raises(ValueError) as e_info:
@ -255,6 +258,8 @@ async def test_update_area_with_name_already_in_use(
assert area2.name == "mock2"
assert len(area_registry.areas) == 2
assert area_registry.areas.get_areas_for_floor(floor_id) == [area1]
async def test_update_area_with_normalized_name_already_in_use(
area_registry: ar.AreaRegistry,