rls

backend/src/workers/ocr.rs

@@ -24,7 +24,7 @@ use crate::{
         Document, DocumentAsset, DocumentAssetObject, DocumentVersion, NewDocumentAsset,
         NewDocumentAssetObject,
     },
-    schema::{document_asset_objects, document_assets, documents},
+    schema::{document_asset_objects, document_assets},
     state::AppState,
     storage::TenantStorage,
     utils::storage_paths::document_asset_object_prefix,
@@ -77,9 +77,12 @@ impl JobHandler for GenerateOcrTextJob {
 
         let state_clone = state.clone();
         let payload_clone = payload.clone();
-        let context =
-            match task::spawn_blocking(move || load_ocr_context(state_clone, &payload_clone)).await
-            {
+        let tenant_id = job.tenant_id;
+        let context = match task::spawn_blocking(move || {
+            load_ocr_context(state_clone, tenant_id, payload_clone)
+        })
+        .await
+        {
                 Ok(Ok(ctx)) => ctx,
                 Ok(Err(err)) => {
                     warn!(job_id = %job.id, error = %err, "ocr job will retry");
@@ -195,7 +198,7 @@ impl JobHandler for GenerateOcrTextJob {
         .await
         {
             Ok(Ok(())) => {
-                if let Err(err) = enqueue_index_job(&state, &payload) {
+                if let Err(err) = enqueue_index_job(&state, job.tenant_id, &payload) {
                     warn!(job_id = %job.id, error = %err, "failed to enqueue index job");
                 }
                 JobExecution::Success
@@ -236,9 +239,14 @@ struct OcrGeneration {
     source: &'static str,
 }
 
-fn load_ocr_context(state: Arc<AppState>, payload: &OcrPayload) -> Result<OcrContext, String> {
+fn load_ocr_context(
+    state: Arc<AppState>,
+    tenant_id: Uuid,
+    payload: OcrPayload,
+) -> Result<OcrContext, String> {
     let base = load_document_version(
         state.as_ref(),
+        tenant_id,
         payload.document_id,
         payload.document_version_id,
     )?;
@@ -481,15 +489,7 @@ fn persist_ocr_metadata(
     Ok(())
 }
 
-fn enqueue_index_job(state: &AppState, payload: &OcrPayload) -> Result<(), String> {
-    let mut base_conn = state.db_unscoped().map_err(|err| format!("{err:?}"))?;
-    let tenant_id: Uuid = documents::table
-        .find(payload.document_id)
-        .select(documents::tenant_id)
-        .first(&mut base_conn)
-        .map_err(|err| format!("{err:?}"))?;
-    drop(base_conn);
-
+fn enqueue_index_job(state: &AppState, tenant_id: Uuid, payload: &OcrPayload) -> Result<(), String> {
     let mut conn = state
         .db_for_tenant(tenant_id)
         .map_err(|err| format!("{err:?}"))?;