folders

backend/src/routes/documents.rs

@@ -1304,7 +1304,6 @@ pub async fn update_document(
 }
 
 pub async fn move_document(
-    State(state): State<AppState>,
     Path(document_id): Path<Uuid>,
     TenantScopedConn {
         mut conn,
@@ -1314,7 +1313,7 @@ pub async fn move_document(
     Json(payload): Json<MoveDocumentRequest>,
 ) -> AppResult<impl IntoResponse> {
     if let Some(folder_id) = payload.folder_id {
-        ensure_folder_exists(&state, tenant_id, folder_id)?;
+        ensure_folder_exists_on_conn(&mut conn, tenant_id, folder_id)?;
     }
 
     let now = Utc::now().naive_utc();
@@ -1333,7 +1332,6 @@ pub async fn move_document(
 }
 
 pub async fn bulk_move_documents(
-    State(state): State<AppState>,
     TenantScopedConn {
         mut conn,
         tenant_id,
@@ -1354,7 +1352,7 @@ pub async fn bulk_move_documents(
     document_ids.dedup();
 
     if let Some(target_folder) = folder_id {
-        ensure_folder_exists(&state, tenant_id, target_folder)?;
+        ensure_folder_exists_on_conn(&mut conn, tenant_id, target_folder)?;
     }
 
     let existing: Vec<(Uuid, Option<NaiveDateTime>)> = documents::table
@@ -1374,7 +1372,7 @@ pub async fn bulk_move_documents(
     }
 
     let now = Utc::now().naive_utc();
-    let updated = diesel::update(
+    let updated = match diesel::update(
         documents::table
             .filter(documents::id.eq_any(&document_ids))
             .filter(documents::tenant_id.eq(tenant_id)),
@@ -1383,7 +1381,34 @@ pub async fn bulk_move_documents(
         documents::folder_id.eq(folder_id),
         documents::updated_at.eq(now),
     ))
-    .execute(&mut conn)?;
+    .execute(&mut conn)
+    {
+        Ok(value) => value,
+        Err(diesel::result::Error::DatabaseError(kind, info)) => {
+            error!(
+                ?kind,
+                detail = ?info.details(),
+                constraint = info.constraint_name(),
+                tenant_id = %tenant_id,
+                target_folder = folder_id.map(|id| id.to_string()),
+                "bulk move update failed"
+            );
+            let message = info
+                .constraint_name()
+                .map(|name| format!("constraint {name} prevented moving documents"))
+                .unwrap_or_else(|| "unable to move documents due to a constraint".to_string());
+            return Err(AppError::conflict(message));
+        }
+        Err(err) => {
+            error!(
+                ?err,
+                tenant_id = %tenant_id,
+                target_folder = folder_id.map(|id| id.to_string()),
+                "bulk move update failed"
+            );
+            return Err(AppError::from(err));
+        }
+    };
 
     let body = BulkMoveResponse { updated };
     Ok((StatusCode::OK, body.into_json()?))
@@ -1810,7 +1835,8 @@ async fn process_upload(
     } = request;
 
     if let Some(folder) = folder_id {
-        ensure_folder_exists(state, tenant_id, folder)?;
+        let mut conn = state.db_for_tenant(tenant_id)?;
+        ensure_folder_exists_on_conn(&mut conn, tenant_id, folder)?;
     }
 
     let doc_id = Uuid::new_v4();
@@ -2173,14 +2199,17 @@ fn insert_document_correspondents(
     Ok(inserted)
 }
 
-fn ensure_folder_exists(state: &AppState, tenant_id: Uuid, folder_id: Uuid) -> AppResult<()> {
-    let mut conn = state.db_for_tenant(tenant_id)?;
+fn ensure_folder_exists_on_conn(
+    conn: &mut PgConnection,
+    tenant_id: Uuid,
+    folder_id: Uuid,
+) -> AppResult<()> {
     let exists: bool = diesel::select(exists(
         folders::table
             .filter(folders::id.eq(folder_id))
             .filter(folders::tenant_id.eq(tenant_id)),
     ))
-    .get_result(&mut conn)?;
+    .get_result(conn)?;
     ensure_exists(exists, "folder")
 }