Have version encode take an optional User that published the crate

Always pass None for the moment

Author: carols10cents

src/controllers/krate/metadata.rs

@@ -148,7 +148,7 @@ pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
         ),
         versions: versions
             .into_iter()
-            .map(|v| v.encodable(&krate.name))
+            .map(|v| v.encodable(&krate.name, None))
             .collect(),
         keywords: kws.into_iter().map(|k| k.encodable()).collect(),
         categories: cats.into_iter().map(|k| k.encodable()).collect(),
@@ -189,7 +189,7 @@ pub fn versions(req: &mut dyn Request) -> CargoResult<Response> {
     versions.sort_by(|a, b| b.num.cmp(&a.num));
     let versions = versions
         .into_iter()
-        .map(|v| v.encodable(crate_name))
+        .map(|v| v.encodable(crate_name, None))
         .collect();
 
     #[derive(Serialize)]
@@ -221,7 +221,7 @@ pub fn reverse_dependencies(req: &mut dyn Request) -> CargoResult<Response> {
         .select((versions::all_columns, crates::name))
         .load::<(Version, String)>(&*conn)?
         .into_iter()
-        .map(|(version, krate_name)| version.encodable(&krate_name))
+        .map(|(version, krate_name)| version.encodable(&krate_name, None))
         .collect();
 
     #[derive(Serialize)]

src/controllers/user/me.rs

@@ -68,7 +68,7 @@ pub fn updates(req: &mut dyn Request) -> CargoResult<Response> {
 
     let versions = data
         .into_iter()
-        .map(|((version, crate_name), _)| version.encodable(&crate_name))
+        .map(|((version, crate_name), _)| version.encodable(&crate_name, None))
         .collect();
 
     #[derive(Serialize)]

src/controllers/version/deprecated.rs

@@ -28,7 +28,7 @@ pub fn index(req: &mut dyn Request) -> CargoResult<Response> {
         .filter(versions::id.eq(any(ids)))
         .load::<(Version, String)>(&*conn)?
         .into_iter()
-        .map(|(version, crate_name)| version.encodable(&crate_name))
+        .map(|(version, crate_name)| version.encodable(&crate_name, None))
         .collect();
 
     #[derive(Serialize)]
@@ -56,6 +56,6 @@ pub fn show_by_id(req: &mut dyn Request) -> CargoResult<Response> {
         version: EncodableVersion,
     }
     Ok(req.json(&R {
-        version: version.encodable(&krate.name),
+        version: version.encodable(&krate.name, None),
     }))
 }

src/controllers/version/metadata.rs

@@ -74,6 +74,6 @@ pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
         version: EncodableVersion,
     }
     Ok(req.json(&R {
-        version: version.encodable(&krate.name),
+        version: version.encodable(&krate.name, None),
     }))
 }

src/models/version.rs

@@ -5,7 +5,7 @@ use diesel::prelude::*;
 
 use crate::util::{human, CargoResult};
 
-use crate::models::{Crate, Dependency};
+use crate::models::{Crate, Dependency, User};
 use crate::schema::*;
 use crate::views::{EncodableVersion, EncodableVersionLinks};
 
@@ -38,7 +38,7 @@ pub struct NewVersion {
 }
 
 impl Version {
-    pub fn encodable(self, crate_name: &str) -> EncodableVersion {
+    pub fn encodable(self, crate_name: &str, published_by: Option<User>) -> EncodableVersion {
         let Version {
             id,
             num,
@@ -49,7 +49,6 @@ impl Version {
             yanked,
             license,
             crate_size,
-            published_by,
             ..
         } = self;
         let num = num.to_string();
@@ -71,7 +70,7 @@ impl Version {
                 authors: format!("/api/v1/crates/{}/{}/authors", crate_name, num),
             },
             crate_size,
-            published_by,
+            published_by: published_by.map(|pb| pb.encodable_public()),
         }
     }
 

src/views/mod.rs

@@ -201,7 +201,7 @@ pub struct EncodableVersion {
     pub license: Option<String>,
     pub links: EncodableVersionLinks,
     pub crate_size: Option<i32>,
-    pub published_by: Option<i32>,
+    pub published_by: Option<EncodablePublicUser>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -305,7 +305,7 @@ mod tests {
                 authors: "".to_string(),
             },
             crate_size: Some(1234),
-            published_by: Some(1),
+            published_by: None,
         };
         let json = serde_json::to_string(&ver).unwrap();
         assert!(json