Turbo/lf9-pgg
9
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

refactor: reorganize module imports for consistency and clarity

Browse source
This commit is contained in:
Mika 2025-06-20 10:37:40 +02:00
parent cb84d40a48
commit 9dbfeef94f
9 changed files with 41 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/backend/src/controller.rs
View file

@ -1,6 +1,7 @@
use actix_web::web::{self, ServiceConfig};
pub mod auth; // TODO: Refactor to use re-exports instead of making module public
// TODO: Refactor to use re-exports instead of making module public
pub mod auth;
pub mod class;
pub mod group;
pub mod project;

2
crates/backend/src/controller/project.rs
View file

@ -4,7 +4,7 @@ use validator::Validate;
use crate::db::project::CreateProject;
use crate::db::Database;
use crate::entity;
use crate::db::entity;
use crate::error::ApiError;
pub fn setup(cfg: &mut actix_web::web::ServiceConfig) {

2
crates/backend/src/controller/user.rs
View file

@ -1,4 +1,4 @@
use crate::{Database, entity, error::ApiError};
use crate::{Database, db::entity, error::ApiError};
use actix_web::{Responder, delete, get, post, put, web};
use serde::Deserialize;
use utoipa::ToSchema;

2
crates/backend/src/db/project.rs
View file

@ -2,7 +2,7 @@ use super::Database;
use crate::error::ApiError;
use log::debug;
use crate::entity::project;
use crate::db::entity::project;
use sea_orm::ActiveValue::{NotSet, Set, Unchanged};
use sea_orm::{ActiveModelTrait, DeleteResult, EntityTrait};
use serde::Deserialize;

2
crates/backend/src/db/user.rs
View file

@ -10,7 +10,7 @@ use sea_orm::{
};
use uuid::Uuid;
use crate::{Database, entity};
use crate::{Database, db::entity};
impl Database {
pub async fn get_users(&self) -> Result<Vec<entity::user::Model>, ApiError> {

34
crates/backend/src/lib.rs
View file

@ -2,38 +2,8 @@ pub mod controller;
pub mod db;
pub mod error;
pub mod utoipa;
pub mod utils;
pub use db::Database;
pub use db::entity;
use dotenvy;
use std::env;
#[cfg(not(test))]
fn get_env_var(name: &str) -> dotenvy::Result<String> {
dotenvy::var(name)
}
#[cfg(test)]
fn get_env_var(name: &str) -> Result<String, std::env::VarError> {
std::env::var(name)
}
// TODO: Extract build_database_url into a utils module or similar
pub fn build_database_url() -> String {
let db_user = get_env_var("DB_USER").unwrap_or_else(|_| "pgg".to_owned());
let db_name = get_env_var("DB_NAME").unwrap_or_else(|_| "pgg".to_owned());
let db_password = get_env_var("DB_PASSWORD").unwrap_or_else(|_| "pgg".to_owned());
let db_host = get_env_var("DB_HOST").expect("DB_HOST must be set in .env");
let db_port = get_env_var("DB_PORT")
.map(|x| x.parse::<u16>().expect("DB_PORT is not a valid port"))
.unwrap_or(5432);
let result = format!(
"postgresql://{}:{}@{}:{}/{}",
db_user, db_password, db_host, db_port, db_name
);
println!("Database URL: {}", result);
result
}
pub use utils::{build_database_url, get_env_var};

32
crates/backend/src/main.rs
View file

@ -8,12 +8,13 @@ mod controller;
mod db;
mod error;
mod utoipa;
mod utils;
pub use db::Database;
pub use db::entity;
use db::Database;
use log::info;
use migration::Migrator;
use migration::MigratorTrait;
use utils::{build_database_url, get_env_var};
#[derive(Clone)]
struct AppConfig {
@ -80,15 +81,6 @@ async fn main() -> std::io::Result<()> {
.await
}
#[cfg(not(test))]
fn get_env_var(name: &str) -> dotenvy::Result<String> {
dotenvy::var(name)
}
#[cfg(test)]
fn get_env_var(name: &str) -> Result<String, std::env::VarError> {
std::env::var(name)
}
pub async fn connect_to_redis_database() -> RedisSessionStore {
let redis_host = get_env_var("REDIS_HOST").expect("REDIS_HOST must be set in .env");
@ -102,24 +94,6 @@ pub async fn connect_to_redis_database() -> RedisSessionStore {
.unwrap()
}
pub fn build_database_url() -> String {
let db_user = get_env_var("DB_USER").unwrap_or_else(|_| "pgg".to_owned());
let db_name = get_env_var("DB_NAME").unwrap_or_else(|_| "pgg".to_owned());
let db_password = get_env_var("DB_PASSWORD").unwrap_or_else(|_| "pgg".to_owned());
let db_host = get_env_var("DB_HOST").expect("DB_HOST must be set in .env");
let db_port = get_env_var("DB_PORT")
.map(|x| x.parse::<u16>().expect("DB_PORT is not a valid port"))
.unwrap_or(5432);
let result = format!(
"postgresql://{}:{}@{}:{}/{}",
db_user, db_password, db_host, db_port, db_name
);
println!("Database URL: {}", result);
result
}
#[cfg(test)]
mod tests {
use super::*;

29
crates/backend/src/utils.rs Normal file
View file

@ -0,0 +1,29 @@
use log::info;
#[cfg(not(test))]
pub fn get_env_var(name: &str) -> dotenvy::Result<String> {
dotenvy::var(name)
}
#[cfg(test)]
pub fn get_env_var(name: &str) -> Result<String, std::env::VarError> {
std::env::var(name)
}
pub fn build_database_url() -> String {
let db_user = get_env_var("DB_USER").unwrap_or_else(|_| "pgg".to_owned());
let db_name = get_env_var("DB_NAME").unwrap_or_else(|_| "pgg".to_owned());
let db_password = get_env_var("DB_PASSWORD").unwrap_or_else(|_| "pgg".to_owned());
let db_host = get_env_var("DB_HOST").expect("DB_HOST must be set in .env");
let db_port = get_env_var("DB_PORT")
.map(|x| x.parse::<u16>().expect("DB_PORT is not a valid port"))
.unwrap_or(5432);
let result = format!(
"postgresql://{}:{}@{}:{}/{}",
db_user, db_password, db_host, db_port, db_name
);
info!("Database URL: {}", result);
result
}

2
crates/backend/src/utoipa.rs
View file

@ -1,6 +1,6 @@
use utoipa::OpenApi;
use crate::{controller, db, entity, error};
use crate::{controller, db, db::entity, error};
#[derive(OpenApi)]
#[openapi(