Move pagination logic under controllers::helpers

Author: jtgeibel

src/controllers/helpers/mod.rs

@@ -0,0 +1,3 @@
+pub mod pagination;
+
+pub use self::pagination::Paginate;

src/pagination.rs renamed to src/controllers/helpers/pagination.rs

@@ -3,6 +3,7 @@ use diesel::query_builder::*;
 use diesel::sql_types::BigInt;
 use diesel::pg::Pg;
 
+#[derive(Debug)]
 pub struct Paginated<T> {
     query: T,
     limit: i64,

src/controllers/mod.rs

@@ -1 +1,3 @@
 // TODO: All endpoints would be moved to submodules here
+
+pub mod helpers;

src/keyword.rs

@@ -5,7 +5,7 @@ use diesel::prelude::*;
 use diesel;
 
 use db::RequestTransaction;
-use pagination::Paginate;
+use controllers::helpers::Paginate;
 use util::{CargoResult, RequestUtils};
 
 use models::Crate;

src/krate/search.rs

@@ -5,7 +5,7 @@ use diesel::prelude::*;
 use diesel_full_text_search::*;
 
 use db::RequestTransaction;
-use pagination::Paginate;
+use controllers::helpers::Paginate;
 use user::RequestUser;
 use util::{CargoResult, RequestUtils};
 

src/lib.rs

@@ -93,7 +93,6 @@ pub mod models;
 pub mod views;
 
 mod local_upload;
-mod pagination;
 mod with_count;
 
 /// Used for setting different values depending on whether the app is being run in production,

src/user/mod.rs

@@ -10,7 +10,7 @@ use serde_json;
 
 use app::RequestApp;
 use db::RequestTransaction;
-use pagination::Paginate;
+use controllers::helpers::Paginate;
 use util::{bad_request, human, CargoResult, RequestUtils};
 use github;
 use email;