reduce to 1 object per asset

backend/src/bin/admin.rs

@@ -19,14 +19,11 @@ use papercrate::{
     jobs::{enqueue_job, JOB_ANALYZE_DOCUMENT, JOB_DELETE_TENANT},
     migrations::MIGRATIONS,
     models::{
-        DocumentAsset, DocumentAssetObject, MagicToken, MagicTokenKind, NewUser, NewUserMembership,
-        Tenant, TenantStatus, User,
+        DocumentAsset, MagicToken, MagicTokenKind, NewUser, NewUserMembership, Tenant,
+        TenantStatus, User,
     },
     s3,
-    schema::{
-        document_asset_objects, document_assets, documents, magic_tokens, tenants,
-        user_memberships, users,
-    },
+    schema::{document_assets, documents, magic_tokens, tenants, user_memberships, users},
     storage::{ObjectStorage, S3Storage, TenantStorage},
     tenants::{apply_tenant_guc, clear_tenant_context, TenantService},
     utils::{text::normalize_identifier, tracing::init_tracing},
@@ -788,29 +785,15 @@ async fn delete_assets_for_tenant(
 
         let asset_ids: Vec<Uuid> = assets.iter().map(|asset| asset.id).collect();
 
-        let objects: Vec<DocumentAssetObject> = document_asset_objects::table
-            .filter(document_asset_objects::tenant_id.eq(tenant.id))
-            .filter(document_asset_objects::asset_id.eq_any(&asset_ids))
-            .load(&mut conn)
-            .with_context(|| format!("failed to load asset objects for tenant {}", tenant.name))?;
-
-        for object in &objects {
-            if let Err(err) = tenant_storage.delete_object(&object.s3_key).await {
+        for asset in &assets {
+            if let Err(err) = tenant_storage.delete_object(&asset.s3_key).await {
                 eprintln!(
                     "Failed to delete object {} (tenant {}): {err}",
-                    object.s3_key, tenant.name
+                    asset.s3_key, tenant.name
                 );
             }
         }
 
-        diesel::delete(
-            document_asset_objects::table
-                .filter(document_asset_objects::tenant_id.eq(tenant.id))
-                .filter(document_asset_objects::asset_id.eq_any(&asset_ids)),
-        )
-        .execute(&mut conn)
-        .with_context(|| format!("failed to remove asset objects for tenant {}", tenant.name))?;
-
         diesel::delete(
             document_assets::table
                 .filter(document_assets::tenant_id.eq(tenant.id))