Skip to content

60 - fix failure where next page url wasn't being prefixed by the htt… #63

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
davidhallam4-nhs merged 1 commit into from
Feb 13, 2024
Merged

60 - fix failure where next page url wasn't being prefixed by the htt… #63

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
4 changes: 2 additions & 2 deletions mesh_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ def list_messages(self, max_results: Optional[int] = None, workflow_filter: Opti
if workflow_filter:
params["workflow_filter"] = workflow_filter

result = self._inbox_v2_page(f"{self.mailbox_url}/inbox", params=params)
result = self._inbox_v2_page(params=params)

return cast(List[str], result.get("messages", []))

Expand Down Expand Up @@ -813,7 +813,7 @@ def _next_messages(page_result: ListMessageResponse_v2) -> Tuple[Optional[str],
next_page, messages = _next_messages(result)
yield from messages
while next_page:
result = self._inbox_v2_page(url=next_page)
result = self._inbox_v2_page(f"{self._url}{next_page}")
next_page, messages = _next_messages(result)
yield from messages

Expand Down
10 changes: 5 additions & 5 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ coverage = "^7.2.7"
pytest = "^7.4.0"
importlib-metadata = {version = ">=4.11.4", python = "<3.12"}
pytest-httpserver = {version = "^1.0.8", python = ">=3.8,<4.0"}
ruff = "^0.2.0"
ruff = "^0"
boto3 = "^1.33.7"

[tool.poetry.group.local.dependencies]
Expand Down
6 changes: 6 additions & 0 deletions tests/mesh_sandbox_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ def test_send_receive(alice: MeshClient, bob: MeshClient):
assert bob.list_messages() == []


def test_iteration_pages(alice: MeshClient, bob: MeshClient):
sent_message_ids = {alice.send_message(bob_mailbox, b"Hello Bob 1", workflow_id=uuid4().hex) for _ in range(25)}
captured_message_ids = set(bob.iterate_message_ids(batch_size=10))
assert sent_message_ids == captured_message_ids


def test_send_receive_combine_streams_part1_multiple_of_chunk_size(alice: MeshClient, bob: MeshClient):
part1_length = 10
part2_length = 23
Expand Down