Fix initial indexing bug #560

CHANGELOG.md

@@ -12,6 +12,7 @@ See [STATUS.md](server/STATUS.md) to learn more about which features will remain
 - Add `--force` to `atomic-server import` #536
 - Fix index issue happening when deleting a single property in a sorted collection #545
 - Update JS assets & playwright
+- Fix initial indexing bug #560
 
 ## [v0.34.0] - 2022-10-31
 

server/src/appstate.rs

@@ -51,18 +51,9 @@ pub fn init(config: Config) -> AtomicServerResult<AppState> {
         store.build_index(true)?;
         tracing::info!("Building index finished!");
     }
+
     tracing::info!("Setting default agent");
     set_default_agent(&config, &store)?;
-    if config.initialize {
-        tracing::info!(
-            "Running initialization commands (first time startup, or you passed --initialize)"
-        );
-        store.populate()?;
-        set_up_initial_invite(&store)
-            .map_err(|e| format!("Error while setting up initial invite: {}", e))?;
-        // This means that editing the .env does _not_ grant you the rights to edit the Drive.
-        tracing::info!("Setting rights to Drive {}", store.get_server_url());
-    }
 
     // Initialize search constructs
     tracing::info!("Starting search service");
@@ -87,6 +78,18 @@ pub fn init(config: Config) -> AtomicServerResult<AppState> {
     };
     store.set_handle_commit(Box::new(send_commit));
 
+    if config.initialize {
+        tracing::info!(
+            "Running initialization commands (first time startup, or you passed --initialize)"
+        );
+        store.populate()?;
+
+        set_up_initial_invite(&store)
+            .map_err(|e| format!("Error while setting up initial invite: {}", e))?;
+        // This means that editing the .env does _not_ grant you the rights to edit the Drive.
+        tracing::info!("Setting rights to Drive {}", store.get_server_url());
+    }
+
     Ok(AppState {
         store,
         config,

server/src/search.rs

@@ -116,15 +116,19 @@ pub fn get_schema_fields(appstate: &SearchState) -> AtomicServerResult<Fields> {
 /// Indexes all resources from the store to search.
 /// At this moment does not remove existing index.
 pub fn add_all_resources(search_state: &SearchState, store: &Db) -> AtomicServerResult<()> {
+    tracing::info!("Building search index...");
+
     let resources = store
         .all_resources(true)
         .filter(|resource| !resource.get_subject().contains("/commits/"));
 
     for resource in resources {
+        println!("Indexing {}", resource.get_subject());
         add_resource(search_state, &resource, store)?;
     }
 
     search_state.writer.write()?.commit()?;
+    tracing::info!("Search index finished!");
     Ok(())
 }
 

server/src/serve.rs

@@ -26,9 +26,7 @@ fn rebuild_index(appstate: &crate::appstate::AppState) -> AtomicServerResult<()>
         .write()
         .expect("Could not get a lock on search writer")
         .delete_all_documents()?;
-    tracing::info!("Building search index...");
     crate::search::add_all_resources(&appstate_clone.search_state, &appstate.store)?;
-    tracing::info!("Search index finished!");
     Ok(())
 }