Skip to content
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.

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

Add orderingKey to Broadway.Message metadata #92

Merged
merged 2 commits into from
Apr 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/broadway_cloud_pub_sub/pull_client.ex
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ defmodule BroadwayCloudPubSub.PullClient do
attributes: metadata["attributes"],
deliveryAttempt: delivery_attempt,
messageId: metadata["messageId"],
orderingKey: metadata["orderingKey"],
publishTime: parse_datetime(metadata["publishTime"])
}

Expand Down
34 changes: 34 additions & 0 deletions test/broadway_cloud_pub_sub/pull_client_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@ defmodule BroadwayCloudPubSub.PullClientTest do
{}
"""

@ordered_response """
{
"receivedMessages": [
{
"ackId": "1",
"deliveryAttempt": 1,
"message": {
"data": "TWVzc2FnZTE=",
"messageId": "19917247038",
"publishTime": "2014-02-14T00:00:03Z",
"orderingKey": "key1"
}
}
]
}
"""

setup do
server = Bypass.open()
base_url = "http://localhost:#{server.port}"
Expand Down Expand Up @@ -122,10 +139,27 @@ defmodule BroadwayCloudPubSub.PullClientTest do
}
end

test "returns a list of ordered Broadway.Message with orderingKey in the :metadata", %{
opts: base_opts,
server: server
} do
on_pubsub_request(server, fn _url, _body ->
{:ok, @ordered_response}
end)

{:ok, opts} = PullClient.init(base_opts)

assert [message] = PullClient.receive_messages(10, & &1, opts)

assert message.metadata.messageId == "19917247038"
assert message.metadata.orderingKey == "key1"
end

test "returns a list of Broadway.Message with :data and :metadata set", %{
opts: base_opts
} do
{:ok, opts} = PullClient.init(base_opts)

[message1, message2, message3, message4] = PullClient.receive_messages(10, & &1, opts)

assert %Message{data: "Message1", metadata: %{publishTime: %DateTime{}}} = message1
Expand Down