fix get contact by id

whisperfish · Jan 10, 2023 · 6b29208 · 6b29208
1 parent f98e541
commit 6b29208
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -61,6 +61,8 @@ pub enum Error {
     MigrationConflict,
     #[error("I/O error: {0}")]
     FsError(#[from] fs_extra::error::Error),
+    #[error("Could not find a contact with the given UUID")]
+    ContactNotFound
 }
 
 impl Error {

diff --git a/src/store/sled.rs b/src/store/sled.rs
@@ -355,9 +355,8 @@ impl ContactsStore for SledStore {
 
     fn contact_by_id(&self, id: Uuid) -> Result<Option<Contact>, Error> {
         self.get(SLED_KEY_CONTACTS, id)?
-            .map(|b: Vec<u8>| serde_json::from_slice(&b))
-            .transpose()
-            .map_err(Error::from)
+            .map(|contact: Contact| Some(contact))
+            .ok_or(Error::ContactNotFound)
     }
 }