Skip to content

fix: select latest V1 cleaning record regardless of response order #978

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
Lash-L merged 1 commit into from
Oct 10, 2026
Merged

fix: select latest V1 cleaning record regardless of response order #978

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
3 changes: 2 additions & 1 deletion roborock/devices/traits/v1/clean_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ async def refresh(self) -> None:
_LOGGER.debug("No clean records available in clean summary.")
self.last_clean_record = None
return
last_record_id = self.records[0]
# Record IDs are start timestamps; devices may return them in either order.
last_record_id = max(self.records)
self.last_clean_record = await self.get_clean_record(last_record_id)

async def get_clean_record(self, record_id: int) -> CleanRecord:
Expand Down
31 changes: 31 additions & 0 deletions tests/devices/traits/v1/test_clean_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,37 @@ async def test_get_clean_summary_success(
)


@pytest.mark.parametrize(
"records",
[
[1700000000, 1700000400, 1700000800],
[1700000800, 1700000400, 1700000000],
[1700000400, 1700000800, 1700000000],
[1700000800],
],
ids=["ascending", "descending", "unordered", "single"],
)
async def test_get_clean_summary_latest_record(
clean_summary_trait: CleanSummaryTrait, mock_rpc_channel: AsyncMock, records: list[int]
) -> None:
"""Load the latest cleaning regardless of the order returned by the device."""
mock_rpc_channel.send_command.side_effect = [
[3600, 1000000, len(records), records],
[[1700000800, 1700000900, 100, 1000000]],
]

await clean_summary_trait.refresh()

assert mock_rpc_channel.send_command.call_args_list == [
call(RoborockCommand.GET_CLEAN_SUMMARY),
call(RoborockCommand.GET_CLEAN_RECORD, params=[1700000800]),
]
assert clean_summary_trait.records == records
assert clean_summary_trait.last_clean_record is not None
assert clean_summary_trait.last_clean_record.begin == 1700000800
assert clean_summary_trait.last_clean_record.end == 1700000900


async def test_get_clean_summary_clean_time_only(
clean_summary_trait: CleanSummaryTrait, mock_rpc_channel: AsyncMock, sample_clean_summary: CleanSummary
) -> None:
Expand Down
Loading