feat: [#146] return infohash after successfully uploading a torrent

Author: josecelano

src/models/response.rs

@@ -32,6 +32,7 @@ pub struct TokenResponse {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct NewTorrentResponse {
     pub torrent_id: i64,
+    pub info_hash: String,
 }
 
 #[allow(clippy::module_name_repetitions)]

src/routes/torrent.rs

@@ -133,7 +133,10 @@ pub async fn upload(req: HttpRequest, payload: Multipart, app_data: WebAppData)
 
     // respond with the newly uploaded torrent id
     Ok(HttpResponse::Ok().json(OkResponse {
-        data: NewTorrentResponse { torrent_id },
+        data: NewTorrentResponse {
+            torrent_id,
+            info_hash: torrent_request.torrent.info_hash(),
+        },
     }))
 }
 
@@ -348,12 +351,13 @@ pub async fn delete(req: HttpRequest, app_data: WebAppData) -> ServiceResult<imp
     // remove info_hash from tracker whitelist
     let _ = app_data
         .tracker_service
-        .remove_info_hash_from_whitelist(torrent_listing.info_hash)
+        .remove_info_hash_from_whitelist(torrent_listing.info_hash.clone())
         .await;
 
     Ok(HttpResponse::Ok().json(OkResponse {
         data: NewTorrentResponse {
             torrent_id: torrent_listing.torrent_id,
+            info_hash: torrent_listing.info_hash,
         },
     }))
 }

tests/common/contexts/torrent/responses.rs

@@ -84,6 +84,7 @@ pub struct UploadedTorrentResponse {
 #[derive(Deserialize, PartialEq, Debug)]
 pub struct UploadedTorrent {
     pub torrent_id: Id,
+    pub info_hash: String,
 }
 
 #[derive(Deserialize, PartialEq, Debug)]

tests/e2e/contexts/torrent/contract.rs

@@ -305,19 +305,18 @@ mod for_authenticated_users {
         let client = Client::authenticated(&env.server_socket_addr().unwrap(), &uploader.token);
 
         let test_torrent = random_torrent();
+        let infohash = test_torrent.infohash().clone();
 
         let form: UploadTorrentMultipartForm = test_torrent.index_info.into();
 
         let response = client.upload_torrent(form.into()).await;
 
-        let _uploaded_torrent_response: UploadedTorrentResponse = serde_json::from_str(&response.body).unwrap();
-
-        // code-review: the response only returns the torrent autoincrement ID
-        // generated by the DB. So we can't assert that the torrent was uploaded.
-        // We could return the infohash.
-        // We are going to use the infohash to get the torrent. See issue:
-        // https://github.com/torrust/torrust-index-backend/issues/115
+        let uploaded_torrent_response: UploadedTorrentResponse = serde_json::from_str(&response.body).unwrap();
 
+        assert_eq!(
+            uploaded_torrent_response.data.info_hash.to_lowercase(),
+            infohash.to_lowercase()
+        );
         assert!(response.is_json_and_ok());
     }