reduce to 1 object per asset

backend/src/workers/ocr.rs

@@ -19,13 +19,10 @@ use uuid::Uuid;
 use crate::{
     documents::asset::delete_asset,
     error::AppResult,
-    models::{
-        Document, DocumentAsset, DocumentAssetObject, DocumentVersion, NewDocumentAsset,
-        NewDocumentAssetObject,
-    },
-    schema::{document_asset_objects, document_assets},
+    models::{Document, DocumentAsset, DocumentVersion, NewDocumentAsset},
+    schema::document_assets,
     state::AppState,
-    utils::storage_paths::document_asset_object_prefix,
+    utils::storage_paths::document_asset_key,
 };
 
 use super::taskflow::{
@@ -83,7 +80,7 @@ impl Task<DocumentVersionTaskContext> for GenerateOcrTask {
         remove_existing_ocr_asset(ctx, &context).await;
 
         let asset_id = Uuid::new_v4();
-        let s3_key = document_asset_object_prefix(
+        let s3_key = document_asset_key(
             context.document.id,
             context.version.version_number,
             OCR_TEXT_ASSET_TYPE,
@@ -123,7 +120,6 @@ struct OcrContext {
     document: Document,
     version: DocumentVersion,
     existing_asset: Option<DocumentAsset>,
-    existing_objects: Vec<DocumentAssetObject>,
     skip: bool,
 }
 
@@ -135,16 +131,13 @@ async fn build_ocr_context(
     let version = ctx.version().await?.clone();
     let asset = ctx.asset(OCR_TEXT_ASSET_TYPE).await?;
 
-    let (existing_asset, existing_objects) = asset
-        .map(|asset| (Some(asset.asset.clone()), asset.objects.clone()))
-        .unwrap_or((None, Vec::new()));
+    let existing_asset = asset.map(|asset| asset.asset.clone());
 
     if !document_is_pdf(&document) {
         return Ok(OcrContext {
             document,
             version,
             existing_asset,
-            existing_objects,
             skip: true,
         });
     }
@@ -155,22 +148,19 @@ async fn build_ocr_context(
         document,
         version,
         existing_asset,
-        existing_objects,
         skip,
     })
 }
 
 async fn remove_existing_ocr_asset(ctx: &DocumentVersionTaskContext, context: &OcrContext) {
     if let Some(existing_asset) = &context.existing_asset {
-        for object in &context.existing_objects {
-            if let Err(err) = ctx.storage().delete_object(&object.s3_key).await {
-                warn!(
-                    job_id = %ctx.job_id(),
-                    error = %err,
-                    s3_key = %object.s3_key,
-                    "failed to delete existing ocr asset object"
-                );
-            }
+        if let Err(err) = ctx.storage().delete_object(&existing_asset.s3_key).await {
+            warn!(
+                job_id = %ctx.job_id(),
+                error = %err,
+                s3_key = %existing_asset.s3_key,
+                "failed to delete existing ocr asset object"
+            );
         }
 
         let tenant_id = context.document.tenant_id;
@@ -239,7 +229,7 @@ fn persist_ocr_metadata(
         asset_type: OCR_TEXT_ASSET_TYPE.to_string(),
         mime_type: "text/plain".to_string(),
         metadata,
-        cardinality: Some(1),
+        s3_key: s3_key.to_string(),
         tenant_id,
     };
 
@@ -253,34 +243,12 @@ fn persist_ocr_metadata(
         .set((
             document_assets::mime_type.eq(excluded(document_assets::mime_type)),
             document_assets::metadata.eq(excluded(document_assets::metadata)),
-            document_assets::cardinality.eq(excluded(document_assets::cardinality)),
+            document_assets::s3_key.eq(excluded(document_assets::s3_key)),
             document_assets::id.eq(excluded(document_assets::id)),
         ))
         .execute(&mut conn)
         .map_err(|err| format!("{err:?}"))?;
 
-    diesel::delete(
-        document_asset_objects::table
-            .filter(document_asset_objects::asset_id.eq(asset_id))
-            .filter(document_asset_objects::tenant_id.eq(tenant_id)),
-    )
-    .execute(&mut conn)
-    .map_err(|err| format!("{err:?}"))?;
-
-    let object = NewDocumentAssetObject {
-        id: Uuid::new_v4(),
-        asset_id,
-        ordinal: 1,
-        s3_key: s3_key.to_string(),
-        metadata: json!({}),
-        tenant_id,
-    };
-
-    diesel::insert_into(document_asset_objects::table)
-        .values(&object)
-        .execute(&mut conn)
-        .map_err(|err| format!("{err:?}"))?;
-
     Ok(())
 }