patch tags

backend/src/routes/folders.rs

@@ -10,10 +10,13 @@ use serde_json::{json, Value};
 use std::collections::{HashMap, HashSet};
 use uuid::Uuid;
 
-use crate::error::{AppError, AppResult};
 use crate::models::{Document, Folder, NewFolder};
 use crate::schema::{document_tags, documents, folders};
 use crate::state::AppState;
+use crate::{
+    auth::AuthenticatedUser,
+    error::{AppError, AppResult},
+};
 
 use super::documents::{
     load_primary_thumbnails, load_tags_for_documents, to_document_response, to_iso,
@@ -162,6 +165,7 @@ pub async fn create_folder(
 pub async fn list_folder_contents(
     State(state): State<AppState>,
     Path(folder_identifier): Path<String>,
+    user: AuthenticatedUser,
 ) -> AppResult<Json<FolderContentsResponse>> {
     let mut conn = state.db()?;
 
@@ -214,14 +218,18 @@ pub async fn list_folder_contents(
 
     let thumbnails = load_primary_thumbnails(&state, &docs).await?;
 
-    let documents = docs
-        .into_iter()
-        .map(|doc| {
-            let tags = tags_map.get(&doc.id).cloned();
-            let thumbnail = thumbnails.get(&doc.id).cloned();
-            to_document_response(doc, tags, thumbnail)
-        })
-        .collect();
+    let mut documents = Vec::with_capacity(doc_ids.len());
+    for doc in docs {
+        let tags = tags_map.get(&doc.id).cloned();
+        let thumbnail = thumbnails.get(&doc.id).cloned();
+        documents.push(to_document_response(
+            &state,
+            user.user_id,
+            doc,
+            tags,
+            thumbnail,
+        )?);
+    }
 
     Ok(Json(FolderContentsResponse {
         folder,
@@ -234,6 +242,7 @@ pub async fn search_documents(
     State(state): State<AppState>,
     Path(folder_identifier): Path<String>,
     Query(params): Query<DocumentSearchQuery>,
+    user: AuthenticatedUser,
 ) -> AppResult<Json<Vec<DocumentResponse>>> {
     let mut conn = state.db()?;
 
@@ -392,14 +401,18 @@ pub async fn search_documents(
     drop(conn);
 
     let thumbnails = load_primary_thumbnails(&state, &docs).await?;
-    let response = docs
-        .into_iter()
-        .map(|doc| {
-            let tags = tags_map.get(&doc.id).cloned();
-            let thumbnail = thumbnails.get(&doc.id).cloned();
-            to_document_response(doc, tags, thumbnail)
-        })
-        .collect();
+    let mut response = Vec::with_capacity(doc_ids.len());
+    for doc in docs {
+        let tags = tags_map.get(&doc.id).cloned();
+        let thumbnail = thumbnails.get(&doc.id).cloned();
+        response.push(to_document_response(
+            &state,
+            user.user_id,
+            doc,
+            tags,
+            thumbnail,
+        )?);
+    }
 
     Ok(Json(response))
 }