refactor: [#1541] move mod

Author: josecelano

packages/axum-http-tracker-server/src/v1/handlers/announce.rs

@@ -119,8 +119,8 @@ mod tests {
     use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
     use torrust_tracker_configuration::Configuration;

packages/http-tracker-core/benches/helpers/util.rs

@@ -14,8 +14,8 @@ use bittorrent_tracker_core::announce_handler::AnnounceHandler;
 use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
 use bittorrent_tracker_core::authentication::service::AuthenticationService;
 use bittorrent_tracker_core::databases::setup::initialize_database;
+use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_tracker_core::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
 use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
 use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
 use futures::future::BoxFuture;

packages/http-tracker-core/src/services/announce.rs

@@ -212,8 +212,8 @@ mod tests {
     use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
     use torrust_tracker_configuration::{Configuration, Core};

packages/http-tracker-core/src/services/scrape.rs

@@ -176,8 +176,8 @@ mod tests {
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
     use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
     use futures::future::BoxFuture;

packages/tracker-core/src/announce_handler.rs

@@ -99,8 +99,8 @@ use torrust_tracker_primitives::core::AnnounceData;
 use torrust_tracker_primitives::peer;
 
 use super::torrent::repository::in_memory::InMemoryTorrentRepository;
-use super::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
 use crate::error::AnnounceError;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::whitelist::authorization::WhitelistAuthorization;
 
 /// Handles `announce` requests from `BitTorrent` clients.

packages/tracker-core/src/container.rs

@@ -11,9 +11,9 @@ use crate::authentication::service::AuthenticationService;
 use crate::databases::setup::initialize_database;
 use crate::databases::Database;
 use crate::scrape_handler::ScrapeHandler;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::torrent::manager::TorrentsManager;
 use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
 use crate::whitelist::authorization::WhitelistAuthorization;
 use crate::whitelist::manager::WhitelistManager;
 use crate::whitelist::repository::in_memory::InMemoryWhitelist;

packages/tracker-core/src/statistics/event/handler.rs

@@ -5,9 +5,9 @@ use torrust_tracker_metrics::metric_name;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 use torrust_tracker_torrent_repository::event::Event;
 
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::statistics::repository::Repository;
 use crate::statistics::TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL;
-use crate::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
 
 pub async fn handle_event(
     event: Event,

packages/tracker-core/src/statistics/event/listener.rs

@@ -6,8 +6,8 @@ use torrust_tracker_events::receiver::RecvError;
 use torrust_tracker_torrent_repository::event::receiver::Receiver;
 
 use super::handler::handle_event;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::statistics::repository::Repository;
-use crate::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
 use crate::{CurrentClock, TRACKER_CORE_LOG_TARGET};
 
 #[must_use]

…core/src/torrent/repository/downloads.rs …re/src/statistics/persisted/downloads.rspackages/tracker-core/src/torrent/repository/downloads.rs renamed to packages/tracker-core/src/statistics/persisted/downloads.rs packages/tracker-core/src/torrent/repository/downloads.rs renamed to packages/tracker-core/src/statistics/persisted/downloads.rs

@@ -1,3 +1,5 @@
+pub mod downloads;
+
 use std::sync::Arc;
 
 use thiserror::Error;
@@ -8,7 +10,7 @@ use torrust_tracker_primitives::DurationSinceUnixEpoch;
 use super::repository::Repository;
 use super::TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL;
 use crate::databases;
-use crate::torrent::repository::downloads::DatabaseDownloadsMetricRepository;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 
 /// Loads persisted metrics from the database and sets them in the stats repository.
 ///