RUST-728 Inherit collection options in find and count_documents (#313)

Author: isabelatkinson

src/cmap/conn/command.rs

@@ -17,32 +17,15 @@ use crate::{
 pub(crate) struct Command {
     pub(crate) name: String,
     pub(crate) target_db: String,
-    pub(crate) read_pref: Option<ReadPreference>,
     pub(crate) body: Document,
 }
 
 impl Command {
-    /// Constructs a read command.
-    pub(crate) fn new_read(
-        name: String,
-        target_db: String,
-        read_pref: Option<ReadPreference>,
-        body: Document,
-    ) -> Self {
-        Self {
-            name,
-            target_db,
-            read_pref,
-            body,
-        }
-    }
-
     /// Constructs a new command.
     pub(crate) fn new(name: String, target_db: String, body: Document) -> Self {
         Self {
             name,
             target_db,
-            read_pref: None,
             body,
         }
     }
@@ -79,6 +62,11 @@ impl Command {
             self.body.insert("apiDeprecationErrors", deprecation_errors);
         }
     }
+
+    pub(crate) fn set_read_preference(&mut self, read_preference: ReadPreference) {
+        self.body
+            .insert("$readPreference", read_preference.into_document());
+    }
 }
 
 #[derive(Debug, Clone)]

src/cmap/conn/wire/message.rs

@@ -30,12 +30,6 @@ impl Message {
     pub(crate) fn with_command(mut command: Command, request_id: Option<i32>) -> Self {
         command.body.insert("$db", command.target_db);
 
-        if let Some(read_pref) = command.read_pref {
-            command
-                .body
-                .insert("$readPreference", read_pref.into_document());
-        };
-
         Self {
             response_to: 0,
             flags: MessageFlags::empty(),

src/cmap/establish/handshake/mod.rs

@@ -188,10 +188,9 @@ impl Handshaker {
 
         body.insert("client", metadata);
 
-        let mut command = Command::new_read(
+        let mut command = Command::new(
             "isMaster".to_string(),
             db.unwrap_or_else(|| "admin".to_string()),
-            None,
             body,
         );
 

src/cmap/establish/test.rs

@@ -58,14 +58,14 @@ async fn speculative_auth_test(
         .await
         .unwrap();
 
-    let command = Command::new_read(
+    let mut command = Command::new(
         "find".into(),
         authorized_db_name.into(),
-        Some(ReadPreference::PrimaryPreferred {
-            options: Default::default(),
-        }),
         doc! { "find": "foo", "limit": 1  },
     );
+    command.set_read_preference(ReadPreference::PrimaryPreferred {
+        options: Default::default(),
+    });
 
     let response = conn.send_command(command, None).await.unwrap();
 

src/cmap/test/integration.rs

@@ -48,12 +48,8 @@ async fn acquire_connection_and_send_command() {
     let read_pref = ReadPreference::PrimaryPreferred {
         options: Default::default(),
     };
-    let mut cmd = Command::new_read(
-        "listDatabases".to_string(),
-        "admin".to_string(),
-        Some(read_pref),
-        body,
-    );
+    let mut cmd = Command::new("listDatabases".to_string(), "admin".to_string(), body);
+    cmd.set_read_preference(read_pref);
     if let Some(server_api) = client_options.server_api.as_ref() {
         cmd.set_server_api(server_api);
     }

src/coll/mod.rs

@@ -275,9 +275,10 @@ where
         options: impl Into<Option<CountOptions>>,
         session: impl Into<Option<&mut ClientSession>>,
     ) -> Result<i64> {
-        let options = options.into();
-        let filter = filter.into();
-        let op = CountDocuments::new(self.namespace(), filter, options);
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let op = CountDocuments::new(self.namespace(), filter.into(), options);
         self.client().execute_operation(op, session).await
     }
 
@@ -430,7 +431,10 @@ where
         filter: impl Into<Option<Document>>,
         options: impl Into<Option<FindOptions>>,
     ) -> Result<Cursor<T>> {
-        let find = Find::new(self.namespace(), filter.into(), options.into());
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let find = Find::new(self.namespace(), filter.into(), options);
         let client = self.client();
 
         client
@@ -461,10 +465,10 @@ where
         filter: impl Into<Option<Document>>,
         options: impl Into<Option<FindOneOptions>>,
     ) -> Result<Option<T>> {
-        let options: FindOptions = options
-            .into()
-            .map(Into::into)
-            .unwrap_or_else(Default::default);
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let options: FindOptions = options.map(Into::into).unwrap_or_else(Default::default);
         let mut cursor = self.find(filter, Some(options)).await?;
         cursor.next().await.transpose()
     }
@@ -477,10 +481,10 @@ where
         options: impl Into<Option<FindOneOptions>>,
         session: &mut ClientSession,
     ) -> Result<Option<T>> {
-        let options: FindOptions = options
-            .into()
-            .map(Into::into)
-            .unwrap_or_else(Default::default);
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let options: FindOptions = options.map(Into::into).unwrap_or_else(Default::default);
         let mut cursor = self
             .find_with_session(filter, Some(options), session)
             .await?;

src/operation/count/test.rs

@@ -28,7 +28,6 @@ async fn build() {
         }
     );
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
@@ -58,7 +57,6 @@ async fn build_with_options() {
         }
     );
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]

src/operation/count_documents/test.rs

@@ -36,7 +36,6 @@ async fn build() {
 
     assert_eq!(count_command.body, expected_body);
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
@@ -77,7 +76,6 @@ async fn build_with_options() {
 
     assert_eq!(count_command.body, expected_body);
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]

src/operation/create/test.rs

@@ -32,7 +32,6 @@ async fn build() {
 
     assert_eq!(cmd.name.as_str(), "create");
     assert_eq!(cmd.target_db.as_str(), "test_db");
-    assert_eq!(cmd.read_pref.as_ref(), None);
     assert_eq!(
         cmd.body,
         doc! {
@@ -64,7 +63,6 @@ async fn build_validator() {
 
     assert_eq!(cmd.name.as_str(), "create");
     assert_eq!(cmd.target_db.as_str(), "test_db");
-    assert_eq!(cmd.read_pref.as_ref(), None);
     assert_eq!(
         cmd.body,
         doc! {

src/operation/delete/test.rs

@@ -33,7 +33,6 @@ async fn build_many() {
 
     assert_eq!(cmd.name.as_str(), "delete");
     assert_eq!(cmd.target_db.as_str(), "test_db");
-    assert_eq!(cmd.read_pref.as_ref(), None);
 
     let mut expected_body = doc! {
         "delete": "test_coll",
@@ -77,7 +76,6 @@ async fn build_one() {
 
     assert_eq!(cmd.name.as_str(), "delete");
     assert_eq!(cmd.target_db.as_str(), "test_db");
-    assert_eq!(cmd.read_pref.as_ref(), None);
 
     let mut expected_body = doc! {
         "delete": "test_coll",