refactor: rename mod time to clock

josecelano · josecelano · commit df650dbfd701 · 2023-05-05T10:29:04.000+01:00
And safer type convertion from i64 (timestamp) to u64.
diff --git a/src/auth.rs b/src/auth.rs
@@ -7,7 +7,7 @@ use crate::config::Configuration;
 use crate::databases::database::Database;
 use crate::errors::ServiceError;
 use crate::models::user::{UserClaims, UserCompact};
-use crate::utils::time::current_time;
+use crate::utils::clock::current_time;
 
 pub struct AuthorizationService {
     cfg: Arc<Configuration>,
diff --git a/src/databases/mysql.rs b/src/databases/mysql.rs
@@ -9,8 +9,8 @@ use crate::models::torrent::TorrentListing;
 use crate::models::torrent_file::{DbTorrentAnnounceUrl, DbTorrentFile, DbTorrentInfo, Torrent, TorrentFile};
 use crate::models::tracker_key::TrackerKey;
 use crate::models::user::{User, UserAuthentication, UserCompact, UserProfile};
+use crate::utils::clock::current_time;
 use crate::utils::hex::bytes_to_hex;
-use crate::utils::time::current_time;
 
 pub struct MysqlDatabase {
     pub pool: MySqlPool,
diff --git a/src/databases/sqlite.rs b/src/databases/sqlite.rs
@@ -9,8 +9,8 @@ use crate::models::torrent::TorrentListing;
 use crate::models::torrent_file::{DbTorrentAnnounceUrl, DbTorrentFile, DbTorrentInfo, Torrent, TorrentFile};
 use crate::models::tracker_key::TrackerKey;
 use crate::models::user::{User, UserAuthentication, UserCompact, UserProfile};
+use crate::utils::clock::current_time;
 use crate::utils::hex::bytes_to_hex;
-use crate::utils::time::current_time;
 
 pub struct SqliteDatabase {
     pub pool: SqlitePool,
diff --git a/src/mailer.rs b/src/mailer.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::config::Configuration;
 use crate::errors::ServiceError;
-use crate::utils::time::current_time;
+use crate::utils::clock::current_time;
 
 pub struct MailerService {
     cfg: Arc<Configuration>,
diff --git a/src/routes/user.rs b/src/routes/user.rs
@@ -13,8 +13,8 @@ use crate::errors::{ServiceError, ServiceResult};
 use crate::mailer::VerifyClaims;
 use crate::models::response::{OkResponse, TokenResponse};
 use crate::models::user::UserAuthentication;
+use crate::utils::clock::current_time;
 use crate::utils::regex::validate_email_address;
-use crate::utils::time::current_time;
 
 pub fn init_routes(cfg: &mut web::ServiceConfig) {
     cfg.service(
diff --git a/src/upgrades/from_v1_0_0_to_v2_0_0/databases/sqlite_v2_0_0.rs b/src/upgrades/from_v1_0_0_to_v2_0_0/databases/sqlite_v2_0_0.rs
@@ -29,6 +29,7 @@ pub struct TorrentRecordV2 {
 }
 
 impl TorrentRecordV2 {
+    #[must_use]
     pub fn from_v1_data(torrent: &TorrentRecordV1, torrent_info: &TorrentInfo, uploader: &UserRecordV1) -> Self {
         Self {
             torrent_id: torrent.torrent_id,
@@ -75,7 +76,7 @@ impl SqliteDatabaseV2_0_0 {
         sqlx::migrate!("migrations/sqlite3")
             .run(&self.pool)
             .await
-            .expect("Could not run database migrations.")
+            .expect("Could not run database migrations.");
     }
 
     pub async fn reset_categories_sequence(&self) -> Result<SqliteQueryResult, DatabaseError> {
diff --git a/src/utils/clock.rs b/src/utils/clock.rs
@@ -0,0 +1,4 @@
+#[must_use]
+pub fn current_time() -> u64 {
+    u64::try_from(chrono::prelude::Utc::now().timestamp()).expect("timestamp should be positive")
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -1,4 +1,4 @@
+pub mod clock;
 pub mod hex;
 pub mod parse_torrent;
 pub mod regex;
-pub mod time;
diff --git a/src/utils/time.rs b/src/utils/time.rs

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ pub struct TorrentRecordV2 {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`impl TorrentRecordV2 {`
	`32`	`+ #[must_use]`
`32`	`33`	`pub fn from_v1_data(torrent: &TorrentRecordV1, torrent_info: &TorrentInfo, uploader: &UserRecordV1) -> Self {`
`33`	`34`	`Self {`
`34`	`35`	`torrent_id: torrent.torrent_id,`
`@@ -75,7 +76,7 @@ impl SqliteDatabaseV2_0_0 {`
`75`	`76`	`sqlx::migrate!("migrations/sqlite3")`
`76`	`77`	`.run(&self.pool)`
`77`	`78`	`.await`
`78`		`- .expect("Could not run database migrations.")`
	`79`	`+ .expect("Could not run database migrations.");`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`pub async fn reset_categories_sequence(&self) -> Result<SqliteQueryResult, DatabaseError> {`