refactor: encapsule field TrackerCoreContainer in TrackerHttpApiCoreContainer

Author: josecelano

packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs

@@ -16,7 +16,7 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApi
     router.route(
         &format!("{prefix}/stats"),
         get(get_stats_handler).with_state((
-            http_api_container.in_memory_torrent_repository.clone(),
+            http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
             http_api_container.ban_service.clone(),
             http_api_container.http_stats_repository.clone(),
             http_api_container.udp_server_stats_repository.clone(),

packages/axum-rest-tracker-api-server/src/v1/routes.rs

@@ -10,9 +10,21 @@ use super::context::{auth_key, stats, torrent, whitelist};
 pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApiCoreContainer>) -> Router {
     let v1_prefix = format!("{prefix}/v1");
 
-    let router = auth_key::routes::add(&v1_prefix, router, &http_api_container.keys_handler.clone());
+    let router = auth_key::routes::add(
+        &v1_prefix,
+        router,
+        &http_api_container.tracker_core_container.keys_handler.clone(),
+    );
     let router = stats::routes::add(&v1_prefix, router, http_api_container);
-    let router = whitelist::routes::add(&v1_prefix, router, &http_api_container.whitelist_manager);
+    let router = whitelist::routes::add(
+        &v1_prefix,
+        router,
+        &http_api_container.tracker_core_container.whitelist_manager,
+    );
 
-    torrent::routes::add(&v1_prefix, router, &http_api_container.in_memory_torrent_repository.clone())
+    torrent::routes::add(
+        &v1_prefix,
+        router,
+        &http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
+    )
 }

packages/rest-tracker-api-core/src/container.rs

@@ -1,10 +1,7 @@
 use std::sync::Arc;
 
 use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
-use bittorrent_tracker_core::authentication::handler::KeysHandler;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
-use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_tracker_core::whitelist::manager::WhitelistManager;
 use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
 use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self};
@@ -13,22 +10,11 @@ use torrust_tracker_configuration::{Core, HttpApi, HttpTracker, UdpTracker};
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 
 pub struct TrackerHttpApiCoreContainer {
-    // todo: replace with TrackerCoreContainer
-    pub core_config: Arc<Core>,
-    pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    pub keys_handler: Arc<KeysHandler>,
-    pub whitelist_manager: Arc<WhitelistManager>,
-
-    // todo: replace with HttpTrackerCoreContainer
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
     pub http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
-
-    // todo: replace with UdpTrackerCoreContainer
     pub ban_service: Arc<RwLock<BanService>>,
     pub udp_core_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
-
-    // todo: replace with UdpTrackerServerContainer
     pub udp_server_stats_repository: Arc<torrust_udp_tracker_server::statistics::repository::Repository>,
-
     pub http_api_config: Arc<HttpApi>,
 }
 
@@ -63,10 +49,7 @@ impl TrackerHttpApiCoreContainer {
         http_api_config: &Arc<HttpApi>,
     ) -> Arc<TrackerHttpApiCoreContainer> {
         Arc::new(TrackerHttpApiCoreContainer {
-            core_config: tracker_core_container.core_config.clone(),
-            in_memory_torrent_repository: tracker_core_container.in_memory_torrent_repository.clone(),
-            keys_handler: tracker_core_container.keys_handler.clone(),
-            whitelist_manager: tracker_core_container.whitelist_manager.clone(),
+            tracker_core_container: tracker_core_container.clone(),
 
             http_stats_repository: http_tracker_core_container.http_stats_repository.clone(),
 

src/container.rs

@@ -13,17 +13,6 @@ use torrust_tracker_configuration::{Configuration, HttpApi, HttpTracker, UdpTrac
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 use tracing::instrument;
 
-/* todo: remove duplicate code.
-
-   Use containers from packages as AppContainer fields:
-
-   - bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer
-   - bittorrent_http_tracker_core::container::HttpTrackerCoreContainer
-   - torrust_udp_tracker_server::container::UdpTrackerServerContainer
-
-   Container initialization is duplicated.
-*/
-
 pub struct AppContainer {
     pub tracker_core_container: Arc<TrackerCoreContainer>,
 
@@ -149,11 +138,7 @@ impl AppContainer {
     #[must_use]
     pub fn tracker_http_api_container(&self, http_api_config: &Arc<HttpApi>) -> TrackerHttpApiCoreContainer {
         TrackerHttpApiCoreContainer {
-            core_config: self.tracker_core_container.core_config.clone(),
-            in_memory_torrent_repository: self.tracker_core_container.in_memory_torrent_repository.clone(),
-            keys_handler: self.tracker_core_container.keys_handler.clone(),
-            whitelist_manager: self.tracker_core_container.whitelist_manager.clone(),
-
+            tracker_core_container: self.tracker_core_container.clone(),
             http_api_config: http_api_config.clone(),
             ban_service: self.udp_ban_service.clone(),
             http_stats_repository: self.http_stats_repository.clone(),