models/version: Convert highest and newest fields to Option

Author: Turbo87

src/models/krate.rs

@@ -345,6 +345,18 @@ impl Crate {
         let badges = badges.map(|bs| bs.into_iter().map(Badge::into).collect());
         let documentation = Crate::remove_blocked_documentation_urls(documentation);
 
+        let max_version = top_versions
+            .highest
+            .as_ref()
+            .map(|v| v.to_string())
+            .unwrap_or_else(|| "0.0.0".to_string());
+
+        let newest_version = top_versions
+            .newest
+            .as_ref()
+            .map(|v| v.to_string())
+            .unwrap_or_else(|| "0.0.0".to_string());
+
         EncodableCrate {
             id: name.clone(),
             name: name.clone(),
@@ -356,8 +368,8 @@ impl Crate {
             keywords: keyword_ids,
             categories: category_ids,
             badges,
-            max_version: top_versions.highest.to_string(),
-            newest_version: top_versions.newest.to_string(),
+            max_version,
+            newest_version,
             documentation,
             homepage,
             exact_match,

src/models/version.rs

@@ -42,9 +42,9 @@ pub struct NewVersion {
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct TopVersions {
     /// The "highest" version in terms of semver
-    pub highest: semver::Version,
+    pub highest: Option<semver::Version>,
     /// The "newest" version in terms of publishing date
-    pub newest: semver::Version,
+    pub newest: Option<semver::Version>,
 }
 
 impl TopVersions {
@@ -63,21 +63,7 @@ impl TopVersions {
         let newest = pairs.clone().into_iter().max().map(|(_, v)| v);
         let highest = pairs.into_iter().map(|(_, v)| v).max();
 
-        Self {
-            newest: newest.unwrap_or_else(default_semver_version),
-            highest: highest.unwrap_or_else(default_semver_version),
-        }
-    }
-}
-
-/// A default semver value, "0.0.0", for use in TopVersions
-fn default_semver_version() -> semver::Version {
-    semver::Version {
-        major: 0,
-        minor: 0,
-        patch: 0,
-        pre: vec![],
-        build: vec![],
+        Self { newest, highest }
     }
 }
 
@@ -275,8 +261,8 @@ mod tests {
         assert_eq!(
             TopVersions::from_date_version_pairs(versions),
             TopVersions {
-                highest: version("0.0.0"),
-                newest: version("0.0.0"),
+                highest: None,
+                newest: None,
             }
         );
     }
@@ -287,8 +273,8 @@ mod tests {
         assert_eq!(
             TopVersions::from_date_version_pairs(versions),
             TopVersions {
-                highest: version("1.0.0"),
-                newest: version("1.0.0"),
+                highest: Some(version("1.0.0")),
+                newest: Some(version("1.0.0")),
             }
         );
     }
@@ -303,8 +289,8 @@ mod tests {
         assert_eq!(
             TopVersions::from_date_version_pairs(versions),
             TopVersions {
-                highest: version("2.0.0-alpha.1"),
-                newest: version("1.1.0"),
+                highest: Some(version("2.0.0-alpha.1")),
+                newest: Some(version("1.1.0")),
             }
         );
     }