Provide way to serialize comparison::ArtifactData

Author: rylev

site/src/api.rs

@@ -166,7 +166,6 @@ pub mod comparison {
     pub struct Request {
         pub start: Bound,
         pub end: Bound,
-
         pub stat: String,
     }
 
@@ -186,7 +185,7 @@ pub mod comparison {
         pub is_contiguous: bool,
     }
 
-    /// A serializable wrapper for `comparison::ArtifactData`
+    /// A serializable wrapper for `comparison::ArtifactData`.
     #[derive(Debug, Clone, Serialize)]
     pub struct ArtifactData {
         pub commit: String,

site/src/comparison.rs

@@ -100,34 +100,8 @@ pub async fn handle_compare(
 
     Ok(api::comparison::Response {
         prev,
-        a: api::comparison::ArtifactData {
-            commit: match comparison.a.artifact.clone() {
-                ArtifactId::Commit(c) => c.sha,
-                ArtifactId::Artifact(t) => t,
-            },
-            date: if let ArtifactId::Commit(c) = &comparison.a.artifact {
-                Some(c.date)
-            } else {
-                None
-            },
-            pr: comparison.a.pr,
-            data: comparison.a.data,
-            bootstrap: comparison.a.bootstrap,
-        },
-        b: api::comparison::ArtifactData {
-            commit: match comparison.b.artifact.clone() {
-                ArtifactId::Commit(c) => c.sha,
-                ArtifactId::Artifact(t) => t,
-            },
-            date: if let ArtifactId::Commit(c) = &comparison.b.artifact {
-                Some(c.date)
-            } else {
-                None
-            },
-            pr: comparison.b.pr,
-            data: comparison.b.data,
-            bootstrap: comparison.b.bootstrap,
-        },
+        a: comparison.a.into(),
+        b: comparison.b.into(),
         next,
         is_contiguous,
     })
@@ -374,6 +348,25 @@ impl ArtifactData {
     }
 }
 
+impl From<ArtifactData> for api::comparison::ArtifactData {
+    fn from(data: ArtifactData) -> Self {
+        api::comparison::ArtifactData {
+            commit: match data.artifact.clone() {
+                ArtifactId::Commit(c) => c.sha,
+                ArtifactId::Artifact(t) => t,
+            },
+            date: if let ArtifactId::Commit(c) = &data.artifact {
+                Some(c.date)
+            } else {
+                None
+            },
+            pr: data.pr,
+            data: data.data,
+            bootstrap: data.bootstrap,
+        }
+    }
+}
+
 // A comparison of two artifacts
 pub struct Comparison {
     pub a: ArtifactData,