From 4620ed2aeb8ff19d3cc6525ad3420ce9c059ee8b Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Sun, 27 Nov 2022 23:13:01 +0100 Subject: [PATCH] refactor: move filetype.rs, util.rs to utils directory --- api/src/guards/data/letter.rs | 2 +- api/src/guards/data/portfolio.rs | 2 +- api/src/pool.rs | 2 +- core/src/database/mutation/candidate.rs | 2 +- core/src/database/mutation/parent.rs | 2 +- core/src/database/query/admin.rs | 2 +- core/src/database/query/candidate.rs | 2 +- core/src/database/query/parent.rs | 2 +- core/src/database/query/session.rs | 2 +- core/src/lib.rs | 2 -- core/src/services/admin_service.rs | 2 +- core/src/services/application_service.rs | 2 +- core/src/services/candidate_service.rs | 4 ++-- core/src/services/portfolio_service.rs | 2 +- core/src/services/session_service.rs | 2 +- core/src/{util.rs => utils/db.rs} | 0 core/src/{ => utils}/filetype.rs | 0 core/src/utils/mod.rs | 4 +++- 18 files changed, 18 insertions(+), 18 deletions(-) rename core/src/{util.rs => utils/db.rs} (100%) rename core/src/{ => utils}/filetype.rs (100%) diff --git a/api/src/guards/data/letter.rs b/api/src/guards/data/letter.rs index ed4f6e3..58ee4e2 100644 --- a/api/src/guards/data/letter.rs +++ b/api/src/guards/data/letter.rs @@ -31,7 +31,7 @@ impl<'r> FromData<'r> for Letter { let data_bytes = data_bytes.into_inner(); - let is_pdf = portfolio_core::filetype::filetype_is_pdf(&data_bytes); + let is_pdf = portfolio_core::utils::filetype::filetype_is_pdf(&data_bytes); if !is_pdf { // TODO: Not PDF diff --git a/api/src/guards/data/portfolio.rs b/api/src/guards/data/portfolio.rs index 623c589..9029220 100644 --- a/api/src/guards/data/portfolio.rs +++ b/api/src/guards/data/portfolio.rs @@ -31,7 +31,7 @@ impl<'r> FromData<'r> for Portfolio { let data_bytes = data_bytes.into_inner(); - let is_zip = portfolio_core::filetype::filetype_is_zip(&data_bytes); + let is_zip = portfolio_core::utils::filetype::filetype_is_zip(&data_bytes); if !is_zip { // TODO: Not ZIP diff --git a/api/src/pool.rs b/api/src/pool.rs index d3a45a6..539259c 100644 --- a/api/src/pool.rs +++ b/api/src/pool.rs @@ -23,7 +23,7 @@ impl sea_orm_rocket::Pool for SeaOrmPool { #[cfg(test)] async fn init(_figment: &Figment) -> Result { - let conn = portfolio_core::util::get_memory_sqlite_connection().await; + let conn = portfolio_core::utils::db::get_memory_sqlite_connection().await; crate::test::tests::run_test_migrations(&conn).await; return Ok(Self { conn }); } diff --git a/core/src/database/mutation/candidate.rs b/core/src/database/mutation/candidate.rs index 8d85bab..dbc2f55 100644 --- a/core/src/database/mutation/candidate.rs +++ b/core/src/database/mutation/candidate.rs @@ -69,7 +69,7 @@ impl Mutation { mod tests { use crate::candidate_details::tests::APPLICATION_DETAILS; use crate::candidate_details::{EncryptedApplicationDetails}; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; use crate::{Mutation, Query}; #[tokio::test] diff --git a/core/src/database/mutation/parent.rs b/core/src/database/mutation/parent.rs index 51586c8..c31298c 100644 --- a/core/src/database/mutation/parent.rs +++ b/core/src/database/mutation/parent.rs @@ -36,7 +36,7 @@ impl Mutation { mod tests { use crate::candidate_details::tests::APPLICATION_DETAILS; use crate::candidate_details::{EncryptedApplicationDetails}; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; use crate::{Mutation, Query}; #[tokio::test] diff --git a/core/src/database/query/admin.rs b/core/src/database/query/admin.rs index de61db1..307d13f 100644 --- a/core/src/database/query/admin.rs +++ b/core/src/database/query/admin.rs @@ -25,7 +25,7 @@ mod tests { use entity::admin; use sea_orm::{ActiveModelTrait, Set}; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; use crate::Query; #[tokio::test] diff --git a/core/src/database/query/candidate.rs b/core/src/database/query/candidate.rs index 4bf96d6..ae24441 100644 --- a/core/src/database/query/candidate.rs +++ b/core/src/database/query/candidate.rs @@ -122,7 +122,7 @@ mod tests { use entity::candidate; use crate::Query; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; #[tokio::test] async fn test_find_candidate_by_id() { diff --git a/core/src/database/query/parent.rs b/core/src/database/query/parent.rs index c53e443..787b85c 100644 --- a/core/src/database/query/parent.rs +++ b/core/src/database/query/parent.rs @@ -22,7 +22,7 @@ mod tests { use sea_orm::{ActiveModelTrait, Set}; use crate::Query; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; #[tokio::test] async fn test_find_parent_by_id() { diff --git a/core/src/database/query/session.rs b/core/src/database/query/session.rs index 6a1eb14..10aed95 100644 --- a/core/src/database/query/session.rs +++ b/core/src/database/query/session.rs @@ -35,7 +35,7 @@ mod tests { use entity::{session}; use sea_orm::{prelude::Uuid, ActiveModelTrait, Set}; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; use crate::Query; #[tokio::test] diff --git a/core/src/lib.rs b/core/src/lib.rs index dd3e5c8..e58447a 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -5,11 +5,9 @@ pub use database::query::*; pub mod database; pub mod crypto; -pub mod filetype; pub mod services; pub mod error; pub mod candidate_details; -pub mod util; pub mod responses; pub mod utils; diff --git a/core/src/services/admin_service.rs b/core/src/services/admin_service.rs index fd7a62a..f393102 100644 --- a/core/src/services/admin_service.rs +++ b/core/src/services/admin_service.rs @@ -57,7 +57,7 @@ mod admin_tests { use entity::admin; use sea_orm::{Set, ActiveModelTrait}; - use crate::{util::get_memory_sqlite_connection, error::ServiceError}; + use crate::{utils::db::get_memory_sqlite_connection, error::ServiceError}; use super::*; diff --git a/core/src/services/application_service.rs b/core/src/services/application_service.rs index 85b54e4..e245a4b 100644 --- a/core/src/services/application_service.rs +++ b/core/src/services/application_service.rs @@ -1,7 +1,7 @@ use entity::{candidate, parent}; use sea_orm::DbConn; -use crate::{error::ServiceError, candidate_details::{ApplicationDetails, EncryptedApplicationDetails}, Query, util::get_recipients}; +use crate::{error::ServiceError, candidate_details::{ApplicationDetails, EncryptedApplicationDetails}, Query, utils::db::get_recipients}; use super::{parent_service::ParentService, candidate_service::CandidateService}; diff --git a/core/src/services/candidate_service.rs b/core/src/services/candidate_service.rs index f067ea8..34cd9b5 100644 --- a/core/src/services/candidate_service.rs +++ b/core/src/services/candidate_service.rs @@ -5,7 +5,7 @@ use crate::{ candidate_details::{EncryptedApplicationDetails, EncryptedString}, crypto::{self, hash_password}, error::ServiceError, - Mutation, Query, responses::{BaseCandidateResponse, CreateCandidateResponse}, util::get_recipients, + Mutation, Query, responses::{BaseCandidateResponse, CreateCandidateResponse}, utils::db::get_recipients, }; use super::{session_service::{AdminUser, SessionService}, application_service::ApplicationService, portfolio_service::PortfolioService}; @@ -255,7 +255,7 @@ pub mod tests { use sea_orm::{DbConn}; use crate::candidate_details::tests::assert_all_application_details; - use crate::util::get_memory_sqlite_connection; + use crate::utils::db::get_memory_sqlite_connection; use crate::{crypto, services::candidate_service::CandidateService, Mutation}; use super::EncryptedApplicationDetails; diff --git a/core/src/services/portfolio_service.rs b/core/src/services/portfolio_service.rs index 4251519..89deb3b 100644 --- a/core/src/services/portfolio_service.rs +++ b/core/src/services/portfolio_service.rs @@ -332,7 +332,7 @@ impl PortfolioService { mod tests { use serial_test::serial; - use crate::{services::{portfolio_service::{PortfolioService, FileType}, candidate_service::{CandidateService, tests::put_user_data}}, util::get_memory_sqlite_connection, crypto}; + use crate::{services::{portfolio_service::{PortfolioService, FileType}, candidate_service::{CandidateService, tests::put_user_data}}, utils::db::get_memory_sqlite_connection, crypto}; use std::path::PathBuf; const APPLICATION_ID: i32 = 103151; diff --git a/core/src/services/session_service.rs b/core/src/services/session_service.rs index 08c9bac..389c712 100644 --- a/core/src/services/session_service.rs +++ b/core/src/services/session_service.rs @@ -172,7 +172,7 @@ mod tests { use crate::{ crypto, services::{application_service::ApplicationService, session_service::SessionService}, - util::get_memory_sqlite_connection, + utils::db::get_memory_sqlite_connection, }; #[tokio::test] diff --git a/core/src/util.rs b/core/src/utils/db.rs similarity index 100% rename from core/src/util.rs rename to core/src/utils/db.rs diff --git a/core/src/filetype.rs b/core/src/utils/filetype.rs similarity index 100% rename from core/src/filetype.rs rename to core/src/utils/filetype.rs diff --git a/core/src/utils/mod.rs b/core/src/utils/mod.rs index a89587e..d498f2d 100644 --- a/core/src/utils/mod.rs +++ b/core/src/utils/mod.rs @@ -1 +1,3 @@ -pub mod csv; \ No newline at end of file +pub mod csv; +pub mod filetype; +pub mod db; \ No newline at end of file