Skip to content

Only show crate once, even if search is like several category #524 #558

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 1 commit into from
Feb 21, 2017
Merged

Only show crate once, even if search is like several category #524 #558

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
18 changes: 9 additions & 9 deletions src/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,16 +538,16 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
}).or_else(|| {
query.get("category").map(|cat| {
args.insert(0, cat);
let base = "FROM crates \
INNER JOIN crates_categories \
ON crates.id = crates_categories.crate_id \
INNER JOIN categories \
ON crates_categories.category_id = \
categories.id \
WHERE categories.slug = $1 OR \
let base = "FROM crates
INNER JOIN crates_categories
ON crates.id = crates_categories.crate_id
INNER JOIN categories
ON crates_categories.category_id =
categories.id
WHERE categories.slug = $1 OR
categories.slug LIKE $1 || '::%'";
(format!("SELECT crates.* {} ORDER BY {} LIMIT $2 OFFSET $3", base, sort_sql),
format!("SELECT COUNT(crates.*) {}", base))
(format!("SELECT DISTINCT crates.* {} ORDER BY {} LIMIT $2 OFFSET $3", base, sort_sql),
format!("SELECT COUNT(DISTINCT crates.*) {}", base))
})
}).or_else(|| {
query.get("user_id").and_then(|s| s.parse::<i32>().ok()).map(|user_id| {
Expand Down
8 changes: 8 additions & 0 deletions src/tests/category.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,12 @@ fn update_crate() {
assert_eq!(cnt(&mut req, "cat1"), 0);
assert_eq!(cnt(&mut req, "category-2"), 0);

// Add a category and its subcategory
::mock_category(&mut req, "cat1::bar", "cat1::bar");
Category::update_crate(
tx(&req), &krate, &["cat1".to_string(),
"cat1::bar".to_string()]).unwrap();
assert_eq!(cnt(&mut req, "cat1"), 1);
assert_eq!(cnt(&mut req, "cat1::bar"), 1);
assert_eq!(cnt(&mut req, "category-2"), 0);
}
18 changes: 18 additions & 0 deletions src/tests/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use cargo_registry::krate::{Crate, EncodableCrate};
use cargo_registry::upload as u;
use cargo_registry::user::EncodableUser;
use cargo_registry::version::EncodableVersion;
use cargo_registry::category::Category;

#[derive(RustcDecodable)]
struct CrateList { crates: Vec<EncodableCrate>, meta: CrateMeta }
Expand Down Expand Up @@ -130,6 +131,23 @@ fn index_queries() {
assert_eq!(::json::<CrateList>(&mut response).crates.len(), 2);
let mut response = ok_resp!(middle.call(req.with_query("keyword=kw2")));
assert_eq!(::json::<CrateList>(&mut response).crates.len(), 0);

::mock_category(&mut req, "cat1", "cat1");
::mock_category(&mut req, "cat1::bar", "cat1::bar");
Category::update_crate(tx(&req), &krate, &["cat1".to_string(),
"cat1::bar".to_string()]).unwrap();
let mut response = ok_resp!(middle.call(req.with_query("category=cat1")));
let cl = ::json::<CrateList>(&mut response);
assert_eq!(cl.crates.len(), 1);
assert_eq!(cl.meta.total, 1);
let mut response = ok_resp!(middle.call(req.with_query("category=cat1::bar")));
let cl = ::json::<CrateList>(&mut response);
assert_eq!(cl.crates.len(), 1);
assert_eq!(cl.meta.total, 1);
let mut response = ok_resp!(middle.call(req.with_query("keyword=cat2")));
let cl = ::json::<CrateList>(&mut response);
assert_eq!(cl.crates.len(), 0);
assert_eq!(cl.meta.total, 0);
}

#[test]
Expand Down