Allow search in /bulk API

docs/HTTP_API.md

@@ -278,25 +278,28 @@ without filtering.
 
 
 ### POST /v3/$owner_key/bulk
-```json
+```json5
 {
   "auth": $auth_json,
   "payload": {
     "createItems": [
-      { "id": "something-12345", "type": "Person", ... },
+      { "id": "something-12345", "type": "Person", /* ... */ },
       {}, // same structure as create_item endpoint above
-      ...
+      // ...
     ],
     "updateItems": [
-      { "id": "something-67899", ... },
+      { "id": "something-67899", /* ... */ },
       {}, // same structure as update_item endpoint above
-      ...
+      // ...
     ],
-    "deleteItems": [ "$id", "$id", "$id", ...],
+    "deleteItems": [ "$id", "$id", "$id", /* ... */ ],
     "createEdges": [ 
       {}, // same structure as create_edge endpoint above
       {},
-      ... 
+      // ...
+    ],
+    "search": [
+      { /* same structure as in /search API */ }
     ]
   }
 }

src/api_model.rs

@@ -78,6 +78,8 @@ pub struct Bulk {
     pub delete_items: Vec<String>,
     #[serde(default)]
     pub create_edges: Vec<CreateEdge>,
+    #[serde(default)]
+    pub search: Vec<Search>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

src/internal_api.rs

@@ -328,15 +328,17 @@ pub fn bulk_tx(
     pod_owner: &str,
     cli: &CliOptions,
     database_key: &DatabaseKey,
-) -> Result<()> {
+) -> Result<Value> {
     info!(
         "Performing bulk action with {} new items, {} updated items, {} deleted items",
         bulk.create_items.len(),
         bulk.update_items.len(),
         bulk.delete_items.len(),
     );
+    let mut created_items = Vec::new();
     for item in bulk.create_items {
-        create_item_tx(tx, schema, item, pod_owner, cli, database_key)?;
+        let id = create_item_tx(tx, schema, item, pod_owner, cli, database_key)?;
+        created_items.push(id);
     }
     for item in bulk.update_items {
         update_item_tx(tx, schema, &item.id, item.fields)?;
@@ -344,10 +346,22 @@ pub fn bulk_tx(
     for item_id in bulk.delete_items {
         delete_item_tx(tx, schema, &item_id)?;
     }
+    let mut created_edges = Vec::new();
     for item_id in bulk.create_edges {
-        create_edge(tx, item_id)?;
+        let id = create_edge(tx, item_id)?;
+        created_edges.push(id);
     }
-    Ok(())
+    let mut search_results = Vec::new();
+    for query in bulk.search {
+        let result = search(tx, schema, query)?;
+        search_results.push(result);
+    }
+    let result = serde_json::json!({
+        "createItems": created_items,
+        "createEdges": created_edges,
+        "search": search_results,
+    });
+    Ok(result)
 }
 
 fn item_base_to_json(tx: &Tx, item: ItemBase, schema: &Schema) -> Result<Map<String, Value>> {

src/warp_api.rs

@@ -124,7 +124,7 @@ pub async fn run_server(cli_options: CliOptions) {
         .map(move |owner: String, body: PayloadWrapper<Bulk>| {
             let cli = cli_options_arc_clone.deref();
             let result = warp_endpoints::bulk(owner, init_db.deref(), body, cli);
-            let result = result.map(|()| warp::reply::json(&serde_json::json!({})));
+            let result = result.map(|value| warp::reply::json(&value));
             respond_with_result(result)
         });
 

src/warp_endpoints.rs

@@ -88,7 +88,7 @@ pub fn bulk(
     init_db: &RwLock<HashSet<String>>,
     body: PayloadWrapper<Bulk>,
     cli: &CliOptions,
-) -> Result<()> {
+) -> Result<Value> {
     let auth = body.auth;
     let payload = body.payload;
     let database_key = auth_to_database_key(auth)?;