Properly allow last_snapshot and last_gc to be optional.

Author: terjekv

src/models/cvmfs_status_json.rs

@@ -4,9 +4,10 @@ use crate::models::generic::MaybeRfc2822DateTime;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct StatusJSON {
-    #[serde(default = "MaybeRfc2822DateTime::default")]
-    pub last_snapshot: MaybeRfc2822DateTime,
-    pub last_gc: MaybeRfc2822DateTime,
+    #[serde(default)]
+    pub last_snapshot: Option<MaybeRfc2822DateTime>,
+    #[serde(default)]
+    pub last_gc: Option<MaybeRfc2822DateTime>,
 }
 
 #[cfg(test)]
@@ -27,20 +28,41 @@ mod tests {
 
         // Wed, 18 Feb 2015 23:16:09 GMT
         assert_eq!(
-            status.last_snapshot.try_into_datetime().unwrap(),
+            status.last_snapshot.unwrap().try_into_datetime().unwrap(),
             Some(
                 Rfc2822DateTime::from("Fri, 21 Jun 2024 17:40:02 +0000")
                     .try_into()
                     .unwrap()
             )
         );
         assert_eq!(
-            status.last_gc.try_into_datetime().unwrap(),
+            status.last_gc.unwrap().try_into_datetime().unwrap(),
             Some(
                 Rfc2822DateTime::from("Sun, 16 Jun 2024 00:00:59 +0000")
                     .try_into()
                     .unwrap()
             )
         );
     }
+
+    #[test]
+    fn test_status_json_deserialization_missing_last_gc() {
+        let json_data = r#"
+        {
+            "last_snapshot": "Fri Jun 21 17:40:02 UTC 2024"
+        }
+        "#;
+
+        let status: StatusJSON = serde_json::from_str(json_data).unwrap();
+
+        // Wed, 18 Feb 2015 23:16:09 GMT
+        assert_eq!(
+            status.last_snapshot.unwrap().try_into_datetime().unwrap(),
+            Some(
+                Rfc2822DateTime::from("Fri, 21 Jun 2024 17:40:02 +0000")
+                    .try_into()
+                    .unwrap()
+            )
+        );
+    }
 }

src/models/servers.rs

@@ -712,14 +712,18 @@ impl RepositoryOrReplica {
 pub struct PopulatedRepositoryOrReplica {
     pub name: String,
     pub manifest: Manifest,
-    pub last_snapshot: MaybeRfc2822DateTime,
-    pub last_gc: MaybeRfc2822DateTime,
+    pub last_snapshot: Option<MaybeRfc2822DateTime>,
+    pub last_gc: Option<MaybeRfc2822DateTime>,
 }
 
 impl PopulatedRepositoryOrReplica {
     pub fn output(&self) {
-        println!("  Last Snapshot: {}", self.last_snapshot);
-        println!("  Last GC: {}", self.last_gc);
+        if self.last_gc.is_some() {
+            println!("  Last Snapshot: {}", self.last_snapshot.as_ref().unwrap());
+        }
+        if self.last_gc.is_some() {
+            println!("  Last GC: {}", self.last_gc.as_ref().unwrap());
+        }
         self.manifest.output();
     }
     pub fn revision(&self) -> i32 {