stuff happened

backend/public/src/state.rs

@@ -27,13 +27,7 @@ impl Cache {
     where
         T: for<'de> serde::Deserialize<'de>,
     {
-        if !self.inmem.is_connected() {
-            return Err(Box::new(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Not connected to cache".to_string(),
-            )));
-        }
-
+        self.is_connected()?;
         let value: Option<String> = self.inmem.get(&key).await?;
 
         match value {
@@ -56,23 +50,34 @@ impl Cache {
     where
         T: for<'de> serde::Deserialize<'de> + serde::Serialize,
     {
-        if !self.inmem.is_connected() {
-            return Err(Box::new(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Not connected to cache".to_string(),
-            )));
-        }
+        self.is_connected()?;
+        let json_string = match serde_json::to_string::<T>(contents) {
+            Ok(s) => s,
+            Err(_) => {
+                return Err(Box::new(std::io::Error::new(
+                    std::io::ErrorKind::Other,
+                    "Unable to deserialize contents passed to cache".to_string(),
+                )))
+            }
+        };
 
-        let json_string = serde_json::to_string(contents)?;
-        self.inmem
+        Ok(self
+            .inmem
             .set(key, json_string, expiration, set_opts, get)
-            .await?;
-
-        Ok(())
+            .await?)
     }
 
     pub async fn del(&mut self, key: String) -> Result<(), Box<dyn std::error::Error>> {
-        self.inmem.del(key).await?;
-        Ok(())
+        Ok(self.inmem.del(key).await?)
+    }
+
+    fn is_connected(&mut self) -> Result<(), Box<dyn std::error::Error>> {
+        match self.inmem.is_connected() {
+            true => Ok(()),
+            false => Err(Box::new(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "Not connected to cache".to_string(),
+            ))),
+        }
     }
 }