feat: [#256] add original infohash to upload torrent response

josecelano · josecelano · commit a59db9baaaca · 2023-08-24T18:23:50.000+01:00
```json
{
    "data": {
        "torrent_id": 174,
        "info_hash": "8aa01a4c816332045ffec83247ccbc654547fedf",
        "original_info_hash": "6c690018c5786dbbb00161f62b0712d69296df97"
    }
}
```

`original_info_hash` contains the infohash of the original uploaded
torrent file. It migth change if the torrent contained custom fields in
the info dictionary.
diff --git a/src/web/api/v1/contexts/torrent/handlers.rs b/src/web/api/v1/contexts/torrent/handlers.rs
@@ -49,7 +49,7 @@ pub async fn upload_torrent_handler(
     };
 
     match app_data.torrent_service.add_torrent(add_torrent_form, user_id).await {
-        Ok(response) => new_torrent_response(response.torrent_id, &response.info_hash).into_response(),
+        Ok(response) => new_torrent_response(&response).into_response(),
         Err(error) => error.into_response(),
     }
 }
diff --git a/src/web/api/v1/contexts/torrent/responses.rs b/src/web/api/v1/contexts/torrent/responses.rs
@@ -4,21 +4,24 @@ use hyper::{header, HeaderMap, StatusCode};
 use serde::{Deserialize, Serialize};
 
 use crate::models::torrent::TorrentId;
+use crate::services::torrent::AddTorrentResponse;
 use crate::web::api::v1::responses::OkResponseData;
 
 #[allow(clippy::module_name_repetitions)]
 #[derive(Serialize, Deserialize, Debug)]
 pub struct NewTorrentResponseData {
     pub torrent_id: TorrentId,
     pub info_hash: String,
+    pub original_info_hash: String,
 }
 
 /// Response after successfully uploading a new torrent.
-pub fn new_torrent_response(torrent_id: TorrentId, info_hash: &str) -> Json<OkResponseData<NewTorrentResponseData>> {
+pub fn new_torrent_response(add_torrent_response: &AddTorrentResponse) -> Json<OkResponseData<NewTorrentResponseData>> {
     Json(OkResponseData {
         data: NewTorrentResponseData {
-            torrent_id,
-            info_hash: info_hash.to_owned(),
+            torrent_id: add_torrent_response.torrent_id,
+            info_hash: add_torrent_response.info_hash.clone(),
+            original_info_hash: add_torrent_response.original_info_hash.clone(),
         },
     })
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ pub async fn upload_torrent_handler(`
`49`	`49`	`};`
`50`	`50`
`51`	`51`	`match app_data.torrent_service.add_torrent(add_torrent_form, user_id).await {`
`52`		`- Ok(response) => new_torrent_response(response.torrent_id, &response.info_hash).into_response(),`
	`52`	`+ Ok(response) => new_torrent_response(&response).into_response(),`
`53`	`53`	`Err(error) => error.into_response(),`
`54`	`54`	`}`
`55`	`55`	`}`