Skip to content

Fix device_ids being filtered when entities also specified in the logbook #72122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 1 commit into from
May 19, 2022
Merged

Fix device_ids being filtered when entities also specified in the logbook #72122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions homeassistant/components/logbook/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
EntityFilter,
convert_include_exclude_filter,
generate_filter,
)
from homeassistant.helpers.integration_platform import (
async_process_integration_platforms,
Expand Down Expand Up @@ -579,8 +578,8 @@ def _get_events(
] = hass.data.get(DOMAIN, {})
format_time = _row_time_fired_timestamp if timestamp else _row_time_fired_isoformat
entity_name_cache = EntityNameCache(hass)
if entity_ids is not None:
entities_filter = generate_filter([], entity_ids, [], [])
if entity_ids or device_ids:
entities_filter = None

def yield_rows(query: Query) -> Generator[Row, None, None]:
"""Yield rows from the database."""
Expand Down
9 changes: 6 additions & 3 deletions tests/components/logbook/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,10 +2546,13 @@ def async_describe_test_event(event: Event) -> dict[str, str]:
assert response["id"] == 2

results = response["result"]
assert results[0]["entity_id"] == "light.kitchen"
assert results[0]["state"] == "on"
assert results[0]["domain"] == "test"
assert results[0]["message"] == "is on fire"
assert results[0]["name"] == "device name"
assert results[1]["entity_id"] == "light.kitchen"
assert results[1]["state"] == "off"
assert results[1]["state"] == "on"
assert results[2]["entity_id"] == "light.kitchen"
assert results[2]["state"] == "off"

await client.send_json(
{
Expand Down