From fa54166f2f98effc88044bd6a28001d19ac06a7c Mon Sep 17 00:00:00 2001 From: EETagent Date: Wed, 14 Dec 2022 17:57:49 +0100 Subject: [PATCH 1/3] refactor: PORTFOLIO prefix for all envs --- api/src/pool.rs | 2 +- core/src/services/portfolio_service.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/pool.rs b/api/src/pool.rs index 539259c..ab4c715 100644 --- a/api/src/pool.rs +++ b/api/src/pool.rs @@ -32,7 +32,7 @@ impl sea_orm_rocket::Pool for SeaOrmPool { async fn init(_figment: &Figment) -> Result { dotenv::dotenv().ok(); - let database_url = std::env::var("DATABASE_URL").unwrap(); + let database_url = std::env::var("PORTFOLIO_DATABASE_URL").unwrap(); let mut options: ConnectOptions = database_url.into(); options .max_connections(1024) diff --git a/core/src/services/portfolio_service.rs b/core/src/services/portfolio_service.rs index 556f31c..452dc19 100644 --- a/core/src/services/portfolio_service.rs +++ b/core/src/services/portfolio_service.rs @@ -127,7 +127,7 @@ impl PortfolioService { // Get root path or local directory fn get_file_store_path() -> PathBuf { dotenv::dotenv().ok(); - Path::new(&std::env::var("STORE_PATH").unwrap_or_else(|_| "".to_string())).to_path_buf() + Path::new(&std::env::var("PORTFOLIO_STORE_PATH").unwrap_or_else(|_| "".to_string())).to_path_buf() } /// Writes file to desired location From 054603d8b2109e69ceafbc6efdac58947e88879c Mon Sep 17 00:00:00 2001 From: EETagent Date: Wed, 14 Dec 2022 18:07:34 +0100 Subject: [PATCH 2/3] fix: update docker compose too --- docker-compose.yml.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml.dev b/docker-compose.yml.dev index 059d90e..4d107d3 100644 --- a/docker-compose.yml.dev +++ b/docker-compose.yml.dev @@ -7,7 +7,7 @@ services: depends_on: - db environment: - DATABASE_URL: postgres://postgres:postgres@db:5432/postgres + PORTFOLIO_DATABASE_URL: postgres://postgres:postgres@db:5432/postgres ports: - "9000:8000" command: sh -c "cargo watch -x run" From b232470a6e3c16221857046224f6f373851f854b Mon Sep 17 00:00:00 2001 From: EETagent Date: Wed, 14 Dec 2022 18:12:57 +0100 Subject: [PATCH 3/3] fix: fix refactor --- core/src/services/portfolio_service.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/services/portfolio_service.rs b/core/src/services/portfolio_service.rs index 452dc19..a34d5a6 100644 --- a/core/src/services/portfolio_service.rs +++ b/core/src/services/portfolio_service.rs @@ -374,7 +374,7 @@ mod tests { tokio::fs::create_dir_all(application_cache_dir.clone()).await.unwrap(); - std::env::set_var("STORE_PATH", temp_dir.to_str().unwrap()); + std::env::set_var("PORTFOLIO_STORE_PATH", temp_dir.to_str().unwrap()); (temp_dir, application_dir, application_cache_dir) } @@ -383,7 +383,7 @@ mod tests { async fn clear_data_store_temp_dir(temp_dir: PathBuf) { tokio::fs::remove_dir_all(temp_dir).await.unwrap(); - std::env::remove_var("STORE_PATH"); + std::env::remove_var("PORTFOLIO_STORE_PATH"); } #[tokio::test] @@ -393,7 +393,7 @@ mod tests { let plain_text_password = "test".to_string(); let temp_dir = std::env::temp_dir().join("portfolio_test_tempdir").join("create_folder"); - std::env::set_var("STORE_PATH", temp_dir.to_str().unwrap()); + std::env::set_var("PORTFOLIO_STORE_PATH", temp_dir.to_str().unwrap()); CandidateService::create(&db, APPLICATION_ID, &plain_text_password, "".to_string()) .await