Temporal todo

src/data/repositories.rs

@@ -9,6 +9,7 @@ use rayon::iter::ParallelIterator;
 use rusqlite::Connection;
 use std::marker::PhantomData;
 use std::ops::Deref;
+use std::rc::Rc;
 use std::sync::Arc;
 use crate::data_provider::sqlite::SqliteConnection;
 
@@ -94,13 +95,15 @@ where
         }
     }
 }
+
+#[derive(Clone)]
 pub struct Query<T, R, D>
 where
     R: Repository<T, D>,
     D: DbLayer<T>,
 {
     cache: Vec<EntityHandle<T>>,
-    rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+    rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
     parallel: bool,
     _marker: PhantomData<(R, D)>,
     shift_stamp: usize,
@@ -140,7 +143,7 @@ impl<T: EntityData + Clone + Send + Sync, R: Repository<T, D>, D: DbLayer<T>> Qu
                 .cache
                 .par_iter()
                 .enumerate()
-                .filter(|(_, entity)| (self.rule)(entity))
+                .filter(|(_, entity)| self.rule.as_ref()(entity))
                 .map(|(i, entity)| EntityHandle::new(entity.id(), i, true))
                 .collect();
         } else {
@@ -234,7 +237,7 @@ impl<T: std::clone::Clone + EntityData, D: DbLayer<T>> Deref for DataRepository<
 impl<T: EntityData + Clone, D: DbLayer<T>> DataRepositoryInner<T, D> {
     pub fn query_par(
         &self,
-        rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+        rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
     ) -> Query<T, DataRepositoryInner<T, D>, D>
     where
         T: Send + Sync,
@@ -267,7 +270,7 @@ impl<T: EntityData + Clone, D: DbLayer<T>> DataRepositoryInner<T, D> {
 
     pub fn query(
         &self,
-        rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+        rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
     ) -> Query<T, DataRepositoryInner<T, D>, D>
     where
         T: Send + Sync,