From 0d23326aa20eb527614d14bb44faecaa7b3640f0 Mon Sep 17 00:00:00 2001 From: JMARyA Date: Thu, 18 Jul 2024 14:10:29 +0200 Subject: [PATCH] update --- .gitignore | 1 + mongod_derive/src/lib.rs | 2 +- src/model/update.rs | 30 ++++++++++++++++++++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ea8c4bf..67254f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/mongod_derive/target diff --git a/mongod_derive/src/lib.rs b/mongod_derive/src/lib.rs index a753d8a..7473c2a 100644 --- a/mongod_derive/src/lib.rs +++ b/mongod_derive/src/lib.rs @@ -96,7 +96,7 @@ pub fn model_derive(input: TokenStream) -> TokenStream { async fn update_values( &mut self, obj: &serde_json::Map, - update: &mut mongodb::bson::Document, + update: &mut mongod::mongodb::bson::Document, ) { #( #field_process_code )* } diff --git a/src/model/update.rs b/src/model/update.rs index a70bc96..18cd849 100644 --- a/src/model/update.rs +++ b/src/model/update.rs @@ -19,7 +19,10 @@ macro_rules! update_historic_str { if !(&field.current == val_str) { field.update(val_str.to_owned()); $entity.$field = field; - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } } @@ -46,7 +49,10 @@ macro_rules! update_historic_ref_option { let value = Historic::new(Reference::new_raw(val_str).await.unwrap()); let field = $entity.$field.clone().unwrap_or_else(|| value); $entity.$field = Some(field); - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } }; @@ -76,7 +82,10 @@ macro_rules! update_historic_vec { .collect(), ); $entity.$field = field; - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } }; @@ -102,7 +111,10 @@ macro_rules! update_value { if let Ok(val) = serde_json::from_value::<$t>(val.clone()) { if val != $entity.$field { $entity.$field = val; - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } } @@ -130,11 +142,17 @@ macro_rules! update_value_option { if let Some(v) = &$entity.$field { if val != *v { $entity.$field = Some(val); - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } else { $entity.$field = Some(val); - $update.insert($key, mongodb::bson::to_bson(&$entity.$field).unwrap()); + $update.insert( + $key, + mongod::mongodb::bson::to_bson(&$entity.$field).unwrap(), + ); } } }