Move keyword api endpoints under controllers

Author: jtgeibel

src/controllers/keyword.rs

@@ -0,0 +1,66 @@
+use diesel::prelude::*;
+use conduit::{Request, Response};
+use conduit_router::RequestParams;
+use db::RequestTransaction;
+use util::{CargoResult, RequestUtils};
+
+use controllers::helpers::Paginate;
+use models::Keyword;
+use views::EncodableKeyword;
+
+/// Handles the `GET /keywords` route.
+pub fn index(req: &mut Request) -> CargoResult<Response> {
+    use schema::keywords;
+
+    let conn = req.db_conn()?;
+    let (offset, limit) = req.pagination(10, 100)?;
+    let query = req.query();
+    let sort = query.get("sort").map(|s| &s[..]).unwrap_or("alpha");
+
+    let mut query = keywords::table.into_boxed();
+
+    if sort == "crates" {
+        query = query.order(keywords::crates_cnt.desc());
+    } else {
+        query = query.order(keywords::keyword.asc());
+    }
+
+    let data = query
+        .paginate(limit, offset)
+        .load::<(Keyword, i64)>(&*conn)?;
+    let total = data.get(0).map(|&(_, t)| t).unwrap_or(0);
+    let kws = data.into_iter()
+        .map(|(k, _)| k.encodable())
+        .collect::<Vec<_>>();
+
+    #[derive(Serialize)]
+    struct R {
+        keywords: Vec<EncodableKeyword>,
+        meta: Meta,
+    }
+    #[derive(Serialize)]
+    struct Meta {
+        total: i64,
+    }
+
+    Ok(req.json(&R {
+        keywords: kws,
+        meta: Meta { total: total },
+    }))
+}
+
+/// Handles the `GET /keywords/:keyword_id` route.
+pub fn show(req: &mut Request) -> CargoResult<Response> {
+    let name = &req.params()["keyword_id"];
+    let conn = req.db_conn()?;
+
+    let kw = Keyword::find_by_keyword(&conn, name)?;
+
+    #[derive(Serialize)]
+    struct R {
+        keyword: EncodableKeyword,
+    }
+    Ok(req.json(&R {
+        keyword: kw.encodable(),
+    }))
+}

src/controllers/mod.rs

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

src/keyword.rs

@@ -1,13 +1,7 @@
 use chrono::NaiveDateTime;
-use conduit::{Request, Response};
-use conduit_router::RequestParams;
 use diesel::prelude::*;
 use diesel;
 
-use db::RequestTransaction;
-use controllers::helpers::Paginate;
-use util::{CargoResult, RequestUtils};
-
 use models::Crate;
 use schema::*;
 
@@ -107,63 +101,6 @@ impl Keyword {
     }
 }
 
-/// Handles the `GET /keywords` route.
-pub fn index(req: &mut Request) -> CargoResult<Response> {
-    use schema::keywords;
-
-    let conn = req.db_conn()?;
-    let (offset, limit) = req.pagination(10, 100)?;
-    let query = req.query();
-    let sort = query.get("sort").map(|s| &s[..]).unwrap_or("alpha");
-
-    let mut query = keywords::table.into_boxed();
-
-    if sort == "crates" {
-        query = query.order(keywords::crates_cnt.desc());
-    } else {
-        query = query.order(keywords::keyword.asc());
-    }
-
-    let data = query
-        .paginate(limit, offset)
-        .load::<(Keyword, i64)>(&*conn)?;
-    let total = data.get(0).map(|&(_, t)| t).unwrap_or(0);
-    let kws = data.into_iter()
-        .map(|(k, _)| k.encodable())
-        .collect::<Vec<_>>();
-
-    #[derive(Serialize)]
-    struct R {
-        keywords: Vec<EncodableKeyword>,
-        meta: Meta,
-    }
-    #[derive(Serialize)]
-    struct Meta {
-        total: i64,
-    }
-
-    Ok(req.json(&R {
-        keywords: kws,
-        meta: Meta { total: total },
-    }))
-}
-
-/// Handles the `GET /keywords/:keyword_id` route.
-pub fn show(req: &mut Request) -> CargoResult<Response> {
-    let name = &req.params()["keyword_id"];
-    let conn = req.db_conn()?;
-
-    let kw = Keyword::find_by_keyword(&conn, name)?;
-
-    #[derive(Serialize)]
-    struct R {
-        keyword: EncodableKeyword,
-    }
-    Ok(req.json(&R {
-        keyword: kw.encodable(),
-    }))
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/lib.rs

@@ -186,8 +186,8 @@ pub fn middleware(app: Arc<App>) -> MiddlewareBuilder {
         "/crates/:crate_id/reverse_dependencies",
         C(krate::metadata::reverse_dependencies),
     );
-    api_router.get("/keywords", C(keyword::index));
-    api_router.get("/keywords/:keyword_id", C(keyword::show));
+    api_router.get("/keywords", C(controllers::keyword::index));
+    api_router.get("/keywords/:keyword_id", C(controllers::keyword::show));
     api_router.get("/categories", C(category::index));
     api_router.get("/categories/:category_id", C(category::show));
     api_router.get("/category_slugs", C(category::slugs));