Skip to content

Fix pagination field generation for duplicate keys #10189

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
merged 3 commits into from
Dec 12, 2024
Merged

Fix pagination field generation for duplicate keys #10189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58735e6
tests/crates/list: Simplify `multiple_ids()` query parameters
Turbo87 Dec 12, 2024
0044c42
tests/crates/list: Add snapshot assertions for `next_page` serialization
Turbo87 Dec 12, 2024
2764c43
util/request_helper: Fix `query_with_params()` behavior for duplicate…
Turbo87 Dec 12, 2024
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
23 changes: 13 additions & 10 deletions src/tests/routes/crates/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,18 +664,21 @@ async fn multiple_ids() -> anyhow::Result<()> {
.expect_build(&mut conn)
.await;

for json in search_both(
&anon,
"ids%5B%5D=foo&ids%5B%5D=bar&ids%5B%5D=baz&ids%5B%5D=baz&ids%5B%5D=unknown",
)
.await
{
let query = "ids[]=foo&ids[]=bar&ids[]=baz&ids[]=baz&ids[]=unknown";
for json in search_both(&anon, query).await {
assert_eq!(json.meta.total, 3);
assert_eq!(json.crates[0].name, "bar");
assert_eq!(json.crates[1].name, "baz");
assert_eq!(json.crates[2].name, "foo");
}

let response = anon.search(&format!("{query}&per_page=1&page=2")).await;
assert_snapshot!(response.meta.prev_page.unwrap(), @"?ids%5B%5D=foo&ids%5B%5D=bar&ids%5B%5D=baz&ids%5B%5D=baz&ids%5B%5D=unknown&per_page=1&page=1");
assert_snapshot!(response.meta.next_page.unwrap(), @"?ids%5B%5D=foo&ids%5B%5D=bar&ids%5B%5D=baz&ids%5B%5D=baz&ids%5B%5D=unknown&per_page=1&page=3");

let response = anon.search(&format!("{query}&per_page=1")).await;
assert_snapshot!(response.meta.next_page.unwrap(), @"?ids%5B%5D=foo&ids%5B%5D=bar&ids%5B%5D=baz&ids%5B%5D=baz&ids%5B%5D=unknown&per_page=1&seek=Mg");

Ok(())
}

Expand Down Expand Up @@ -1013,21 +1016,21 @@ async fn pagination_links_included_if_applicable() -> anyhow::Result<()> {
let page4 = anon.search("letter=p&page=4&per_page=1").await;

assert_eq!(
Some("?letter=p&page=2&per_page=1".to_string()),
Some("?letter=p&per_page=1&page=2".to_string()),
page1.meta.next_page
);
assert_eq!(None, page1.meta.prev_page);
assert_eq!(
Some("?letter=p&page=3&per_page=1".to_string()),
Some("?letter=p&per_page=1&page=3".to_string()),
page2.meta.next_page
);
assert_eq!(
Some("?letter=p&page=1&per_page=1".to_string()),
Some("?letter=p&per_page=1&page=1".to_string()),
page2.meta.prev_page
);
assert_eq!(None, page4.meta.next_page);
assert_eq!(
Some("?letter=p&page=2&per_page=1".to_string()),
Some("?letter=p&per_page=1&page=2".to_string()),
page3.meta.prev_page
);
assert!([page1.meta.total, page2.meta.total, page3.meta.total]
Expand Down
9 changes: 8 additions & 1 deletion src/util/request_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,15 @@ impl<T: RequestPartsExt> RequestUtils for T {
}

fn query_with_params(&self, new_params: IndexMap<String, String>) -> String {
let mut params = self.query();
let query_bytes = self.uri().query().unwrap_or("").as_bytes();

let mut params = url::form_urlencoded::parse(query_bytes)
.into_owned()
.filter(|(key, _)| !new_params.contains_key(key))
.collect::<Vec<_>>();

params.extend(new_params);

let query_string = url::form_urlencoded::Serializer::new(String::new())
.extend_pairs(params)
.finish();
Expand Down