Merge #1264

bors-voyager[bot] · moore3071 · carols10cents · bors-voyager[bot] · commit 851a73f8292b · 2018-07-21T01:24:16.000Z
1264: Recently updated sort r=carols10cents a=moore3071 Allow sorting by which crates were most recently updated as mentioned in #1210. The option is called 'recent-updates' in order to match the naming convention of 'recent-downloads' Co-authored-by: Brandon Moore <moore.3071@osu.edu> Co-authored-by: Carol (Nichols || Goulding) <carol.nichols@gmail.com>
diff --git a/app/controllers/category/index.js b/app/controllers/category/index.js
@@ -19,6 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'alpha') {
             return 'Alphabetical';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Recent Downloads';
         }
diff --git a/app/controllers/crates.js b/app/controllers/crates.js
@@ -19,6 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'recent-downloads') {
             return 'Recent Downloads';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/keyword/index.js b/app/controllers/keyword/index.js
@@ -17,6 +17,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'alpha') {
             return 'Alphabetical';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Recent Downloads';
         }
diff --git a/app/controllers/me/crates.js b/app/controllers/me/crates.js
@@ -19,6 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'recent-downloads') {
             return 'Recent Downloads';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/search.js b/app/controllers/search.js
@@ -31,6 +31,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'recent-downloads') {
             return 'Recent Downloads';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Relevance';
         }
