controllers/krate/search: Reverse the sort order of the auxiliary column

Since we all use descending order for sorting, it would be more
intuitive to change all the auxiliary column from ascending to
descending.

Author: eth3lbert

src/controllers/krate/search.rs

@@ -121,19 +121,19 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
         // to ensure predictable pagination behavior.
         if sort == Some("downloads") {
             seek = Some(Seek::Downloads);
-            query = query.order((crates::downloads.desc(), crates::id.asc()))
+            query = query.order((crates::downloads.desc(), crates::id.desc()))
         } else if sort == Some("recent-downloads") {
             seek = Some(Seek::RecentDownloads);
             query = query.order((
                 recent_crate_downloads::downloads.desc().nulls_last(),
-                crates::id.asc(),
+                crates::id.desc(),
             ))
         } else if sort == Some("recent-updates") {
             seek = Some(Seek::RecentUpdates);
-            query = query.order((crates::updated_at.desc(), crates::id.asc()));
+            query = query.order((crates::updated_at.desc(), crates::id.desc()));
         } else if sort == Some("new") {
             seek = Some(Seek::New);
-            query = query.order((crates::created_at.desc(), crates::id.asc()));
+            query = query.order((crates::created_at.desc(), crates::id.desc()));
         } else {
             seek = seek.or(Some(Seek::Name));
             // Since the name is unique value, the inherent ordering becomes naturally unique.
@@ -413,25 +413,25 @@ impl<'a> FilterParams<'a> {
             }
             SeekPayload::New(New(created_at, id)) => {
                 // Equivalent of:
-                // `WHERE (created_at = created_at' AND id > id') OR created_at < created_at'`
+                // `WHERE (created_at = created_at' AND id < id') OR created_at < created_at'`
                 vec![
                     Box::new(
                         crates::created_at
                             .eq(created_at)
-                            .and(crates::id.gt(id))
+                            .and(crates::id.lt(id))
                             .nullable(),
                     ),
                     Box::new(crates::created_at.lt(created_at).nullable()),
                 ]
             }
             SeekPayload::RecentUpdates(RecentUpdates(updated_at, id)) => {
                 // Equivalent of:
-                // `WHERE (updated_at = updated_at' AND id > id') OR updated_at < updated_at'`
+                // `WHERE (updated_at = updated_at' AND id < id') OR updated_at < updated_at'`
                 vec![
                     Box::new(
                         crates::updated_at
                             .eq(updated_at)
-                            .and(crates::id.gt(id))
+                            .and(crates::id.lt(id))
                             .nullable(),
                     ),
                     Box::new(crates::updated_at.lt(updated_at).nullable()),
@@ -440,17 +440,17 @@ impl<'a> FilterParams<'a> {
             SeekPayload::RecentDownloads(RecentDownloads(recent_downloads, id)) => {
                 // Equivalent of:
                 // for recent_downloads is not None:
-                // `WHERE (recent_downloads = recent_downloads' AND id > id')
+                // `WHERE (recent_downloads = recent_downloads' AND id < id')
                 //      OR (recent_downloads < recent_downloads' OR recent_downloads IS NULL)`
                 // for recent_downloads is None:
-                // `WHERE (recent_downloads IS NULL AND id > id')`
+                // `WHERE (recent_downloads IS NULL AND id < id')`
                 match recent_downloads {
                     Some(dl) => {
                         vec![
                             Box::new(
                                 recent_crate_downloads::downloads
                                     .eq(dl)
-                                    .and(crates::id.gt(id))
+                                    .and(crates::id.lt(id))
                                     .nullable(),
                             ),
                             Box::new(
@@ -465,28 +465,28 @@ impl<'a> FilterParams<'a> {
                         vec![Box::new(
                             recent_crate_downloads::downloads
                                 .is_null()
-                                .and(crates::id.gt(id))
+                                .and(crates::id.lt(id))
                                 .nullable(),
                         )]
                     }
                 }
             }
             SeekPayload::Downloads(Downloads(downloads, id)) => {
                 // Equivalent of:
-                // `WHERE (downloads = downloads' AND id > id') OR downloads < downloads'`
+                // `WHERE (downloads = downloads' AND id < id') OR downloads < downloads'`
                 vec![
                     Box::new(
                         crates::downloads
                             .eq(downloads)
-                            .and(crates::id.gt(id))
+                            .and(crates::id.lt(id))
                             .nullable(),
                     ),
                     Box::new(crates::downloads.lt(downloads).nullable()),
                 ]
             }
             SeekPayload::Query(Query(exact_match, id)) => {
                 // Equivalent of:
-                // `WHERE (exact_match = exact_match' AND name > name') OR exact_match <
+                // `WHERE (exact_match = exact_match' AND name < name') OR exact_match <
                 // exact_match'`
                 let q_string = self.q_string.expect("q_string should not be None");
                 let name_exact_match = Crate::with_name(q_string);

src/tests/routes/crates/list.rs

@@ -325,14 +325,14 @@ fn index_sorting() {
     // Sort by downloads
     for json in search_both(&anon, "sort=downloads") {
         assert_eq!(json.meta.total, 4);
-        assert_eq!(json.crates[0].name, "baz_sort");
-        assert_eq!(json.crates[1].name, "other_sort");
+        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");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=downloads");
-    assert_eq!(resp[0].crates[0].name, "baz_sort");
-    assert_eq!(resp[1].crates[0].name, "other_sort");
+    assert_eq!(resp[0].crates[0].name, "other_sort");
+    assert_eq!(resp[1].crates[0].name, "baz_sort");
     assert_eq!(resp[2].crates[0].name, "bar_sort");
     assert_eq!(resp[3].crates[0].name, "foo_sort");
     assert_eq!(resp[3].meta.total, 4);
@@ -341,14 +341,14 @@ fn index_sorting() {
     // Sort by recent-downloads
     for json in search_both(&anon, "sort=recent-downloads") {
         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[0].name, "baz_sort");
+        assert_eq!(json.crates[1].name, "foo_sort");
         assert_eq!(json.crates[2].name, "bar_sort");
         assert_eq!(json.crates[3].name, "other_sort");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=recent-downloads");
-    assert_eq!(resp[0].crates[0].name, "foo_sort");
-    assert_eq!(resp[1].crates[0].name, "baz_sort");
+    assert_eq!(resp[0].crates[0].name, "baz_sort");
+    assert_eq!(resp[1].crates[0].name, "foo_sort");
     assert_eq!(resp[2].crates[0].name, "bar_sort");
     assert_eq!(resp[3].crates[0].name, "other_sort");
     assert_eq!(resp[3].meta.total, 4);
@@ -358,14 +358,14 @@ fn index_sorting() {
     for json in search_both(&anon, "sort=recent-updates") {
         assert_eq!(json.meta.total, 4);
         assert_eq!(json.crates[0].name, "other_sort");
-        assert_eq!(json.crates[1].name, "bar_sort");
-        assert_eq!(json.crates[2].name, "baz_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");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=recent-updates");
     assert_eq!(resp[0].crates[0].name, "other_sort");
-    assert_eq!(resp[1].crates[0].name, "bar_sort");
-    assert_eq!(resp[2].crates[0].name, "baz_sort");
+    assert_eq!(resp[1].crates[0].name, "baz_sort");
+    assert_eq!(resp[2].crates[0].name, "bar_sort");
     assert_eq!(resp[3].crates[0].name, "foo_sort");
     assert_eq!(resp[3].meta.total, 4);
     assert_eq!(calls, 5);
@@ -374,14 +374,14 @@ fn index_sorting() {
     for json in search_both(&anon, "sort=new") {
         assert_eq!(json.meta.total, 4);
         assert_eq!(json.crates[0].name, "bar_sort");
-        assert_eq!(json.crates[1].name, "baz_sort");
-        assert_eq!(json.crates[2].name, "other_sort");
+        assert_eq!(json.crates[1].name, "other_sort");
+        assert_eq!(json.crates[2].name, "baz_sort");
         assert_eq!(json.crates[3].name, "foo_sort");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=new");
     assert_eq!(resp[0].crates[0].name, "bar_sort");
-    assert_eq!(resp[1].crates[0].name, "baz_sort");
-    assert_eq!(resp[2].crates[0].name, "other_sort");
+    assert_eq!(resp[1].crates[0].name, "other_sort");
+    assert_eq!(resp[2].crates[0].name, "baz_sort");
     assert_eq!(resp[3].crates[0].name, "foo_sort");
     assert_eq!(resp[3].meta.total, 4);
     assert_eq!(calls, 5);
@@ -466,14 +466,14 @@ fn index_sorting() {
     // by descending downloads
     for json in search_both(&anon, "sort=recent-downloads") {
         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[0].name, "baz_sort");
+        assert_eq!(json.crates[1].name, "foo_sort");
         assert_eq!(json.crates[2].name, "bar_sort");
         assert_eq!(json.crates[3].name, "other_sort");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=recent-downloads");
-    assert_eq!(resp[0].crates[0].name, "foo_sort");
-    assert_eq!(resp[1].crates[0].name, "baz_sort");
+    assert_eq!(resp[0].crates[0].name, "baz_sort");
+    assert_eq!(resp[1].crates[0].name, "foo_sort");
     assert_eq!(resp[2].crates[0].name, "bar_sort");
     assert_eq!(resp[3].crates[0].name, "other_sort");
     assert_eq!(resp[3].meta.total, 4);