Move Encodable* structs for Category and Keyword to the views module

Author: jtgeibel

src/category.rs

@@ -3,6 +3,7 @@ use diesel::*;
 
 use models::Crate;
 use schema::*;
+use views::EncodableCategory;
 
 #[derive(Clone, Identifiable, Queryable, QueryableByName, Debug)]
 #[table_name = "categories"]
@@ -25,27 +26,6 @@ pub struct CrateCategory {
     category_id: i32,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-pub struct EncodableCategory {
-    pub id: String,
-    pub category: String,
-    pub slug: String,
-    pub description: String,
-    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
-    pub crates_cnt: i32,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct EncodableCategoryWithSubcategories {
-    pub id: String,
-    pub category: String,
-    pub slug: String,
-    pub description: String,
-    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
-    pub crates_cnt: i32,
-    pub subcategories: Vec<EncodableCategory>,
-}
-
 impl Category {
     pub fn encodable(self) -> EncodableCategory {
         let Category {
@@ -184,6 +164,8 @@ mod tests {
     use serde_json;
     use std::env;
 
+    use views::EncodableCategoryWithSubcategories;
+
     fn pg_connection() -> PgConnection {
         let _ = dotenv();
         let database_url =

src/keyword.rs

@@ -4,6 +4,7 @@ use diesel;
 
 use models::Crate;
 use schema::*;
+use views::EncodableKeyword;
 
 #[derive(Clone, Identifiable, Queryable, Debug)]
 pub struct Keyword {
@@ -23,14 +24,6 @@ pub struct CrateKeyword {
     keyword_id: i32,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-pub struct EncodableKeyword {
-    pub id: String,
-    pub keyword: String,
-    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
-    pub crates_cnt: i32,
-}
-
 impl Keyword {
     pub fn find_by_keyword(conn: &PgConnection, name: &str) -> QueryResult<Keyword> {
         keywords::table

src/views/mod.rs

@@ -1,12 +1,43 @@
 // TODO: Move all encodable types here
 // For now, just reexport
 
+use chrono::NaiveDateTime;
+
 pub use badge::EncodableBadge;
-pub use category::{EncodableCategory, EncodableCategoryWithSubcategories};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct EncodableCategory {
+    pub id: String,
+    pub category: String,
+    pub slug: String,
+    pub description: String,
+    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
+    pub crates_cnt: i32,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct EncodableCategoryWithSubcategories {
+    pub id: String,
+    pub category: String,
+    pub slug: String,
+    pub description: String,
+    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
+    pub crates_cnt: i32,
+    pub subcategories: Vec<EncodableCategory>,
+}
+
 pub use crate_owner_invitation::{EncodableCrateOwnerInvitation, InvitationResponse};
 pub use dependency::EncodableDependency;
 pub use download::EncodableVersionDownload;
-pub use keyword::EncodableKeyword;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct EncodableKeyword {
+    pub id: String,
+    pub keyword: String,
+    #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
+    pub crates_cnt: i32,
+}
+
 pub use krate::EncodableCrate;
 pub use owner::{EncodableOwner, EncodableTeam};
 pub use token::EncodableApiTokenWithToken;