Incorporate PR feedback

- add tests for total_downloads and just updated
- sort imports

Author: erewok

src/krate/mod.rs

@@ -755,11 +755,9 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
 
 /// Handles the `GET /summary` route.
 pub fn summary(req: &mut Request) -> CargoResult<Response> {
-    use schema::crates::dsl::*;
-    use diesel::expression::DayAndMonthIntervalDsl;
+    use diesel::expression::{date, now, sql, DayAndMonthIntervalDsl};
     use diesel::types::{BigInt, Nullable};
-    use diesel::expression::functions::date_and_time::{date, now};
-    use diesel::expression::sql_literal::sql;
+    use schema::crates::dsl::*;
 
     let conn = req.db_conn()?;
     let num_crates = crates.count().get_result(&*conn)?;
@@ -807,7 +805,7 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
             ),
         )
         .group_by(id)
-        .order(recent_downloads.clone().desc().nulls_last())
+        .order(recent_downloads.desc().nulls_last())
         .limit(10)
         .select(ALL_COLUMNS)
         .load::<Crate>(&*conn)?;

src/tests/krate.rs

@@ -4,11 +4,13 @@ use std::collections::HashMap;
 use std::io::prelude::*;
 use std::fs::{self, File};
 
+use chrono::Utc;
 use conduit::{Handler, Method};
-use git2;
+use diesel::update;
 use self::diesel::prelude::*;
-use serde_json;
+use git2;
 use semver;
+use serde_json;
 
 use cargo_registry::dependency::EncodableDependency;
 use cargo_registry::download::EncodableVersionDownload;
@@ -17,7 +19,7 @@ use cargo_registry::keyword::EncodableKeyword;
 use cargo_registry::krate::{Crate, EncodableCrate, MAX_NAME_LENGTH};
 
 use cargo_registry::token::ApiToken;
-use cargo_registry::schema::{crates, versions};
+use cargo_registry::schema::{crates, metadata, versions};
 
 use cargo_registry::upload as u;
 use cargo_registry::version::EncodableVersion;
@@ -82,7 +84,6 @@ fn new_crate(name: &str) -> u::NewCrate {
     }
 }
 
-
 #[test]
 fn index() {
     let (_b, app, middle) = ::app();
@@ -1000,6 +1001,7 @@ fn summary_new_crates() {
     let u;
     let krate;
     let krate2;
+    let krate3;
     {
         let conn = app.diesel_database.get().unwrap();
         u = ::new_user("foo").create_or_update(&conn).unwrap();
@@ -1019,36 +1021,51 @@ fn summary_new_crates() {
             .recent_downloads(50)
             .expect_build(&conn);
 
+        krate3 = ::CrateBuilder::new("just_updated", u.id)
+            .version(::VersionBuilder::new("0.1.0"))
+            .expect_build(&conn);
+
         ::CrateBuilder::new("with_downloads", u.id)
             .version(::VersionBuilder::new("0.3.0"))
             .keyword("popular")
             .downloads(1000)
             .expect_build(&conn);
-        ::CrateBuilder::new("just_updated", u.id)
-            .version(::VersionBuilder::new("0.4.0"))
-            .expect_build(&conn);
 
         ::new_category("Category 1", "cat1")
             .create_or_update(&conn)
             .unwrap();
         Category::update_crate(&conn, &krate, &["cat1"]).unwrap();
         Category::update_crate(&conn, &krate2, &["cat1"]).unwrap();
+
+        // set total_downloads global value for `num_downloads` prop
+        update(metadata::table)
+            .set(metadata::total_downloads.eq(6000))
+            .execute(&*conn)
+            .unwrap();
+
+        // update 'just_updated' krate. Others won't appear because updated_at == created_at.
+        let updated = Utc::now().naive_utc();
+        update(&krate3)
+            .set(crates::updated_at.eq(updated))
+            .execute(&*conn)
+            .unwrap();
     }
 
     let mut req = ::req(app.clone(), Method::Get, "/api/v1/summary");
     let mut response = ok_resp!(middle.call(&mut req));
     let json: SummaryResponse = ::json(&mut response);
 
     assert_eq!(json.num_crates, 4);
-    assert_eq!(json.num_downloads, 0); // need to add a record to metadata
+    assert_eq!(json.num_downloads, 6000);
     assert_eq!(json.most_downloaded[0].name, "most_recent_downloads");
     assert_eq!(
         json.most_recently_downloaded[0].name,
         "most_recent_downloads"
     );
     assert_eq!(json.popular_keywords[0].keyword, "popular");
     assert_eq!(json.popular_categories[0].category, "Category 1");
-    assert_eq!(json.just_updated.len(), 0); // update a couple before running this request...
+    assert_eq!(json.just_updated.len(), 1);
+    assert_eq!(json.just_updated[0].name, "just_updated");
     assert_eq!(json.new_crates.len(), 4);
 }