rls

backend/src/workers/index.rs

@@ -89,8 +89,8 @@ impl JobHandler for IndexDocumentTextJob {
         let client = Client::new();
 
         let state_clone = state.clone();
-        let context = match task::spawn_blocking(move || load_context(state_clone, &payload)).await
-        {
+        let tenant_id = job.tenant_id;
+        let context = match task::spawn_blocking(move || load_context(state_clone, tenant_id, payload)).await {
             Ok(Ok(ctx)) => ctx,
             Ok(Err(err)) => {
                 warn!(job_id = %job.id, error = %err, "index job will retry");
@@ -166,12 +166,18 @@ struct IndexContext {
     text_s3_key: Option<String>,
 }
 
-fn load_context(state: Arc<AppState>, payload: &IndexPayload) -> Result<IndexContext, String> {
-    let mut base_conn = state.db_unscoped().map_err(|err| format!("{err:?}"))?;
+fn load_context(
+    state: Arc<AppState>,
+    tenant_id: Uuid,
+    payload: IndexPayload,
+) -> Result<IndexContext, String> {
+    let mut conn = state
+        .db_for_tenant(tenant_id)
+        .map_err(|err| format!("{err:?}"))?;
 
     let version: DocumentVersion = document_versions::table
         .find(payload.document_version_id)
-        .first(&mut base_conn)
+        .first(&mut conn)
         .map_err(|err| format!("{err:?}"))?;
 
     if version.document_id != payload.document_id {
@@ -180,14 +186,7 @@ fn load_context(state: Arc<AppState>, payload: &IndexPayload) -> Result<IndexCon
 
     let document: Document = documents::table
         .find(payload.document_id)
-        .first(&mut base_conn)
-        .map_err(|err| format!("{err:?}"))?;
-
-    let tenant_id = document.tenant_id;
-    drop(base_conn);
-
-    let mut conn = state
-        .db_for_tenant(tenant_id)
+        .first(&mut conn)
         .map_err(|err| format!("{err:?}"))?;
 
     let text_s3_key: Option<String> = document_asset_objects::table