From 6dd3c482868dbee638e71b4bee86cce5c751d476 Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Fri, 13 Jan 2023 17:04:38 +0000
Subject: [PATCH] refactor(api): [#143] move API resources mod

---
 src/api/mod.rs                                   | 1 -
 src/apis/mod.rs                                  | 1 +
 src/{api/resource => apis/resources}/auth_key.rs | 0
 src/{api/resource => apis/resources}/mod.rs      | 0
 src/{api/resource => apis/resources}/peer.rs     | 0
 src/{api/resource => apis/resources}/stats.rs    | 0
 src/{api/resource => apis/resources}/torrent.rs  | 4 ++--
 src/apis/routes.rs                               | 6 +++---
 src/lib.rs                                       | 1 -
 tests/api/asserts.rs                             | 6 +++---
 tests/tracker_api.rs                             | 8 ++++----
 11 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 src/api/mod.rs
 rename src/{api/resource => apis/resources}/auth_key.rs (100%)
 rename src/{api/resource => apis/resources}/mod.rs (100%)
 rename src/{api/resource => apis/resources}/peer.rs (100%)
 rename src/{api/resource => apis/resources}/stats.rs (100%)
 rename src/{api/resource => apis/resources}/torrent.rs (97%)

diff --git a/src/api/mod.rs b/src/api/mod.rs
deleted file mode 100644
index c6bee053..00000000
--- a/src/api/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod resource;
diff --git a/src/apis/mod.rs b/src/apis/mod.rs
index ea1615d6..7ed3ecb7 100644
--- a/src/apis/mod.rs
+++ b/src/apis/mod.rs
@@ -1,3 +1,4 @@
 pub mod middlewares;
+pub mod resources;
 pub mod routes;
 pub mod server;
diff --git a/src/api/resource/auth_key.rs b/src/apis/resources/auth_key.rs
similarity index 100%
rename from src/api/resource/auth_key.rs
rename to src/apis/resources/auth_key.rs
diff --git a/src/api/resource/mod.rs b/src/apis/resources/mod.rs
similarity index 100%
rename from src/api/resource/mod.rs
rename to src/apis/resources/mod.rs
diff --git a/src/api/resource/peer.rs b/src/apis/resources/peer.rs
similarity index 100%
rename from src/api/resource/peer.rs
rename to src/apis/resources/peer.rs
diff --git a/src/api/resource/stats.rs b/src/apis/resources/stats.rs
similarity index 100%
rename from src/api/resource/stats.rs
rename to src/apis/resources/stats.rs
diff --git a/src/api/resource/torrent.rs b/src/apis/resources/torrent.rs
similarity index 97%
rename from src/api/resource/torrent.rs
rename to src/apis/resources/torrent.rs
index 56fead37..3d8b2f42 100644
--- a/src/api/resource/torrent.rs
+++ b/src/apis/resources/torrent.rs
@@ -74,8 +74,8 @@ mod tests {
 
     use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
 
-    use crate::api::resource::peer::Peer;
-    use crate::api::resource::torrent::{ListItem, Torrent};
+    use crate::apis::resources::peer::Peer;
+    use crate::apis::resources::torrent::{ListItem, Torrent};
     use crate::protocol::clock::DurationSinceUnixEpoch;
     use crate::protocol::info_hash::InfoHash;
     use crate::tracker::peer;
diff --git a/src/apis/routes.rs b/src/apis/routes.rs
index f0585b22..e11e7d4c 100644
--- a/src/apis/routes.rs
+++ b/src/apis/routes.rs
@@ -12,9 +12,9 @@ use serde::{de, Deserialize, Deserializer, Serialize};
 use serde_json::json;
 
 use super::middlewares::auth::auth;
-use crate::api::resource::auth_key::AuthKey;
-use crate::api::resource::stats::Stats;
-use crate::api::resource::torrent::{ListItem, Torrent};
+use crate::apis::resources::auth_key::AuthKey;
+use crate::apis::resources::stats::Stats;
+use crate::apis::resources::torrent::{ListItem, Torrent};
 use crate::protocol::info_hash::InfoHash;
 use crate::tracker::auth::KeyId;
 use crate::tracker::services::statistics::{get_metrics, TrackerMetrics};
diff --git a/src/lib.rs b/src/lib.rs
index ebf589aa..e8cf5304 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod api;
 pub mod apis;
 pub mod config;
 pub mod databases;
diff --git a/tests/api/asserts.rs b/tests/api/asserts.rs
index 11aac64d..07383f79 100644
--- a/tests/api/asserts.rs
+++ b/tests/api/asserts.rs
@@ -1,9 +1,9 @@
 // code-review: should we use macros to return the exact line where the assert fails?
 
 use reqwest::Response;
-use torrust_tracker::api::resource::auth_key::AuthKey;
-use torrust_tracker::api::resource::stats::Stats;
-use torrust_tracker::api::resource::torrent::{ListItem, Torrent};
+use torrust_tracker::apis::resources::auth_key::AuthKey;
+use torrust_tracker::apis::resources::stats::Stats;
+use torrust_tracker::apis::resources::torrent::{ListItem, Torrent};
 
 // Resource responses
 
diff --git a/tests/tracker_api.rs b/tests/tracker_api.rs
index d07d2fe2..9609e80a 100644
--- a/tests/tracker_api.rs
+++ b/tests/tracker_api.rs
@@ -132,7 +132,7 @@ mod tracker_apis {
     mod for_stats_resources {
         use std::str::FromStr;
 
-        use torrust_tracker::api::resource::stats::Stats;
+        use torrust_tracker::apis::resources::stats::Stats;
         use torrust_tracker::protocol::info_hash::InfoHash;
 
         use crate::api::asserts::{assert_stats, assert_token_not_valid, assert_unauthorized};
@@ -199,8 +199,8 @@ mod tracker_apis {
     mod for_torrent_resources {
         use std::str::FromStr;
 
-        use torrust_tracker::api::resource::torrent::Torrent;
-        use torrust_tracker::api::resource::{self, torrent};
+        use torrust_tracker::apis::resources::torrent::Torrent;
+        use torrust_tracker::apis::resources::{self, torrent};
         use torrust_tracker::protocol::info_hash::InfoHash;
 
         use super::{invalid_infohashes_returning_bad_request, invalid_infohashes_returning_not_found};
@@ -362,7 +362,7 @@ mod tracker_apis {
                     seeders: 1,
                     completed: 0,
                     leechers: 0,
-                    peers: Some(vec![resource::peer::Peer::from(peer)]),
+                    peers: Some(vec![resources::peer::Peer::from(peer)]),
                 },
             )
             .await;