src/main.rs

@@ -164,12 +164,10 @@ mod tests {
     mod db_mgr {
         use std::str::FromStr;
 
-        use crate::keys;
 
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-            dotenvy::dotenv().ok();
             let tm_db_url = icarus_envy::environment::get_db_url().await;
             let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
             sqlx::PgPool::connect_with(tm_options).await
@@ -182,7 +180,6 @@ mod tests {
         }
 
         pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-            dotenvy::dotenv().ok();
             let db_url = icarus_envy::environment::get_db_url().await;
             let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
             sqlx::PgPool::connect_with(options).await
@@ -210,28 +207,20 @@ mod tests {
         }
 
         pub fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-            dotenvy::dotenv().ok(); // Load .env file if it exists
+            let database_url = icarus_envy::environment::get_db_url().await;
+            let parsed_url = url::Url::parse(&database_url)?;
 
-            match std::env::var(keys::DBURL) {
-                Ok(database_url) => {
-                    let parsed_url = url::Url::parse(&database_url)?;
-                    if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
-                        match parsed_url
-                            .path_segments()
-                            .and_then(|segments| segments.last().map(|s| s.to_string()))
-                        {
-                            Some(sss) => Ok(sss),
-                            None => Err("Error parsing".into()),
-                        }
-                    } else {
-                        // Handle other database types if needed
-                        Err("Error parsing".into())
-                    }
-                }
-                Err(_) => {
-                    // DATABASE_URL environment variable not found
-                    Err("Error parsing".into())
+            if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
+                match parsed_url
+                    .path_segments()
+                    .and_then(|segments| segments.last().map(|s| s.to_string()))
+                {
+                    Some(sss) => Ok(sss),
+                    None => Err("Error parsing".into()),
                 }
+            } else {
+                // Handle other database types if needed
+                Err("Error parsing".into())
             }
         }
     }