Fix collection extender not available in lib tests/benchmarks

Author: Polleps

lib/Cargo.toml

@@ -37,7 +37,12 @@ url = "2"
 urlencoding = "2"
 ulid = "1.1.3"
 yrs = "0.24.0"
-tokio = { version = "1", features = ["rt", "macros"] }
+tokio = { version = "1", features = [
+  "rt",
+  "macros",
+  "sync",
+  "rt-multi-thread",
+] }
 async-trait = "0.1.89"
 futures = "0.3.31"
 

lib/src/collections.rs

@@ -1,12 +1,33 @@
 //! Collections are dynamic resources that refer to multiple resources.
 //! They are constructed using a [Query]
+use crate::class_extender::{ClassExtender, GetExtenderContext};
 use crate::{
     agents::ForAgent,
     errors::AtomicResult,
     storelike::{Query, ResourceCollection, ResourceResponse},
     urls, Resource, Storelike, Value,
 };
 
+pub fn get_collection_class_extender() -> ClassExtender {
+    ClassExtender {
+        class: urls::COLLECTION.to_string(),
+        on_resource_get: Some(ClassExtender::wrap_get_handler(|context| {
+            Box::pin(async move {
+                let GetExtenderContext {
+                    store,
+                    url,
+                    db_resource: resource,
+                    for_agent,
+                } = context;
+                construct_collection_from_params(store, url.query_pairs(), resource, for_agent)
+                    .await
+            })
+        })),
+        before_commit: None,
+        after_commit: None,
+    }
+}
+
 const DEFAULT_PAGE_SIZE: usize = 30;
 
 /// Used to construct a Collection. Does not contain results / members.
@@ -575,11 +596,6 @@ mod test {
             .lock()
             .unwrap()
             .clone();
-        let subjects: Vec<String> = store
-            .all_resources(false)
-            .map(|r| r.get_subject().into())
-            .collect();
-        println!("{:?}", subjects);
         let collections_collection = store
             .get_resource_extended(
                 &format!("{}/collections", store.get_server_url().unwrap()),

lib/src/db.rs

@@ -109,7 +109,7 @@ impl Db {
         let prop_val_sub_index = db.open_tree(Tree::PropValSub)?;
         let watched_queries = db.open_tree(Tree::WatchedQueries)?;
 
-        let store = Db {
+        let mut store = Db {
             path: path.into(),
             db,
             default_agent: Arc::new(Mutex::new(None)),
@@ -124,6 +124,8 @@ impl Db {
             on_commit: None,
         };
 
+        store.add_class_extender(crate::collections::get_collection_class_extender())?;
+
         migrate_maybe(&store).map(|e| format!("Error during migration of database: {:?}", e))?;
         crate::populate::populate_base_models(&store)
             .await
@@ -856,15 +858,15 @@ impl Storelike for Db {
         let url_span = tracing::span!(tracing::Level::TRACE, "URL parse").entered();
         // This might add a trailing slash
         let url = url::Url::parse(subject)?;
-        let mut removed_query_params = {
+        let mut subject_without_params = {
             let mut url_altered = url.clone();
             url_altered.set_query(None);
             url_altered.to_string()
         };
 
         // Remove trailing slash
-        if removed_query_params.ends_with('/') {
-            removed_query_params.pop();
+        if subject_without_params.ends_with('/') {
+            subject_without_params.pop();
         }
 
         url_span.exit();
@@ -880,7 +882,7 @@ impl Storelike for Db {
         }
 
         async move {
-            let mut resource = self.get_resource(&removed_query_params).await?;
+            let mut resource = self.get_resource(&subject_without_params).await?;
 
             let _explanation = crate::hierarchy::check_read(self, &resource, for_agent).await?;
 

lib/src/populate.rs

@@ -382,15 +382,25 @@ pub async fn populate_all(store: &crate::Db) -> AtomicResult<()> {
         .map_err(|e| format!("Failed to populate default store. {}", e))?;
 
     // Use try_join! to run the rest concurrently
-    tokio::try_join!(
-        create_drive(store),
-        create_default_ontology(store),
-        set_drive_rights(store, true),
-        populate_collections(store),
-        populate_endpoints(store),
-        populate_importer(store),
-        populate_sidebar_items(store),
-    )?;
+    create_drive(store)
+        .await
+        .map_err(|e| format!("Failed to create drive. {}", e))?;
+    create_default_ontology(store)
+        .await
+        .map_err(|e| format!("Failed to create default ontology. {}", e))?;
+    set_drive_rights(store, true).await?;
+    populate_collections(store)
+        .await
+        .map_err(|e| format!("Failed to populate collections. {}", e))?;
+    populate_endpoints(store)
+        .await
+        .map_err(|e| format!("Failed to populate endpoints. {}", e))?;
+    populate_importer(store)
+        .await
+        .map_err(|e| format!("Failed to populate importer. {}", e))?;
+    populate_sidebar_items(store)
+        .await
+        .map_err(|e| format!("Failed to populate sidebar items. {}", e))?;
 
     Ok(())
 }

server/src/appstate.rs

@@ -51,7 +51,6 @@ impl AppState {
         let mut store = atomic_lib::Db::init(&config.store_path, config.server_url.clone()).await?;
 
         // Register all built-in class extenders
-        store.add_class_extender(plugins::collections::build_collection_extender())?;
         store.add_class_extender(plugins::chatroom::build_chatroom_extender())?;
         store.add_class_extender(plugins::chatroom::build_message_extender())?;
         store.add_class_extender(plugins::invite::build_invite_extender())?;

server/src/plugins/collections.rs

@@ -35,7 +35,6 @@ They are used for performing custom queries, or calculating dynamic attributes.
 
 pub mod bookmark;
 pub mod chatroom;
-pub mod collections;
 pub mod export;
 pub mod files;
 pub mod importer;