Split badge between model and view logic

Author: jtgeibel

src/lib.rs

@@ -63,7 +63,6 @@ use conduit_middleware::MiddlewareBuilder;
 use util::{R404, C, R};
 
 pub mod app;
-pub mod badge;
 pub mod boot;
 pub mod config;
 pub mod crate_owner_invitation;

src/badge.rs renamed to src/models/badge.rs

@@ -5,6 +5,7 @@ use std::collections::HashMap;
 
 use models::Crate;
 use schema::badges;
+use views::EncodableBadge;
 
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case", tag = "badge_type", content = "attributes")]
@@ -62,12 +63,6 @@ pub enum MaintenanceStatus {
     Deprecated,
 }
 
-#[derive(PartialEq, Debug, Serialize, Deserialize)]
-pub struct EncodableBadge {
-    pub badge_type: String,
-    pub attributes: HashMap<String, Option<String>>,
-}
-
 impl Queryable<badges::SqlType, Pg> for Badge {
     type Row = (i32, String, serde_json::Value);
 

src/models/mod.rs

@@ -1,4 +1,4 @@
-pub use badge::{Badge, MaintenanceStatus};
+pub use self::badge::{Badge, MaintenanceStatus};
 pub use self::category::{Category, CrateCategory, NewCategory};
 pub use crate_owner_invitation::NewCrateOwnerInvitation;
 pub use dependency::{Dependency, Kind, ReverseDependency};
@@ -13,6 +13,7 @@ pub use version::{NewVersion, Version};
 
 pub mod helpers;
 
+mod badge;
 mod category;
 mod follow;
 mod keyword;

src/views/mod.rs

@@ -1,9 +1,14 @@
 // TODO: Move all encodable types here
 // For now, just reexport
 
+use std::collections::HashMap;
 use chrono::NaiveDateTime;
 
-pub use badge::EncodableBadge;
+#[derive(PartialEq, Debug, Serialize, Deserialize)]
+pub struct EncodableBadge {
+    pub badge_type: String,
+    pub attributes: HashMap<String, Option<String>>,
+}
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EncodableCategory {