refactor

backend/src/documents/asset.rs

@@ -10,7 +10,7 @@ use uuid::Uuid;
 use crate::error::{AppError, AppResult};
 use crate::models::{Document, DocumentAsset, DocumentAssetObject, DocumentVersion};
 use crate::schema::{document_asset_objects, document_assets, document_versions};
-use crate::state::AppState;
+use crate::state::{AppState, PgPooledConnection};
 use crate::utils::time::to_iso;
 
 #[derive(Serialize, Clone, ToSchema)]
@@ -158,6 +158,14 @@ pub async fn load_asset_responses(
     version_id: Uuid,
 ) -> AppResult<Vec<DocumentAssetResponse>> {
     let mut conn = state.db_for_tenant(tenant_id)?;
+    load_asset_responses_with_conn(&mut conn, tenant_id, version_id)
+}
+
+pub fn load_asset_responses_with_conn(
+    conn: &mut PgPooledConnection,
+    tenant_id: Uuid,
+    version_id: Uuid,
+) -> AppResult<Vec<DocumentAssetResponse>> {
     let assets: Vec<(DocumentAsset, Option<DocumentAssetObject>)> = document_assets::table
         .left_outer_join(
             document_asset_objects::table.on(document_asset_objects::asset_id
@@ -171,8 +179,7 @@ pub async fn load_asset_responses(
             document_assets::all_columns,
             document_asset_objects::all_columns.nullable(),
         ))
-        .load(&mut conn)?;
-    drop(conn);
+        .load(conn)?;
 
     Ok(assets
         .into_iter()