Skip to content

Port crate/versions over to use Diesel #755

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
Jul 7, 2017
Merged

Port crate/versions over to use Diesel #755

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
7 changes: 4 additions & 3 deletions src/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,9 +1406,10 @@ pub fn following(req: &mut Request) -> CargoResult<Response> {
// this information already, but ember is definitely requesting it
pub fn versions(req: &mut Request) -> CargoResult<Response> {
let crate_name = &req.params()["crate_id"];
let tx = req.tx()?;
let krate = Crate::find_by_name(tx, crate_name)?;
let versions = krate.versions(tx)?;
let conn = req.db_conn()?;
let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
let mut versions = Version::belonging_to(&krate).load::<Version>(&*conn)?;
versions.sort_by(|a, b| b.num.cmp(&a.num));
let versions = versions
.into_iter()
.map(|v| v.encodable(crate_name))
Expand Down
24 changes: 14 additions & 10 deletions src/tests/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,16 +410,20 @@ fn show() {
fn versions() {
let (_b, app, middle) = ::app();

let v100 = semver::Version::parse("1.0.0").unwrap();
let v050 = semver::Version::parse("0.5.0").unwrap();
let v051 = semver::Version::parse("0.5.1").unwrap();

let mut req = ::req(app, Method::Get, "/api/v1/crates/foo_versions/versions");
::mock_user(&mut req, ::user("foo"));

::mock_crate_vers(&mut req, ::krate("foo_versions"), &v051);
::mock_crate_vers(&mut req, ::krate("foo_versions"), &v100);
::mock_crate_vers(&mut req, ::krate("foo_versions"), &v050);
let mut req = ::req(
app.clone(),
Method::Get,
"/api/v1/crates/foo_versions/versions",
);
{
let conn = app.diesel_database.get().unwrap();
let u = ::new_user("foo").create_or_update(&conn).unwrap();
::CrateBuilder::new("foo_versions", u.id)
.version("0.5.1")
.version("1.0.0")
.version("0.5.0")
.expect_build(&conn);
}

let mut response = ok_resp!(middle.call(&mut req));
let json: VersionsList = ::json(&mut response);
Expand Down