controllers/helpers/pagination: Add PaginationOptions::is_explicit() fn

This also remove the obsolete `Paginated::is_explicit_page()`.

Author: eth3lbert

src/controllers/helpers/pagination.rs

@@ -60,6 +60,10 @@ impl PaginationOptions {
     pub(crate) fn is_backward(&self) -> bool {
         matches!(self.page, Page::SeekBackward(_))
     }
+
+    pub(crate) fn is_explicit(&self) -> bool {
+        matches!(self.page, Page::Numeric(_))
+    }
 }
 
 #[derive(Debug, Deserialize, FromRequestParts, utoipa::IntoParams)]
@@ -251,7 +255,8 @@ impl<T> Paginated<T> {
         S: Serialize,
     {
         // TODO: handle this more properly when seek backward comes into play.
-        if self.is_explicit_page() || self.records_and_total.len() < self.options.per_page as usize
+        if self.options.is_explicit()
+            || self.records_and_total.len() < self.options.per_page as usize
         {
             return Ok(None);
         }
@@ -267,10 +272,6 @@ impl<T> Paginated<T> {
         Ok(Some(opts))
     }
 
-    fn is_explicit_page(&self) -> bool {
-        matches!(&self.options.page, Page::Numeric(_))
-    }
-
     pub(crate) fn iter(&self) -> impl Iterator<Item = &T> {
         self.records_and_total.iter().map(|row| &row.record)
     }

src/controllers/krate/search.rs

@@ -21,7 +21,7 @@ use crate::schema::*;
 use crate::util::errors::{AppResult, bad_request};
 use crate::views::EncodableCrate;
 
-use crate::controllers::helpers::pagination::{Page, PaginationOptions, PaginationQueryParams};
+use crate::controllers::helpers::pagination::{PaginationOptions, PaginationQueryParams};
 use crate::models::krate::ALL_COLUMNS;
 use crate::util::RequestUtils;
 use crate::util::string_excl_null::StringExclNull;
@@ -219,12 +219,10 @@ pub async fn list_crates(
         };
     }
 
-    let explicit_page = matches!(pagination.page, Page::Numeric(_));
-
     // To avoid breaking existing users, seek-based pagination is only used if an explicit page has
     // not been provided. This way clients relying on meta.next_page will use the faster seek-based
     // paginations, while client hardcoding pages handling will use the slower offset-based code.
-    let (total, next_page, prev_page, data) = if !explicit_page && seek.is_some() {
+    let (total, next_page, prev_page, data) = if !pagination.is_explicit() && seek.is_some() {
         let seek = seek.unwrap();
         if let Some(condition) = seek
             .decode(&pagination.page)?

src/controllers/krate/versions.rs

@@ -155,11 +155,10 @@ async fn list_by_date(
     let mut query = make_base_query();
 
     if let Some(options) = options {
-        assert!(
-            !matches!(&options.page, Page::Numeric(_)),
-            "?page= is not supported"
-        );
-        if let Some(SeekPayload::Date(Date { created_at, id })) = Seek::Date.decode(&options.page)? {
+        assert!(!options.is_explicit(), "?page= is not supported");
+        if let Some(SeekPayload::Date(Date { created_at, id })) =
+            Seek::Date.decode(&options.page)?
+        {
             query = query.filter(
                 versions::created_at
                     .eq(created_at)
@@ -282,10 +281,7 @@ async fn list_by_semver(
         sorted_versions
             .sort_unstable_by(|_, (semver_a, _, _), _, (semver_b, _, _)| semver_b.cmp(semver_a));
 
-        assert!(
-            !matches!(&options.page, Page::Numeric(_)),
-            "?page= is not supported"
-        );
+        assert!(!options.is_explicit(), "?page= is not supported");
 
         let release_tracks = include.release_tracks.then(|| {
             ReleaseTracks::from_sorted_semver_iter(
@@ -422,7 +418,7 @@ where
     F: Fn(&T) -> S,
     S: serde::Serialize,
 {
-    if matches!(options.page, Page::Numeric(_)) || records.len() < options.per_page as usize {
+    if options.is_explicit() || records.len() < options.per_page as usize {
         return Ok(None);
     }