jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing last_reported_timestamp to LazyState (#132761)

Browse Source 
followup to #132752
This commit is contained in:
J. Nick Koston 2024-12-09 23:08:01 +01:00 committed by GitHub
parent be34d302df
commit f177336025
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/recorder/models/state.py
View File

@ -111,6 +111,14 @@ class LazyState(State):
assert ts is not None assert ts is not None
return ts return ts
@cached_property
def last_reported_timestamp(self) -> float: # type: ignore[override]
"""Last reported timestamp."""
ts = self._last_reported_ts or self._last_updated_ts
if TYPE_CHECKING:
assert ts is not None
return ts
def as_dict(self) -> dict[str, Any]: # type: ignore[override] def as_dict(self) -> dict[str, Any]: # type: ignore[override]
"""Return a dict representation of the LazyState. """Return a dict representation of the LazyState.

37
tests/components/recorder/test_models.py
View File

@ -325,6 +325,7 @@ async def test_lazy_state_handles_different_last_updated_and_last_changed(
state="off", state="off",
attributes='{"shared":true}', attributes='{"shared":true}',
last_updated_ts=now.timestamp(), last_updated_ts=now.timestamp(),
last_reported_ts=now.timestamp(),
last_changed_ts=(now - timedelta(seconds=60)).timestamp(), last_changed_ts=(now - timedelta(seconds=60)).timestamp(),
) )
lstate = LazyState( lstate = LazyState(
@ -339,6 +340,7 @@ async def test_lazy_state_handles_different_last_updated_and_last_changed(
} }
assert lstate.last_updated.timestamp() == row.last_updated_ts assert lstate.last_updated.timestamp() == row.last_updated_ts
assert lstate.last_changed.timestamp() == row.last_changed_ts assert lstate.last_changed.timestamp() == row.last_changed_ts
assert lstate.last_reported.timestamp() == row.last_updated_ts
assert lstate.as_dict() == { assert lstate.as_dict() == {
"attributes": {"shared": True}, "attributes": {"shared": True},
"entity_id": "sensor.valid", "entity_id": "sensor.valid",
@ -348,6 +350,7 @@ async def test_lazy_state_handles_different_last_updated_and_last_changed(
} }
assert lstate.last_changed_timestamp == row.last_changed_ts assert lstate.last_changed_timestamp == row.last_changed_ts
assert lstate.last_updated_timestamp == row.last_updated_ts assert lstate.last_updated_timestamp == row.last_updated_ts
assert lstate.last_reported_timestamp == row.last_updated_ts
async def test_lazy_state_handles_same_last_updated_and_last_changed( async def test_lazy_state_handles_same_last_updated_and_last_changed(
@ -361,6 +364,7 @@ async def test_lazy_state_handles_same_last_updated_and_last_changed(
attributes='{"shared":true}', attributes='{"shared":true}',
last_updated_ts=now.timestamp(), last_updated_ts=now.timestamp(),
last_changed_ts=now.timestamp(), last_changed_ts=now.timestamp(),
last_reported_ts=None,
) )
lstate = LazyState( lstate = LazyState(
row, {}, None, row.entity_id, row.state, row.last_updated_ts, False row, {}, None, row.entity_id, row.state, row.last_updated_ts, False
@ -374,6 +378,7 @@ async def test_lazy_state_handles_same_last_updated_and_last_changed(
} }
assert lstate.last_updated.timestamp() == row.last_updated_ts assert lstate.last_updated.timestamp() == row.last_updated_ts
assert lstate.last_changed.timestamp() == row.last_changed_ts assert lstate.last_changed.timestamp() == row.last_changed_ts
assert lstate.last_reported.timestamp() == row.last_updated_ts
assert lstate.as_dict() == { assert lstate.as_dict() == {
"attributes": {"shared": True}, "attributes": {"shared": True},
"entity_id": "sensor.valid", "entity_id": "sensor.valid",
@ -383,3 +388,35 @@ async def test_lazy_state_handles_same_last_updated_and_last_changed(
} }
assert lstate.last_changed_timestamp == row.last_changed_ts assert lstate.last_changed_timestamp == row.last_changed_ts
assert lstate.last_updated_timestamp == row.last_updated_ts assert lstate.last_updated_timestamp == row.last_updated_ts
assert lstate.last_reported_timestamp == row.last_updated_ts
async def test_lazy_state_handles_different_last_reported(
caplog: pytest.LogCaptureFixture,
) -> None:
"""Test that the LazyState handles last_reported different from last_updated."""
now = datetime(2021, 6, 12, 3, 4, 1, 323, tzinfo=dt_util.UTC)
row = PropertyMock(
entity_id="sensor.valid",
state="off",
attributes='{"shared":true}',
last_updated_ts=(now - timedelta(seconds=60)).timestamp(),
last_reported_ts=now.timestamp(),
last_changed_ts=(now - timedelta(seconds=60)).timestamp(),
)
lstate = LazyState(
row, {}, None, row.entity_id, row.state, row.last_updated_ts, False
)
assert lstate.as_dict() == {
"attributes": {"shared": True},
"entity_id": "sensor.valid",
"last_changed": "2021-06-12T03:03:01.000323+00:00",
"last_updated": "2021-06-12T03:03:01.000323+00:00",
"state": "off",
}
assert lstate.last_updated.timestamp() == row.last_updated_ts
assert lstate.last_changed.timestamp() == row.last_changed_ts
assert lstate.last_reported.timestamp() == row.last_reported_ts
assert lstate.last_changed_timestamp == row.last_changed_ts
assert lstate.last_updated_timestamp == row.last_updated_ts
assert lstate.last_reported_timestamp == row.last_reported_ts