RUST-602 Deserialize ObjectId from a hex string (#220)

Author: isabelatkinson

src/de/serde.rs

@@ -30,14 +30,19 @@ impl<'de> Deserialize<'de> for ObjectId {
     where
         D: de::Deserializer<'de>,
     {
-        deserializer.deserialize_map(BsonVisitor).and_then(|bson| {
-            if let Bson::ObjectId(oid) = bson {
-                Ok(oid)
-            } else {
-                let err = format!("expected objectId extended document, found {}", bson);
-                Err(de::Error::invalid_type(Unexpected::Map, &&err[..]))
-            }
-        })
+        deserializer
+            .deserialize_any(BsonVisitor)
+            .and_then(|bson| match bson {
+                Bson::String(oid) => ObjectId::with_string(&oid).map_err(de::Error::custom),
+                Bson::ObjectId(oid) => Ok(oid),
+                _ => {
+                    let err = format!(
+                        "expected objectId extended document or hex string, found {}",
+                        bson
+                    );
+                    Err(de::Error::invalid_type(Unexpected::Map, &&err[..]))
+                }
+            })
     }
 }
 

src/tests/serde.rs

@@ -5,6 +5,7 @@ use crate::{
     compat::u2f,
     doc,
     from_bson,
+    oid::ObjectId,
     spec::BinarySubtype,
     tests::LOCK,
     to_bson,
@@ -558,3 +559,17 @@ fn test_de_db_pointer() {
 
     assert_eq!(foo.db_pointer, db_pointer.clone());
 }
+
+#[test]
+fn test_de_oid_string() {
+    let _guard = LOCK.run_concurrently();
+
+    #[derive(Debug, Deserialize)]
+    struct Foo {
+        pub oid: ObjectId,
+    }
+
+    let foo: Foo = serde_json::from_str("{ \"oid\": \"507f1f77bcf86cd799439011\" }").unwrap();
+    let oid = ObjectId::with_string("507f1f77bcf86cd799439011").unwrap();
+    assert_eq!(foo.oid, oid);
+}