Make a method to fetch the user the version was published by

And use it in places where there's only one version

Author: carols10cents

src/controllers/version/metadata.rs

@@ -68,12 +68,14 @@ pub fn authors(req: &mut dyn Request) -> CargoResult<Response> {
 /// API route to have.
 pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
     let (version, krate) = version_and_crate(req)?;
+    let conn = req.db_conn()?;
+    let published_by = version.published_by(&conn);
 
     #[derive(Serialize)]
     struct R {
         version: EncodableVersion,
     }
     Ok(req.json(&R {
-        version: version.encodable(&krate.name, None),
+        version: version.encodable(&krate.name, published_by),
     }))
 }

src/models/version.rs

@@ -110,6 +110,15 @@ impl Version {
             .set(rendered_at.eq(now))
             .execute(conn)
     }
+
+    /// Gets the User who ran `cargo publish` for this version, if recorded.
+    /// Not for use when you have a group of versions you need the publishers for.
+    pub fn published_by(&self, conn: &PgConnection) -> Option<User> {
+        match self.published_by {
+            Some(pb) => users::table.find(pb).first(conn).ok(),
+            None => None,
+        }
+    }
 }
 
 impl NewVersion {

src/tests/version.rs

@@ -47,12 +47,12 @@ fn index() {
 }
 
 #[test]
-fn show() {
+fn show_by_id() {
     let (app, anon, user) = TestApp::init().with_user();
     let user = user.as_model();
 
     let v = app.db(|conn| {
-        let krate = CrateBuilder::new("foo_vers_show", user.id).expect_build(conn);
+        let krate = CrateBuilder::new("foo_vers_show_id", user.id).expect_build(conn);
         VersionBuilder::new("2.0.0")
             .size(1234)
             .expect_build(krate.id, user.id, conn)
@@ -64,6 +64,47 @@ fn show() {
     assert_eq!(json.version.crate_size, Some(1234));
 }
 
+#[test]
+fn show_by_crate_name_and_semver_with_published_by() {
+    let (app, anon, user) = TestApp::init().with_user();
+    let user = user.as_model();
+
+    let v = app.db(|conn| {
+        let krate = CrateBuilder::new("foo_vers_show", user.id).expect_build(conn);
+        VersionBuilder::new("2.0.0")
+            .size(1234)
+            .expect_build(krate.id, user.id, conn)
+    });
+
+    let json: VersionResponse = anon.show_version("foo_vers_show", "2.0.0");
+    assert_eq!(json.version.id, v.id);
+    assert_eq!(json.version.crate_size, Some(1234));
+    assert_eq!(json.version.published_by.unwrap().login, user.gh_login);
+}
+
+#[test]
+fn show_by_crate_name_and_semver_no_published_by() {
+    use diesel::update;
+
+    let (app, anon, user) = TestApp::init().with_user();
+    let user = user.as_model();
+
+    app.db(|conn| {
+        CrateBuilder::new("foo_vers_show_no_pb", user.id)
+            .version("1.0.0")
+            .expect_build(conn);
+        // Mimic a version published before we started recording who published versions
+        let none: Option<i32> = None;
+        update(versions::table)
+            .set(versions::published_by.eq(none))
+            .execute(conn)
+            .unwrap();
+    });
+
+    let json: VersionResponse = anon.show_version("foo_vers_show_no_pb", "1.0.0");
+    assert!(json.version.published_by.is_none());
+}
+
 #[test]
 fn authors() {
     let (app, anon, user) = TestApp::init().with_user();