controllers/helpers/pagination: Remove tuple struct support for seek!

Author: eth3lbert

src/controllers/helpers/pagination.rs

@@ -403,11 +403,6 @@ impl<T, C> PaginatedQueryWithCountSubq<T, C> {
 
 #[allow(unused_macro_rules)]
 macro_rules! seek {
-    // Tuple struct
-    (@variant_struct $vis:vis $variant:ident($($(#[$field_meta:meta])? $ty:ty),*)) => {
-        #[derive(Debug, Default, Deserialize, Serialize, PartialEq)]
-        $vis struct $variant($($(#[$field_meta])? pub(super) $ty),*);
-    };
     // Field struct
     (@variant_struct $vis:vis $variant:ident {
         $($(#[$field_meta:meta])? $field:ident: $ty:ty),*
@@ -616,9 +611,6 @@ mod tests {
         use chrono::naive::serde::ts_microseconds;
         seek! {
             pub(super) enum Seek {
-                Id(i32)
-                New(#[serde(with="ts_microseconds")] chrono::NaiveDateTime, i32)
-                RecentDownloads(Option<i64>, i32)
                 NamedId{id: i32}
                 NamedNew{#[serde(with="ts_microseconds")] dt: chrono::NaiveDateTime, id: i32}
                 NamedRecentDownloads{ downloads: Option<i64>, id: i32 }
@@ -632,51 +624,6 @@ mod tests {
         use chrono::{NaiveDate, NaiveDateTime};
         use seek::*;
 
-        let assert_decode_after = |seek: Seek, query: &str, expect| {
-            let pagination = PaginationOptions::builder()
-                .enable_seek(true)
-                .gather(&mock(query))
-                .unwrap();
-            let decoded = seek.after(&pagination.page).unwrap();
-            assert_eq!(decoded, expect);
-        };
-
-        // Tuple struct
-        let seek = Seek::Id;
-        let payload = SeekPayload::Id(Id(1234));
-        let query = format!("seek={}", encode_seek(&payload).unwrap());
-        assert_decode_after(seek, &query, Some(payload));
-
-        let dt: NaiveDateTime = NaiveDate::from_ymd_opt(2016, 7, 8)
-            .unwrap()
-            .and_hms_opt(9, 10, 11)
-            .unwrap();
-        let seek = Seek::New;
-        let payload = SeekPayload::New(New(dt, 1234));
-        let query = format!("seek={}", encode_seek(&payload).unwrap());
-        assert_decode_after(seek, &query, Some(payload));
-
-        let seek = Seek::RecentDownloads;
-        let payload = SeekPayload::RecentDownloads(RecentDownloads(Some(5678), 1234));
-        let query = format!("seek={}", encode_seek(&payload).unwrap());
-        assert_decode_after(seek, &query, Some(payload));
-
-        let seek = Seek::Id;
-        assert_decode_after(seek, "", None);
-
-        let seek = Seek::Id;
-        let payload = SeekPayload::RecentDownloads(RecentDownloads(Some(5678), 1234));
-        let query = format!("seek={}", encode_seek(payload).unwrap());
-        let pagination = PaginationOptions::builder()
-            .enable_seek(true)
-            .gather(&mock(&query))
-            .unwrap();
-        let error = seek.after(&pagination.page).unwrap_err();
-        assert_eq!(error.to_string(), "invalid seek parameter");
-        let response = error.response();
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        // Field struct
         let id = 1234;
         let seek = Seek::NamedId;
         let payload = SeekPayload::NamedId(NamedId { id });
@@ -729,22 +676,6 @@ mod tests {
     fn test_seek_macro_conv() {
         use chrono::{NaiveDate, NaiveDateTime};
         use seek::*;
-
-        // Tuple struct
-        assert_eq!(Seek::from(SeekPayload::Id(Id(1234))), Seek::Id);
-
-        let dt: NaiveDateTime = NaiveDate::from_ymd_opt(2016, 7, 8)
-            .unwrap()
-            .and_hms_opt(9, 10, 11)
-            .unwrap();
-        assert_eq!(Seek::from(SeekPayload::New(New(dt, 1234))), Seek::New);
-
-        assert_eq!(
-            Seek::from(SeekPayload::RecentDownloads(RecentDownloads(None, 1234))),
-            Seek::RecentDownloads
-        );
-
-        // Field struct
         let id = 1234;
         assert_eq!(
             Seek::from(SeekPayload::NamedId(NamedId { id })),