views: Implement from() method for EncodableVersion

Author: Turbo87

src/controllers/krate/metadata.rs

@@ -176,7 +176,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
         ),
         versions: versions_publishers_and_audit_actions
             .into_iter()
-            .map(|(v, pb, aas)| v.encodable(&krate.name, pb, aas))
+            .map(|(v, pb, aas)| EncodableVersion::from(v, &krate.name, pb, aas))
             .collect(),
         keywords: kws.into_iter().map(Keyword::into).collect(),
         categories: cats.into_iter().map(Category::into).collect(),
@@ -226,7 +226,7 @@ pub fn versions(req: &mut dyn RequestExt) -> EndpointResult {
     let versions = versions_and_publishers
         .into_iter()
         .zip(VersionOwnerAction::for_versions(&conn, &versions)?.into_iter())
-        .map(|((v, pb), aas)| v.encodable(crate_name, pb, aas))
+        .map(|((v, pb), aas)| EncodableVersion::from(v, crate_name, pb, aas))
         .collect();
 
     #[derive(Serialize)]
@@ -271,7 +271,7 @@ pub fn reverse_dependencies(req: &mut dyn RequestExt) -> EndpointResult {
         .into_iter()
         .zip(VersionOwnerAction::for_versions(&conn, &versions)?.into_iter())
         .map(|((version, krate_name, published_by), actions)| {
-            version.encodable(&krate_name, published_by, actions)
+            EncodableVersion::from(version, &krate_name, published_by, actions)
         })
         .collect();
 

src/controllers/version/deprecated.rs

@@ -41,7 +41,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
         .into_iter()
         .zip(VersionOwnerAction::for_versions(&conn, &versions)?.into_iter())
         .map(|((version, crate_name, published_by), actions)| {
-            version.encodable(&crate_name, published_by, actions)
+            EncodableVersion::from(version, &crate_name, published_by, actions)
         })
         .collect();
 
@@ -76,6 +76,6 @@ pub fn show_by_id(req: &mut dyn RequestExt) -> EndpointResult {
         version: EncodableVersion,
     }
     Ok(req.json(&R {
-        version: version.encodable(&krate.name, published_by, audit_actions),
+        version: EncodableVersion::from(version, &krate.name, published_by, audit_actions),
     }))
 }

src/controllers/version/metadata.rs

@@ -81,6 +81,6 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
         version: EncodableVersion,
     }
     Ok(req.json(&R {
-        version: version.encodable(&krate.name, published_by, actions),
+        version: EncodableVersion::from(version, &krate.name, published_by, actions),
     }))
 }

src/views.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 use crate::github;
 use crate::models::{
     Badge, Category, CrateOwnerInvitation, CreatedApiToken, Dependency, DependencyKind, Keyword,
-    Owner, ReverseDependency, Team, User, VersionDownload,
+    Owner, ReverseDependency, Team, User, Version, VersionDownload, VersionOwnerAction,
 };
 use crate::util::rfc3339;
 
@@ -446,6 +446,17 @@ pub struct EncodableVersion {
     pub audit_actions: Vec<EncodableAuditAction>,
 }
 
+impl EncodableVersion {
+    pub fn from(
+        version: Version,
+        crate_name: &str,
+        published_by: Option<User>,
+        audit_actions: Vec<(VersionOwnerAction, User)>,
+    ) -> Self {
+        version.encodable(crate_name, published_by, audit_actions)
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EncodableVersionLinks {
     pub dependencies: String,