home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-30 09:51:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

reduce one query

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-26 19:03:38 +02:00
parent 361e46e2c6
commit 9f751a6380
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/usage_prediction/common_control.py
View File

@@ -71,19 +71,6 @@ def _fetch_and_process_data(session: Session, user_id: str) -> dict[str, list[st
# Keep track of contexts that we processed so that we will only process # Keep track of contexts that we processed so that we will only process
# the first service call in a context, and not subsequent calls. # the first service call in a context, and not subsequent calls.
context_processed: set[bytes] = set() context_processed: set[bytes] = set()
# Build the query to get call_service events
# First, get the event_type_id for 'call_service'
event_type_query = select(EventTypes.event_type_id).where(
EventTypes.event_type == "call_service"
)
event_type_result = session.execute(event_type_query).first()
if not event_type_result:
_LOGGER.warning("No call_service events found in database")
return {time_cat: [] for time_cat in TIME_CATEGORIES}
call_service_type_id = event_type_result[0]
thirty_days_ago_ts = (dt_util.utcnow() - timedelta(days=30)).timestamp() thirty_days_ago_ts = (dt_util.utcnow() - timedelta(days=30)).timestamp()
user_id_bytes = uuid_hex_to_bytes_or_none(user_id) user_id_bytes = uuid_hex_to_bytes_or_none(user_id)
if not user_id_bytes: if not user_id_bytes:
@@ -98,9 +85,10 @@ def _fetch_and_process_data(session: Session, user_id: str) -> dict[str, list[st
) )
.select_from(Events) .select_from(Events)
.outerjoin(EventData, Events.data_id == EventData.data_id) .outerjoin(EventData, Events.data_id == EventData.data_id)
.where(Events.event_type_id == call_service_type_id) .outerjoin(EventTypes, Events.event_type_id == EventTypes.event_type_id)
.where(Events.time_fired_ts >= thirty_days_ago_ts) .where(Events.time_fired_ts >= thirty_days_ago_ts)
.where(Events.context_user_id_bin == user_id_bytes) .where(Events.context_user_id_bin == user_id_bytes)
.where(EventTypes.event_type == "call_service")
.order_by(Events.time_fired_ts) .order_by(Events.time_fired_ts)
) )

11
tests/components/usage_prediction/test_common_control.py
View File

@@ -38,15 +38,8 @@ async def test_empty_database(hass: HomeAssistant) -> None:
async def test_invalid_user_id(hass: HomeAssistant) -> None: async def test_invalid_user_id(hass: HomeAssistant) -> None:
"""Test function with invalid user ID returns empty results.""" """Test function with invalid user ID returns empty results."""
# Invalid user ID format (not a valid UUID) # Invalid user ID format (not a valid UUID)
results = await async_predict_common_control(hass, "invalid-user-id") with pytest.raises(ValueError, match=r"Invalid user_id format"):
await async_predict_common_control(hass, "invalid-user-id")
# Should return empty lists for all time categories due to invalid user ID
assert results == {
"morning": [],
"afternoon": [],
"evening": [],
"night": [],
}
@pytest.mark.usefixtures("recorder_mock") @pytest.mark.usefixtures("recorder_mock")