From a76a737560a218cc44fc7ff0e68d583993850c90 Mon Sep 17 00:00:00 2001
From: James Douglass <douggynix@gmail.com>
Date: Tue, 9 Jul 2024 00:15:58 -0400
Subject: [PATCH] refactoring model with Send + Sync

---
 Cargo.toml        |  7 -------
 src/lib.rs        | 12 ++++++------
 src/repository.rs | 15 +++++----------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f3470f3..77a9396 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,15 +17,8 @@ serde = { version = "1", features = ["derive"] }
 futures-core = "0.3"
 futures-util = "0.3"
 async-trait = "0.1"
-#tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 tokio = "1.14.0"
 pretty_assertions = "1.0.0"
 chrono = { version = "0.4.38", features = [ "serde" ] }
-
-#[features]
-#default = ["tokio-runtime"]
-#tokio-runtime = ["mongodb/tokio-runtime"]
-#async-std-runtime = ["mongodb/async-std-runtime"]
-#chrono-0_4 = ["mongodb/bson-chrono-0_4"]
diff --git a/src/lib.rs b/src/lib.rs
index e04f524..a56c5c1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -108,7 +108,7 @@ pub use mongodb::bson;
 pub use mongodb::bson::{bson, doc};
 
 /// Associate a collection configuration.
-pub trait Model: serde::ser::Serialize + serde::de::DeserializeOwned + Unpin {
+pub trait Model: serde::ser::Serialize + serde::de::DeserializeOwned + Unpin + Send + Sync {
     type CollConf: CollectionConfig;
 }
 
@@ -136,21 +136,21 @@ pub trait CollectionConfig {
 /// Utilities methods to get a `Repository`. Implemented for `mongodb::Database`.
 pub trait ToRepository {
     /// Shorthand for `Repository::<Model>::new`.
-    fn repository<M: Model + Send + Sync>(&self) -> Repository<M>;
+    fn repository<M: Model>(&self) -> Repository<M>;
 
     /// Shorthand for `Repository::<Model>::new_with_options`.
-    fn repository_with_options<M: Model + Send + Sync>(
+    fn repository_with_options<M: Model>(
         &self,
         options: mongodb::options::CollectionOptions,
     ) -> Repository<M>;
 }
 
 impl ToRepository for mongodb::Database {
-    fn repository<M: Model + Send + Sync>(&self) -> Repository<M> {
+    fn repository<M: Model>(&self) -> Repository<M> {
         Repository::new(self.clone())
     }
 
-    fn repository_with_options<M: Model + Send + Sync>(
+    fn repository_with_options<M: Model>(
         &self,
         options: mongodb::options::CollectionOptions,
     ) -> Repository<M> {
@@ -178,7 +178,7 @@ pub mod prelude {
         JavaScriptCodeWithScope as BsonJavaScriptCodeWithScope, Regex as BsonRegex,
         Serializer as BsonSerializer, Timestamp as BsonTimestamp,
     };
-    //See driver pull request change for errors: https://github.com/mongodb/mongo-rust-driver/pull/1102
+
     #[doc(no_inline)]
     pub use crate::mongo::{
         error::{
diff --git a/src/repository.rs b/src/repository.rs
index 72c8785..3762253 100644
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -43,21 +43,19 @@ pub struct BulkUpdateUpsertResult {
 /// This type can safely be copied and passed around because `std::sync::Arc` is used internally.
 /// Underlying `mongodb::Collection` can be retrieved at anytime with `Repository::get_underlying`.
 #[derive(Debug)]
-pub struct Repository<M: Model + Send + Sync> {
+pub struct Repository<M: Model> {
     db: mongodb::Database, // FIXME: temporary keep reference to database object for `bulk_update` operation
     coll: mongodb::Collection<M>,
 }
 
-impl<M: Model + Send + Sync> Deref for Repository<M> {
+impl<M: Model> Deref for Repository<M> {
     type Target = mongodb::Collection<M>;
     fn deref(&self) -> &mongodb::Collection<M> {
         &self.coll
     }
 }
 
-impl<M: Model + Send + Sync> Clone
-    for Repository<M>
-{
+impl<M: Model> Clone for Repository<M> {
     fn clone(&self) -> Self {
         Self {
             db: self.db.clone(),
@@ -66,7 +64,7 @@ impl<M: Model + Send + Sync> Clone
     }
 }
 
-impl<M: Model + Send + Sync> Repository<M> {
+impl<M: Model> Repository<M> {
     /// Create a new repository from the given mongo client.
     pub fn new(db: mongodb::Database) -> Self {
         let coll = if let Some(options) = M::CollConf::collection_options() {
@@ -222,9 +220,7 @@ impl<M: Model + Send + Sync> Repository<M> {
     /// ```
     pub fn cast_model<OtherModel>(self) -> Repository<OtherModel>
     where
-        OtherModel: Model<CollConf = M::CollConf>
-            + Send
-            + Sync
+        OtherModel: Model<CollConf = M::CollConf>,
     {
         Repository {
             db: self.db,
@@ -281,7 +277,6 @@ impl<M: Model + Send + Sync> Repository<M> {
     /// ```
     pub async fn bulk_update<V, U>(&self, updates: V) -> Result<BulkUpdateResult>
     where
-        M: Send + Sync,
         V: Borrow<Vec<U>> + Send + Sync,
         U: Borrow<BulkUpdate> + Send + Sync,
     {