diff --git a/app/controllers/team.js b/app/controllers/team.js
@@ -17,6 +17,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'recent-downloads') {
             return 'Recent Downloads';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/user.js b/app/controllers/user.js
@@ -18,6 +18,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.sort === 'recent-downloads') {
             return 'Recent Downloads';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/templates/category/index.hbs b/app/templates/category/index.hbs
@@ -69,6 +69,11 @@
                         Recent Downloads
                     {{/link-to}}
                 </li>
+                <li>
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
+                    {{/link-to}}
+                </li>
             {{/rl-dropdown}}
         {{/rl-dropdown-container}}
     </div>
diff --git a/app/templates/crates.hbs b/app/templates/crates.hbs
@@ -60,6 +60,11 @@
                         Recent Downloads
                     {{/link-to}}
                 </li>
+                <li>
+                    {{#link-to (query-params page=1 sort="recent-updates")}}
+                        Recent Updates
+                    {{/link-to}}
+                </li>
             {{/rl-dropdown}}
         {{/rl-dropdown-container}}
     </div>
diff --git a/app/templates/keyword/index.hbs b/app/templates/keyword/index.hbs
@@ -40,6 +40,11 @@
                         Recent Downloads
                     {{/link-to}}
                 </li>
+                <li>
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
+                    {{/link-to}}
+                </li>
             {{/rl-dropdown}}
         {{/rl-dropdown-container}}
     </div>
diff --git a/app/templates/me/crates.hbs b/app/templates/me/crates.hbs
@@ -41,6 +41,11 @@
                         Recent Downloads
                     {{/link-to}}
                 </li>
+                <li>
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
+                    {{/link-to}}
+                </li>
             {{/rl-dropdown}}
         {{/rl-dropdown-container}}
     </div>
diff --git a/app/templates/search.hbs b/app/templates/search.hbs
@@ -52,6 +52,11 @@
                             Recent Downloads
                         {{/link-to}}
                     </li>
+                    <li>
+                        {{#link-to (query-params page=1 sort="recent-updates")}}
+                            Recent Updates
+                        {{/link-to}}
+                    </li>
                 {{/rl-dropdown}}
             {{/rl-dropdown-container}}
         </div>
diff --git a/app/templates/team.hbs b/app/templates/team.hbs
@@ -55,6 +55,11 @@
                                 Recent Downloads
                             {{/link-to}}
                         </li>
+                        <li>
+                            {{#link-to (query-params sort="recent-updates")}}
+                                Recent Updates
+                            {{/link-to}}
+                        </li>
                     {{/rl-dropdown}}
                 {{/rl-dropdown-container}}
             </div>
diff --git a/app/templates/user.hbs b/app/templates/user.hbs
@@ -46,6 +46,11 @@
                                 Recent Downloads
                             {{/link-to}}
                         </li>
+                        <li>
+                            {{#link-to (query-params sort="recent-updates")}}
+                                Recent Updates
+                            {{/link-to}}
+                        </li>
                     {{/rl-dropdown}}
                 {{/rl-dropdown-container}}
             </div>
diff --git a/src/controllers/krate/search.rs b/src/controllers/krate/search.rs
@@ -143,6 +143,8 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
         query = query.then_order_by(crates::downloads.desc())
     } else if sort == "recent-downloads" {
         query = query.then_order_by(recent_crate_downloads::downloads.desc().nulls_last())
+    } else if sort == "recent-updates" {
+        query = query.order(crates::updated_at.desc());
     } else {
         query = query.then_order_by(crates::name.asc())
     }
diff --git a/src/tests/krate.rs b/src/tests/krate.rs
@@ -8,6 +8,7 @@ use std::sync::Arc;
 
 use chrono::Utc;
 use conduit::{Handler, Method};
+use diesel::dsl::*;
 use diesel::update;
 use flate2::Compression;
 use flate2::write::GzEncoder;
@@ -288,36 +289,152 @@ fn exact_match_first_on_queries() {
     assert_eq!(json.crates[2].name, "foo_exact");
 }
 
+#[test]
+fn index_sorting() {
+    let (_b, app, middle) = ::app();
+    let krate1;
+    let krate2;
+    let krate3;
+    let krate4;
+
+    {
+        let conn = app.diesel_database.get().unwrap();
+        let user = ::new_user("foo").create_or_update(&conn).unwrap();
+
+        krate1 = ::CrateBuilder::new("foo_sort", user.id)
+            .description("bar_sort baz_sort const")
+            .downloads(50)
+            .recent_downloads(50)
+            .expect_build(&conn);
+
+        krate2 = ::CrateBuilder::new("bar_sort", user.id)
+            .description("foo_sort baz_sort foo_sort baz_sort const")
+            .downloads(3333)
+            .recent_downloads(0)
+            .expect_build(&conn);
+
+        krate3 = ::CrateBuilder::new("baz_sort", user.id)
+            .description("foo_sort bar_sort foo_sort bar_sort foo_sort bar_sort const")
+            .downloads(100_000)
+            .recent_downloads(10)
+            .expect_build(&conn);
+
+        krate4 = ::CrateBuilder::new("other_sort", user.id)
+            .description("other_sort const")
+            .downloads(999_999)
+            .expect_build(&conn);
+
+        // Set the updated at column for each crate
+        update(&krate1)
+            .set(crates::updated_at.eq(now - 3.weeks()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate2)
+            .set(crates::updated_at.eq(now - 5.days()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate3)
+            .set(crates::updated_at.eq(now - 10.seconds()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate4)
+            .set(crates::updated_at.eq(now))
+            .execute(&*conn)
+            .unwrap();
+    }
+
+    // Sort by downloads
+    let mut req = ::req(app, Method::Get, "/api/v1/crates");
+    let mut response = ok_resp!(middle.call(req.with_query("sort=downloads")));
+    let json: CrateList = ::json(&mut response);
+    assert_eq!(json.meta.total, 4);
+    assert_eq!(json.crates[0].name, "other_sort");
+    assert_eq!(json.crates[1].name, "baz_sort");
+    assert_eq!(json.crates[2].name, "bar_sort");
+    assert_eq!(json.crates[3].name, "foo_sort");
+
+    // Sort by recent-downloads
+    let mut response = ok_resp!(middle.call(req.with_query("sort=recent-downloads"),));
+    let json: CrateList = ::json(&mut response);
+    assert_eq!(json.meta.total, 4);
+    assert_eq!(json.crates[0].name, "foo_sort");
+    assert_eq!(json.crates[1].name, "baz_sort");
+    assert_eq!(json.crates[2].name, "bar_sort");
+    assert_eq!(json.crates[3].name, "other_sort");
+
+    // Sort by recent-updates
+    let mut response = ok_resp!(middle.call(req.with_query("sort=recent-updates"),));
+    let json: CrateList = ::json(&mut response);
+    assert_eq!(json.meta.total, 4);
+    assert_eq!(json.crates[0].name, "other_sort");
+    assert_eq!(json.crates[1].name, "baz_sort");
+    assert_eq!(json.crates[2].name, "bar_sort");
+    assert_eq!(json.crates[3].name, "foo_sort");
+
+    // Test for bug with showing null results first when sorting
+    // by descending downloads
+    let mut response = ok_resp!(middle.call(req.with_query("sort=recent-downloads")));
+    let json: CrateList = ::json(&mut response);
+    assert_eq!(json.meta.total, 4);
+    assert_eq!(json.crates[0].name, "foo_sort");
+    assert_eq!(json.crates[1].name, "baz_sort");
+    assert_eq!(json.crates[2].name, "bar_sort");
+    assert_eq!(json.crates[3].name, "other_sort");
+}
+
 #[test]
 fn exact_match_on_queries_with_sort() {
     let (_b, app, middle) = ::app();
 
+    let krate1;
+    let krate2;
+    let krate3;
+    let krate4;
+
     {
         let conn = app.diesel_database.get().unwrap();
         let user = ::new_user("foo").create_or_update(&conn).unwrap();
 
-        ::CrateBuilder::new("foo_sort", user.id)
+        krate1 = ::CrateBuilder::new("foo_sort", user.id)
             .description("bar_sort baz_sort const")
             .downloads(50)
             .recent_downloads(50)
             .expect_build(&conn);
 
-        ::CrateBuilder::new("bar_sort", user.id)
+        krate2 = ::CrateBuilder::new("bar_sort", user.id)
             .description("foo_sort baz_sort foo_sort baz_sort const")
             .downloads(3333)
             .recent_downloads(0)
             .expect_build(&conn);
 
-        ::CrateBuilder::new("baz_sort", user.id)
+        krate3 = ::CrateBuilder::new("baz_sort", user.id)
             .description("foo_sort bar_sort foo_sort bar_sort foo_sort bar_sort const")
             .downloads(100_000)
             .recent_downloads(10)
             .expect_build(&conn);
 
-        ::CrateBuilder::new("other_sort", user.id)
+        krate4 = ::CrateBuilder::new("other_sort", user.id)
             .description("other_sort const")
             .downloads(999_999)
             .expect_build(&conn);
+
+        // Set the updated at column for each crate
+        update(&krate1)
+            .set(crates::updated_at.eq(now - 3.weeks()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate2)
+            .set(crates::updated_at.eq(now - 5.days()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate3)
+            .set(crates::updated_at.eq(now - 10.seconds()))
+            .execute(&*conn)
+            .unwrap();
+        update(&krate4)
+            .set(crates::updated_at.eq(now))
+            .execute(&*conn)
+            .unwrap();
     }
 
     // Sort by downloads
@@ -359,9 +476,16 @@ fn exact_match_on_queries_with_sort() {
     assert_eq!(json.crates[1].name, "foo_sort");
     assert_eq!(json.crates[2].name, "baz_sort");
 
+    // Sort by recent-updates
+    let mut response = ok_resp!(middle.call(req.with_query("q=bar_sort&sort=recent-updates"),));
+    let json: CrateList = ::json(&mut response);
+    assert_eq!(json.meta.total, 3);
+    assert_eq!(json.crates[0].name, "baz_sort");
+    assert_eq!(json.crates[1].name, "bar_sort");
+    assert_eq!(json.crates[2].name, "foo_sort");
+
     // Test for bug with showing null results first when sorting
-    // by descending
-    // This has nothing to do with querying for exact match I'm sorry
+    // by descending downloads
     let mut response = ok_resp!(middle.call(req.with_query("sort=recent-downloads")));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 4);
diff --git a/tests/acceptance/search-test.js b/tests/acceptance/search-test.js
@@ -36,7 +36,7 @@ module('Acceptance | search', function(hooks) {
         assert.dom('[data-test-search-nav]').hasText('Displaying 1-8 of 8 total results');
         assert
             .dom('[data-test-search-sort]')
-            .hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads');
+            .hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads Recent Updates');
         assert.dom('[data-test-crate-row="0"] [data-test-crate-link]').hasText('kinetic-rust');
         assert.dom('[data-test-crate-row="0"] [data-test-version-badge]').hasAttribute('alt', '0.0.16');
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ export default Controller.extend(PaginationMixin, {`
`19`	`19`	`return 'All-Time Downloads';`
`20`	`20`	`} else if (this.sort === 'alpha') {`
`21`	`21`	`return 'Alphabetical';`
	`22`	`+ } else if (this.get('sort') === 'recent-updates') {`
	`23`	`+ return 'Recent Updates';`
`22`	`24`	`} else {`
`23`	`25`	`return 'Recent Downloads';`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ export default Controller.extend(PaginationMixin, {`
`17`	`17`	`return 'All-Time Downloads';`
`18`	`18`	`} else if (this.sort === 'alpha') {`
`19`	`19`	`return 'Alphabetical';`
	`20`	`+ } else if (this.get('sort') === 'recent-updates') {`
	`21`	`+ return 'Recent Updates';`
`20`	`22`	`} else {`
`21`	`23`	`return 'Recent Downloads';`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ export default Controller.extend(PaginationMixin, {`
`31`	`31`	`return 'All-Time Downloads';`
`32`	`32`	`} else if (this.sort === 'recent-downloads') {`
`33`	`33`	`return 'Recent Downloads';`
	`34`	`+ } else if (this.get('sort') === 'recent-updates') {`
	`35`	`+ return 'Recent Updates';`
`34`	`36`	`} else {`
`35`	`37`	`return 'Relevance';`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ export default Controller.extend(PaginationMixin, {`
`18`	`18`	`return 'All-Time Downloads';`
`19`	`19`	`} else if (this.sort === 'recent-downloads') {`
`20`	`20`	`return 'Recent Downloads';`
	`21`	`+ } else if (this.get('sort') === 'recent-updates') {`
	`22`	`+ return 'Recent Updates';`
`21`	`23`	`} else {`
`22`	`24`	`return 'Alphabetical';`
`23`	`25`	`}`