Fix file download and upload

Author: Mauve Signweaver

Cargo.lock

@@ -41,6 +41,7 @@ anyhow = "1.0.89"
 async-trait = "0.1.83"
 tmpdir = "1.0.0"
 num_cpus = "1.16.0"
+tokio-stream = "0.1.16"
 
 [target.'cfg(target_os = "android")'.dependencies]
 jni = "0.21.1"

Cargo.toml

@@ -26,15 +26,15 @@ pub mod utils;
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::media::{download_file, scope, upload_file};
+    use crate::models::GroupRepoPath;
     use actix_web::{test, web, App};
     use anyhow::Result;
     use models::{RequestName, SnowbirdGroup, SnowbirdRepo};
     use serde::{Deserialize, Serialize};
+    use serde_json::json;
     use server::server::{get_backend, init_backend, status, BACKEND};
     use tmpdir::TmpDir;
-    use serde_json::json;
-    use crate::media::{download_file, upload_file, scope}; 
-    use crate::models::GroupRepoPath;
 
     #[derive(Serialize, Deserialize)]
     struct GroupsResponse {
@@ -136,24 +136,33 @@ mod tests {
             .uri("/api/groups")
             .set_json(json!({ "name": "Test Group" }))
             .to_request();
-        let create_group_resp: serde_json::Value = test::call_and_read_body_json(&app, create_group_req).await;
-        let group_id = create_group_resp["key"].as_str().expect("No group key returned");
+        let create_group_resp: serde_json::Value =
+            test::call_and_read_body_json(&app, create_group_req).await;
+        let group_id = create_group_resp["key"]
+            .as_str()
+            .expect("No group key returned");
 
         // Step 2: Create a repo via the API
         let create_repo_req = test::TestRequest::post()
             .uri(&format!("/api/groups/{}/repos", group_id))
             .set_json(json!({ "name": "Test Repo" }))
             .to_request();
-        let create_repo_resp: serde_json::Value = test::call_and_read_body_json(&app, create_repo_req).await;
+        let create_repo_resp: serde_json::Value =
+            test::call_and_read_body_json(&app, create_repo_req).await;
 
-        let repo_id = create_repo_resp["key"].as_str().expect("No repo key returned");
+        let repo_id = create_repo_resp["key"]
+            .as_str()
+            .expect("No repo key returned");
 
         // Step 3: Upload a file to the repository
         let file_name = "example.txt";
         let file_content = b"Test content for file upload";
 
         let upload_req = test::TestRequest::post()
-            .uri(&format!("/api/groups/{}/repos/{}/media/{}", group_id, repo_id, file_name))
+            .uri(&format!(
+                "/api/groups/{}/repos/{}/media/{}",
+                group_id, repo_id, file_name
+            ))
             .set_payload(file_content.to_vec())
             .to_request();
         let upload_resp = test::call_service(&app, upload_req).await;
@@ -165,17 +174,14 @@ mod tests {
         let list_files_req = test::TestRequest::get()
             .uri(&format!("/api/groups/{}/repos/{}/media", group_id, repo_id))
             .to_request();
-        let list_files_resp: serde_json::Value = test::call_and_read_body_json(&app, list_files_req).await;
+        let list_files_resp: serde_json::Value =
+            test::call_and_read_body_json(&app, list_files_req).await;
 
         println!("List files response: {:?}", list_files_resp);
 
         // Now check if the response is an array directly
         if let Some(files_array) = list_files_resp.as_array() {
-            assert_eq!(
-                files_array.len(),
-                1,
-                "There should be one file in the repo"
-            );
+            assert_eq!(files_array.len(), 1, "There should be one file in the repo");
 
             // Ensure the file name matches what we uploaded
             let file_obj = &files_array[0];
@@ -191,9 +197,28 @@ mod tests {
             panic!("The response is not an array as expected");
         }
 
+        let get_file_req = test::TestRequest::get()
+            .uri(&format!(
+                "/api/groups/{}/repos/{}/media/{}",
+                group_id, repo_id, file_name
+            ))
+            .to_request();
+        let get_file_resp = test::call_service(&app, get_file_req).await;
+        assert!(get_file_resp.status().is_success(), "File download failed");
+
+        let got_file_data = test::read_body(get_file_resp).await;
+        assert_eq!(
+            got_file_data.to_vec().as_slice(),
+            file_content,
+            "Downloaded back file content"
+        );
+
         // Step 5: Delete the file from the repository
         let delete_file_req = test::TestRequest::delete()
-            .uri(&format!("/api/groups/{}/repos/{}/media/{}", group_id, repo_id, "example.txt"))
+            .uri(&format!(
+                "/api/groups/{}/repos/{}/media/{}",
+                group_id, repo_id, "example.txt"
+            ))
             .to_request();
         let delete_resp = test::call_service(&app, delete_file_req).await;
 
@@ -203,13 +228,17 @@ mod tests {
         let list_files_after_deletion_req = test::TestRequest::get()
             .uri(&format!("/api/groups/{}/repos/{}/media", group_id, repo_id))
             .to_request();
-        let list_files_after_deletion_resp: serde_json::Value = test::call_and_read_body_json(&app, list_files_after_deletion_req).await;
+        let list_files_after_deletion_resp: serde_json::Value =
+            test::call_and_read_body_json(&app, list_files_after_deletion_req).await;
 
         assert!(
-            list_files_after_deletion_resp.as_array().unwrap().is_empty(),
+            list_files_after_deletion_resp
+                .as_array()
+                .unwrap()
+                .is_empty(),
             "File list should be empty after file deletion"
         );
-        
+
         // Clean up: Stop the backend
         {
             let backend = get_backend().await?;