refactor: [#1541] rename symbol db_torrent_repository to db_downloads_metric_repository

josecelano · josecelano · commit 99adbdee9dfe · 2025-05-27T14:41:48.000+01:00
diff --git a/packages/axum-http-tracker-server/src/v1/handlers/announce.rs b/packages/axum-http-tracker-server/src/v1/handlers/announce.rs
@@ -156,12 +156,12 @@ mod tests {
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
         let authentication_service = Arc::new(AuthenticationService::new(&config.core, &in_memory_key_repository));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         // HTTP core stats
diff --git a/packages/http-tracker-core/benches/helpers/util.rs b/packages/http-tracker-core/benches/helpers/util.rs
@@ -45,7 +45,7 @@ pub fn initialize_core_tracker_services_with_config(config: &Configuration) -> (
     let core_config = Arc::new(config.core.clone());
     let database = initialize_database(&config.core);
     let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-    let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+    let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
     let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
     let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
     let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
@@ -55,7 +55,7 @@ pub fn initialize_core_tracker_services_with_config(config: &Configuration) -> (
         &config.core,
         &whitelist_authorization,
         &in_memory_torrent_repository,
-        &db_torrent_repository,
+        &db_downloads_metric_repository,
     ));
 
     // HTTP core stats
diff --git a/packages/http-tracker-core/src/services/announce.rs b/packages/http-tracker-core/src/services/announce.rs
@@ -239,7 +239,7 @@ mod tests {
         let core_config = Arc::new(config.core.clone());
         let database = initialize_database(&config.core);
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
@@ -249,7 +249,7 @@ mod tests {
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         // HTTP core stats
diff --git a/packages/http-tracker-core/src/services/scrape.rs b/packages/http-tracker-core/src/services/scrape.rs
@@ -200,15 +200,15 @@ mod tests {
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
         let authentication_service = Arc::new(AuthenticationService::new(&config.core, &in_memory_key_repository));
 
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
diff --git a/packages/tracker-core/src/announce_handler.rs b/packages/tracker-core/src/announce_handler.rs
@@ -115,7 +115,7 @@ pub struct AnnounceHandler {
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
 
     /// Repository for persistent torrent data (database).
-    db_torrent_repository: Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
 }
 
 impl AnnounceHandler {
@@ -125,13 +125,13 @@ impl AnnounceHandler {
         config: &Core,
         whitelist_authorization: &Arc<WhitelistAuthorization>,
         in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
-        db_torrent_repository: &Arc<DatabaseDownloadsMetricRepository>,
+        db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     ) -> Self {
         Self {
             whitelist_authorization: whitelist_authorization.clone(),
             config: config.clone(),
             in_memory_torrent_repository: in_memory_torrent_repository.clone(),
-            db_torrent_repository: db_torrent_repository.clone(),
+            db_downloads_metric_repository: db_downloads_metric_repository.clone(),
         }
     }
 
@@ -169,7 +169,7 @@ impl AnnounceHandler {
         // downloads across all torrents. The in-memory metric will count only
         // the number of downloads during the current tracker uptime.
         let opt_persistent_torrent = if self.config.tracker_policy.persistent_torrent_completed_stat {
-            self.db_torrent_repository.load(info_hash)?
+            self.db_downloads_metric_repository.load(info_hash)?
         } else {
             None
         };
diff --git a/packages/tracker-core/src/container.rs b/packages/tracker-core/src/container.rs
@@ -31,7 +31,7 @@ pub struct TrackerCoreContainer {
     pub whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
     pub whitelist_manager: Arc<WhitelistManager>,
     pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    pub db_torrent_repository: Arc<DatabaseDownloadsMetricRepository>,
+    pub db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
     pub torrents_manager: Arc<TorrentsManager>,
     pub stats_repository: Arc<statistics::repository::Repository>,
 }
@@ -51,12 +51,12 @@ impl TrackerCoreContainer {
             &in_memory_key_repository.clone(),
         ));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::new(torrent_repository_container.swarms.clone()));
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
         let torrents_manager = Arc::new(TorrentsManager::new(
             core_config,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let stats_repository = Arc::new(statistics::repository::Repository::new());
@@ -65,7 +65,7 @@ impl TrackerCoreContainer {
             core_config,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
@@ -81,7 +81,7 @@ impl TrackerCoreContainer {
             whitelist_authorization,
             whitelist_manager,
             in_memory_torrent_repository,
-            db_torrent_repository,
+            db_downloads_metric_repository,
             torrents_manager,
             stats_repository,
         }
diff --git a/packages/tracker-core/src/statistics/event/handler.rs b/packages/tracker-core/src/statistics/event/handler.rs
@@ -12,7 +12,7 @@ use crate::torrent::repository::persisted::DatabaseDownloadsMetricRepository;
 pub async fn handle_event(
     event: Event,
     stats_repository: &Arc<Repository>,
-    db_torrent_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     persistent_torrent_completed_stat: bool,
     now: DurationSinceUnixEpoch,
 ) {
@@ -53,7 +53,7 @@ pub async fn handle_event(
 
             if persistent_torrent_completed_stat {
                 // Increment the number of downloads for the torrent in the database
-                match db_torrent_repository.increase_number_of_downloads(&info_hash) {
+                match db_downloads_metric_repository.increase_number_of_downloads(&info_hash) {
                     Ok(()) => {
                         tracing::debug!(info_hash = ?info_hash, "Number of torrent downloads increased");
                     }
@@ -63,7 +63,7 @@ pub async fn handle_event(
                 }
 
                 // Increment the global number of downloads (for all torrents) in the database
-                match db_torrent_repository.increase_global_number_of_downloads() {
+                match db_downloads_metric_repository.increase_global_number_of_downloads() {
                     Ok(()) => {
                         tracing::debug!("Global number of downloads increased");
                     }
diff --git a/packages/tracker-core/src/statistics/event/listener.rs b/packages/tracker-core/src/statistics/event/listener.rs
@@ -14,19 +14,19 @@ use crate::{CurrentClock, TRACKER_CORE_LOG_TARGET};
 pub fn run_event_listener(
     receiver: Receiver,
     repository: &Arc<Repository>,
-    db_torrent_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     persistent_torrent_completed_stat: bool,
 ) -> JoinHandle<()> {
     let stats_repository = repository.clone();
-    let db_torrent_repository: Arc<DatabaseDownloadsMetricRepository> = db_torrent_repository.clone();
+    let db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository> = db_downloads_metric_repository.clone();
 
     tracing::info!(target: TRACKER_CORE_LOG_TARGET, "Starting torrent repository event listener");
 
     tokio::spawn(async move {
         dispatch_events(
             receiver,
             stats_repository,
-            db_torrent_repository,
+            db_downloads_metric_repository,
             persistent_torrent_completed_stat,
         )
         .await;
@@ -38,7 +38,7 @@ pub fn run_event_listener(
 async fn dispatch_events(
     mut receiver: Receiver,
     stats_repository: Arc<Repository>,
-    db_torrent_repository: Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
     persistent_torrent_completed_stat: bool,
 ) {
     let shutdown_signal = tokio::signal::ctrl_c();
@@ -59,7 +59,7 @@ async fn dispatch_events(
                     Ok(event) => handle_event(
                         event,
                         &stats_repository,
-                        &db_torrent_repository,
+                        &db_downloads_metric_repository,
                         persistent_torrent_completed_stat,
                         CurrentClock::now()).await,
                     Err(e) => {
diff --git a/packages/tracker-core/src/statistics/persisted_metrics.rs b/packages/tracker-core/src/statistics/persisted_metrics.rs
@@ -18,10 +18,10 @@ use crate::torrent::repository::persisted::DatabaseDownloadsMetricRepository;
 /// metric collection fails to set the initial metric values.
 pub async fn load_persisted_metrics(
     stats_repository: &Arc<Repository>,
-    db_torrent_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     now: DurationSinceUnixEpoch,
 ) -> Result<(), Error> {
-    if let Some(downloads) = db_torrent_repository.load_global_number_of_downloads()? {
+    if let Some(downloads) = db_downloads_metric_repository.load_global_number_of_downloads()? {
         stats_repository
             .set_counter(
                 &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
diff --git a/packages/tracker-core/src/test_helpers.rs b/packages/tracker-core/src/test_helpers.rs
@@ -137,13 +137,13 @@ pub(crate) mod tests {
             &in_memory_whitelist.clone(),
         ));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
diff --git a/packages/tracker-core/src/torrent/manager.rs b/packages/tracker-core/src/torrent/manager.rs
@@ -31,7 +31,7 @@ pub struct TorrentsManager {
 
     /// The persistent torrents repository.
     #[allow(dead_code)]
-    db_torrent_repository: Arc<DatabaseDownloadsMetricRepository>,
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
 }
 
 impl TorrentsManager {
@@ -42,7 +42,7 @@ impl TorrentsManager {
     /// * `config` - A reference to the tracker configuration.
     /// * `in_memory_torrent_repository` - A shared reference to the in-memory
     ///   repository of torrents.
-    /// * `db_torrent_repository` - A shared reference to the persistent
+    /// * `db_downloads_metric_repository` - A shared reference to the persistent
     ///   repository for torrent metrics.
     ///
     /// # Returns
@@ -52,12 +52,12 @@ impl TorrentsManager {
     pub fn new(
         config: &Core,
         in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
-        db_torrent_repository: &Arc<DatabaseDownloadsMetricRepository>,
+        db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     ) -> Self {
         Self {
             config: config.clone(),
             in_memory_torrent_repository: in_memory_torrent_repository.clone(),
-            db_torrent_repository: db_torrent_repository.clone(),
+            db_downloads_metric_repository: db_downloads_metric_repository.clone(),
         }
     }
 
@@ -72,7 +72,7 @@ impl TorrentsManager {
     /// Returns a `databases::error::Error` if unable to load the persistent
     /// torrent data.
     pub fn load_torrents_from_database(&self) -> Result<(), databases::error::Error> {
-        let persistent_torrents = self.db_torrent_repository.load_all()?;
+        let persistent_torrents = self.db_downloads_metric_repository.load_all()?;
 
         println!("Loaded {} persistent torrents from the database", persistent_torrents.len());
 
diff --git a/packages/tracker-core/tests/common/test_env.rs b/packages/tracker-core/tests/common/test_env.rs
@@ -57,7 +57,7 @@ impl TestEnv {
     async fn load_persisted_metrics(&self, now: DurationSinceUnixEpoch) {
         load_persisted_metrics(
             &self.tracker_core_container.stats_repository,
-            &self.tracker_core_container.db_torrent_repository,
+            &self.tracker_core_container.db_downloads_metric_repository,
             now,
         )
         .await
@@ -77,7 +77,7 @@ impl TestEnv {
         let job = bittorrent_tracker_core::statistics::event::listener::run_event_listener(
             self.torrent_repository_container.event_bus.receiver(),
             &self.tracker_core_container.stats_repository,
-            &self.tracker_core_container.db_torrent_repository,
+            &self.tracker_core_container.db_downloads_metric_repository,
             self.tracker_core_container
                 .core_config
                 .tracker_policy
diff --git a/packages/udp-tracker-server/src/handlers/announce.rs b/packages/udp-tracker-server/src/handlers/announce.rs
@@ -885,7 +885,7 @@ mod tests {
                     let whitelist_authorization =
                         Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
                     let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-                    let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+                    let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
                     let mut udp_core_stats_event_sender_mock = MockUdpCoreStatsEventSender::new();
                     udp_core_stats_event_sender_mock
@@ -923,7 +923,7 @@ mod tests {
                         &config.core,
                         &whitelist_authorization,
                         &in_memory_torrent_repository,
-                        &db_torrent_repository,
+                        &db_downloads_metric_repository,
                     ));
 
                     let request = AnnounceRequestBuilder::default()
diff --git a/packages/udp-tracker-server/src/handlers/mod.rs b/packages/udp-tracker-server/src/handlers/mod.rs
@@ -275,12 +275,12 @@ pub(crate) mod tests {
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
 
diff --git a/src/app.rs b/src/app.rs
@@ -143,7 +143,7 @@ async fn load_torrent_metrics(config: &Configuration, app_container: &Arc<AppCon
     if config.core.tracker_policy.persistent_torrent_completed_stat {
         bittorrent_tracker_core::statistics::persisted_metrics::load_persisted_metrics(
             &app_container.tracker_core_container.stats_repository,
-            &app_container.tracker_core_container.db_torrent_repository,
+            &app_container.tracker_core_container.db_downloads_metric_repository,
             CurrentClock::now(),
         )
         .await
diff --git a/src/bootstrap/jobs/tracker_core.rs b/src/bootstrap/jobs/tracker_core.rs
@@ -10,7 +10,7 @@ pub fn start_event_listener(config: &Configuration, app_container: &Arc<AppConta
         let job = bittorrent_tracker_core::statistics::event::listener::run_event_listener(
             app_container.torrent_repository_container.event_bus.receiver(),
             &app_container.tracker_core_container.stats_repository,
-            &app_container.tracker_core_container.db_torrent_repository,
+            &app_container.tracker_core_container.db_downloads_metric_repository,
             app_container
                 .tracker_core_container
                 .core_config
