refactor: [torrust#157] extract API context: stats

src/apis/context/mod.rs

@@ -1 +1,2 @@
 pub mod auth_key;
+pub mod stats;

src/apis/context/stats/handlers.rs

@@ -0,0 +1,13 @@
+use std::sync::Arc;
+
+use axum::extract::State;
+use axum::response::Json;
+
+use super::resources::Stats;
+use super::responses::stats_response;
+use crate::tracker::services::statistics::get_metrics;
+use crate::tracker::Tracker;
+
+pub async fn get_stats_handler(State(tracker): State<Arc<Tracker>>) -> Json<Stats> {
+    stats_response(get_metrics(tracker.clone()).await)
+}

src/apis/context/stats/mod.rs

@@ -0,0 +1,4 @@
+pub mod handlers;
+pub mod resources;
+pub mod responses;
+pub mod routes;

src/apis/context/stats/responses.rs

@@ -0,0 +1,8 @@
+use axum::response::Json;
+
+use super::resources::Stats;
+use crate::tracker::services::statistics::TrackerMetrics;
+
+pub fn stats_response(tracker_metrics: TrackerMetrics) -> Json<Stats> {
+    Json(Stats::from(tracker_metrics))
+}

src/apis/context/stats/routes.rs

@@ -0,0 +1,11 @@
+use std::sync::Arc;
+
+use axum::routing::get;
+use axum::Router;
+
+use super::handlers::get_stats_handler;
+use crate::tracker::Tracker;
+
+pub fn add(router: Router, tracker: Arc<Tracker>) -> Router {
+    router.route("/api/stats", get(get_stats_handler).with_state(tracker))
+}

src/apis/handlers.rs

@@ -8,20 +8,13 @@ use serde::{de, Deserialize, Deserializer};
 
 use super::responses::{
     failed_to_reload_whitelist_response, failed_to_remove_torrent_from_whitelist_response, failed_to_whitelist_torrent_response,
-    invalid_info_hash_param_response, ok_response, stats_response, torrent_info_response, torrent_list_response,
-    torrent_not_known_response,
+    invalid_info_hash_param_response, ok_response, torrent_info_response, torrent_list_response, torrent_not_known_response,
 };
-use crate::apis::resources::stats::Stats;
 use crate::apis::resources::torrent::ListItem;
 use crate::protocol::info_hash::InfoHash;
-use crate::tracker::services::statistics::get_metrics;
 use crate::tracker::services::torrent::{get_torrent_info, get_torrents, Pagination};
 use crate::tracker::Tracker;
 
-pub async fn get_stats_handler(State(tracker): State<Arc<Tracker>>) -> Json<Stats> {
-    stats_response(get_metrics(tracker.clone()).await)
-}
-
 #[derive(Deserialize)]
 pub struct InfoHashParam(String);
 

src/apis/resources/mod.rs

@@ -1,3 +1,2 @@
 pub mod peer;
-pub mod stats;
 pub mod torrent;

src/apis/responses.rs

@@ -5,9 +5,7 @@ use axum::response::{IntoResponse, Json, Response};
 use serde::Serialize;
 use serde_json::json;
 
-use crate::apis::resources::stats::Stats;
 use crate::apis::resources::torrent::{ListItem, Torrent};
-use crate::tracker::services::statistics::TrackerMetrics;
 use crate::tracker::services::torrent::{BasicInfo, Info};
 
 /* code-review:
@@ -39,10 +37,6 @@ pub enum ActionStatus<'a> {
 
 // Resource responses
 
-pub fn stats_response(tracker_metrics: TrackerMetrics) -> Json<Stats> {
-    Json(Stats::from(tracker_metrics))
-}
-
 pub fn torrent_list_response(basic_infos: &[BasicInfo]) -> Json<Vec<ListItem>> {
     Json(ListItem::new_vec(basic_infos))
 }

src/apis/routes.rs

@@ -3,20 +3,23 @@ use std::sync::Arc;
 use axum::routing::{delete, get, post};
 use axum::{middleware, Router};
 
-use super::context::auth_key;
+use super::context::{auth_key, stats};
 use super::handlers::{
-    add_torrent_to_whitelist_handler, get_stats_handler, get_torrent_handler, get_torrents_handler, reload_whitelist_handler,
+    add_torrent_to_whitelist_handler, get_torrent_handler, get_torrents_handler, reload_whitelist_handler,
     remove_torrent_from_whitelist_handler,
 };
 use super::middlewares::auth::auth;
 use crate::tracker::Tracker;
 
 #[allow(clippy::needless_pass_by_value)]
 pub fn router(tracker: Arc<Tracker>) -> Router {
-    let router = Router::new()
-        // Stats
-        .route("/api/stats", get(get_stats_handler).with_state(tracker.clone()))
-        // Torrents
+    let router = Router::new();
+
+    let router = stats::routes::add(router, tracker.clone());
+    let router = auth_key::routes::add(router, tracker.clone());
+
+    // Torrents
+    router
         .route(
             "/api/torrent/:info_hash",
             get(get_torrent_handler).with_state(tracker.clone()),
@@ -35,9 +38,6 @@ pub fn router(tracker: Arc<Tracker>) -> Router {
         .route(
             "/api/whitelist/reload",
             get(reload_whitelist_handler).with_state(tracker.clone()),
-        );
-
-    let router = auth_key::routes::add(router, tracker.clone());
-
-    router.layer(middleware::from_fn_with_state(tracker.config.clone(), auth))
+        )
+        .layer(middleware::from_fn_with_state(tracker.config.clone(), auth))
 }

tests/api/asserts.rs

@@ -2,7 +2,7 @@
 
 use reqwest::Response;
 use torrust_tracker::apis::context::auth_key::resources::AuthKey;
-use torrust_tracker::apis::resources::stats::Stats;
+use torrust_tracker::apis::context::stats::resources::Stats;
 use torrust_tracker::apis::resources::torrent::{ListItem, Torrent};
 
 // Resource responses

tests/tracker_api.rs

@@ -132,7 +132,7 @@ mod tracker_apis {
     mod for_stats_resources {
         use std::str::FromStr;
 
-        use torrust_tracker::apis::resources::stats::Stats;
+        use torrust_tracker::apis::context::stats::resources::Stats;
         use torrust_tracker::protocol::info_hash::InfoHash;
         use torrust_tracker_test_helpers::configuration;