refactor(api): [#182] Axum API, torrent context, delete torrent info

Author: josecelano

src/web/api/v1/contexts/torrent/handlers.rs

@@ -167,6 +167,37 @@ pub async fn update_torrent_info_handler(
     }
 }
 
+/// Delete a torrent.
+///
+/// # Errors
+///
+/// This function will return an error if unable to:
+///
+/// * Get the user ID from the request.
+/// * Get the torrent info-hash from the request.
+/// * Delete the torrent.
+#[allow(clippy::unused_async)]
+pub async fn delete_torrent_handler(
+    State(app_data): State<Arc<AppData>>,
+    Extract(maybe_bearer_token): Extract,
+    Path(info_hash): Path<InfoHashParam>,
+) -> Response {
+    let Ok(info_hash) = InfoHash::from_str(&info_hash.0) else { return ServiceError::BadRequest.into_response() };
+
+    let user_id = match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
+        Ok(user_id) => user_id,
+        Err(err) => return err.into_response(),
+    };
+
+    match app_data.torrent_service.delete_torrent(&info_hash, &user_id).await {
+        Ok(deleted_torrent_response) => Json(OkResponseData {
+            data: deleted_torrent_response,
+        })
+        .into_response(),
+        Err(err) => err.into_response(),
+    }
+}
+
 /// If the user is logged in, returns the user's ID. Otherwise, returns `None`.
 ///
 /// # Errors

src/web/api/v1/contexts/torrent/routes.rs

@@ -3,19 +3,21 @@
 //! Refer to the [API endpoint documentation](crate::web::api::v1::contexts::torrent).
 use std::sync::Arc;
 
-use axum::routing::{get, post, put};
+use axum::routing::{delete, get, post, put};
 use axum::Router;
 
 use super::handlers::{
-    download_torrent_handler, get_torrent_info_handler, get_torrents_handler, update_torrent_info_handler, upload_torrent_handler,
+    delete_torrent_handler, download_torrent_handler, get_torrent_info_handler, get_torrents_handler,
+    update_torrent_info_handler, upload_torrent_handler,
 };
 use crate::common::AppData;
 
 /// Routes for the [`torrent`](crate::web::api::v1::contexts::torrent) API context for single resources.
 pub fn router_for_single_resources(app_data: Arc<AppData>) -> Router {
     let torrent_info_routes = Router::new()
         .route("/", get(get_torrent_info_handler).with_state(app_data.clone()))
-        .route("/", put(update_torrent_info_handler).with_state(app_data.clone()));
+        .route("/", put(update_torrent_info_handler).with_state(app_data.clone()))
+        .route("/", delete(delete_torrent_handler).with_state(app_data.clone()));
 
     Router::new()
         .route("/upload", post(upload_torrent_handler).with_state(app_data.clone()))

tests/e2e/contexts/torrent/contract.rs

@@ -907,8 +907,6 @@ mod with_axum_implementation {
             assert_eq!(response.status, 400);
         }
 
-        /*
-
         #[tokio::test]
         async fn it_should_not_allow_guests_to_delete_torrents() {
             let mut env = TestEnv::new();
@@ -933,8 +931,6 @@ mod with_axum_implementation {
 
             assert_eq!(response.status, 401);
         }
-
-        */
     }
 
     mod for_authenticated_users {
@@ -1135,8 +1131,6 @@ mod with_axum_implementation {
             use crate::e2e::contexts::user::steps::new_logged_in_user;
             use crate::e2e::environment::TestEnv;
 
-            /*
-
             #[tokio::test]
             async fn it_should_not_allow_non_admins_to_delete_torrents() {
                 let mut env = TestEnv::new();
@@ -1162,8 +1156,6 @@ mod with_axum_implementation {
                 assert_eq!(response.status, 403);
             }
 
-            */
-
             #[tokio::test]
             async fn it_should_allow_non_admin_users_to_update_someone_elses_torrents() {
                 let mut env = TestEnv::new();
@@ -1269,15 +1261,12 @@ mod with_axum_implementation {
 
             use crate::common::client::Client;
             use crate::common::contexts::torrent::forms::UpdateTorrentFrom;
-            //use crate::common::contexts::torrent::responses::{DeletedTorrentResponse, UpdatedTorrentResponse};
-            use crate::common::contexts::torrent::responses::UpdatedTorrentResponse;
+            use crate::common::contexts::torrent::responses::{DeletedTorrentResponse, UpdatedTorrentResponse};
             use crate::e2e::config::ENV_VAR_E2E_EXCLUDE_AXUM_IMPL;
             use crate::e2e::contexts::torrent::steps::upload_random_torrent_to_index;
             use crate::e2e::contexts::user::steps::{new_logged_in_admin, new_logged_in_user};
             use crate::e2e::environment::TestEnv;
 
-            /*
-
             #[tokio::test]
             async fn it_should_allow_admins_to_delete_torrents_searching_by_info_hash() {
                 let mut env = TestEnv::new();
@@ -1307,8 +1296,6 @@ mod with_axum_implementation {
                 assert!(response.is_json_and_ok());
             }
 
-            */
-
             #[tokio::test]
             async fn it_should_allow_admins_to_update_someone_elses_torrents() {
                 let mut env = TestEnv::new();