🐛 fixed settings setup bug

server/tests/health_check.rs

@@ -2,7 +2,6 @@ use axum::body::Body;
 use axum::http::{Request, StatusCode};
 use tower::ServiceExt;
 
-use server::cache::CacheSettings;
 use server::routing::router;
 use server::settings::Settings;
 use server::startup::{cache_connect, db_connect, AppState};
@@ -12,13 +11,7 @@ async fn health_check_works() {
     let settings = Settings::new();
 
     let db = db_connect(settings.db.expose()).await.unwrap();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await.unwrap();
+    let cache = cache_connect(&settings.cache).await.unwrap();
     let state = AppState::from((db, cache, settings));
 
     let router = router(state).unwrap();

server/tests/search.rs

@@ -1,6 +1,5 @@
 use server::auth::models::RegisterUserRequest;
 use server::auth::register;
-use server::cache::CacheSettings;
 use server::search::{
     get_search_history, get_top_searches, insert_search_history, search, update_search_reaction,
 };
@@ -17,13 +16,7 @@ use uuid::Uuid;
 #[sqlx::test]
 async fn search_test() -> Result<()> {
     let settings = Settings::new();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await?;
+    let cache = cache_connect(&settings.cache).await?;
 
     let search_query = SearchQueryRequest {
         session_id: Some(Uuid::new_v4()),
@@ -40,13 +33,7 @@ async fn search_test() -> Result<()> {
 #[sqlx::test]
 async fn top_searches_test() -> Result<()> {
     let settings = Settings::new();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await?;
+    let cache = cache_connect(&settings.cache).await?;
 
     let top_search_query = TopSearchRequest { limit: Some(1) };
 
@@ -61,13 +48,7 @@ async fn top_searches_test() -> Result<()> {
 #[sqlx::test]
 async fn insert_search_and_get_search_history_test(pool: PgPool) -> Result<()> {
     let settings = Settings::new();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await?;
+    let cache = cache_connect(&settings.cache).await?;
 
     let new_user = register(
         pool.clone(),
@@ -117,13 +98,7 @@ async fn insert_search_and_get_search_history_test(pool: PgPool) -> Result<()> {
 #[sqlx::test]
 async fn update_search_reaction_test(pool: PgPool) -> Result<()> {
     let settings = Settings::new();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await?;
+    let cache = cache_connect(&settings.cache).await?;
 
     let new_user = register(
         pool.clone(),

server/tests/users.rs

@@ -3,7 +3,6 @@ use axum::http::header::CONTENT_TYPE;
 use axum::http::{Request, StatusCode};
 use server::auth::models::RegisterUserRequest;
 use server::auth::register;
-use server::cache::CacheSettings;
 use server::routing::router;
 use server::settings::Settings;
 use server::startup::cache_connect;
@@ -49,13 +48,7 @@ async fn register_and_get_users_test(pool: PgPool) -> Result<()> {
 #[sqlx::test]
 async fn register_users_works(pool: PgPool) {
     let settings = Settings::new();
-    let cache_settings = CacheSettings {
-        cache_url: settings.cache_url.expose().to_string(),
-        enabled: settings.cache_enabled,
-        ttl: settings.cache_ttl,
-        max_sorted_size: settings.cache_max_sorted_size,
-    };
-    let cache = cache_connect(&cache_settings).await.unwrap();
+    let cache = cache_connect(&settings.cache).await.unwrap();
     let state = AppState::from((pool, cache, settings));
     let router = router(state).unwrap();