feat: add web search and appearance settings (#48)

Co-authored-by: Robert Yan <46699230+think-in-universe@users.noreply.github.com>

Author: hanakannzashi

.github/workflows/test.yml

@@ -59,7 +59,7 @@ jobs:
       run: cargo test --lib --bins
 
     - name: Run integration tests
-      run: cargo test --test e2e_api_tests
+      run: cargo test --features test
       env:
         DATABASE_HOST: localhost
         DATABASE_PORT: 5432

crates/api/src/models.rs

@@ -136,6 +136,34 @@ pub struct AttestationReport {
     pub model_attestations: Option<Vec<ModelAttestation>>,
 }
 
+/// Appearance preference
+#[derive(Debug, Serialize, Deserialize, ToSchema)]
+pub enum Appearance {
+    Light,
+    Dark,
+    System,
+}
+
+impl From<services::user::ports::Appearance> for Appearance {
+    fn from(appearance: services::user::ports::Appearance) -> Self {
+        match appearance {
+            services::user::ports::Appearance::Light => Appearance::Light,
+            services::user::ports::Appearance::Dark => Appearance::Dark,
+            services::user::ports::Appearance::System => Appearance::System,
+        }
+    }
+}
+
+impl From<Appearance> for services::user::ports::Appearance {
+    fn from(appearance: Appearance) -> Self {
+        match appearance {
+            Appearance::Light => services::user::ports::Appearance::Light,
+            Appearance::Dark => services::user::ports::Appearance::Dark,
+            Appearance::System => services::user::ports::Appearance::System,
+        }
+    }
+}
+
 /// User settings content for API responses
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct UserSettingsContent {
@@ -144,13 +172,19 @@ pub struct UserSettingsContent {
     /// System prompt
     #[serde(skip_serializing_if = "Option::is_none")]
     pub system_prompt: Option<String>,
+    /// Web search preference
+    pub web_search: bool,
+    /// Appearance preference
+    pub appearance: Appearance,
 }
 
 impl From<services::user::ports::UserSettingsContent> for UserSettingsContent {
     fn from(content: services::user::ports::UserSettingsContent) -> Self {
         Self {
             notification: content.notification,
             system_prompt: content.system_prompt,
+            web_search: content.web_search,
+            appearance: content.appearance.into(),
         }
     }
 }
@@ -172,6 +206,10 @@ pub struct UpdateUserSettingsRequest {
     pub notification: bool,
     /// System prompt
     pub system_prompt: Option<String>,
+    /// Web search preference
+    pub web_search: bool,
+    /// Appearance preference
+    pub appearance: Appearance,
 }
 
 impl UpdateUserSettingsRequest {
@@ -193,6 +231,10 @@ pub struct UpdateUserSettingsPartiallyRequest {
     pub notification: Option<bool>,
     /// System prompt
     pub system_prompt: Option<String>,
+    /// Web search preference
+    pub web_search: Option<bool>,
+    /// Appearance preference
+    pub appearance: Option<Appearance>,
 }
 
 impl UpdateUserSettingsPartiallyRequest {

crates/api/src/routes/users.rs

@@ -106,6 +106,8 @@ pub async fn update_user_settings(
     let content = services::user::ports::UserSettingsContent {
         notification: request.notification,
         system_prompt: request.system_prompt,
+        web_search: request.web_search,
+        appearance: request.appearance.into(),
     };
 
     let content = app_state
@@ -155,6 +157,8 @@ pub async fn update_user_settings_partially(
     let content = services::user::ports::PartialUserSettingsContent {
         notification: request.notification,
         system_prompt: request.system_prompt,
+        web_search: request.web_search,
+        appearance: request.appearance.map(Into::into),
     };
 
     let content = app_state

crates/api/tests/common.rs

@@ -4,6 +4,10 @@ use api::{create_router, AppState};
 use axum_test::TestServer;
 use serde_json::json;
 use std::sync::Arc;
+use tokio::sync::OnceCell;
+
+// Global once cell to ensure migrations only run once across all tests
+static MIGRATIONS_INITIALIZED: OnceCell<()> = OnceCell::const_new();
 
 /// Create a test server with all services initialized
 pub async fn create_test_server() -> TestServer {
@@ -18,8 +22,14 @@ pub async fn create_test_server() -> TestServer {
         .await
         .expect("Failed to connect to database");
 
-    // Run migrations
-    db.run_migrations().await.expect("Failed to run migrations");
+    // Run migrations only once, even when tests run in parallel
+    MIGRATIONS_INITIALIZED
+        .get_or_init(|| async {
+            db.run_migrations()
+                .await
+                .expect("Failed to run database migrations");
+        })
+        .await;
 
     // Get repositories
     let user_repo = db.user_repository();

crates/database/src/repositories/user_settings_repository.rs

@@ -1,7 +1,9 @@
 use crate::pool::DbPool;
 use async_trait::async_trait;
 use services::{
-    user::ports::{UserSettings, UserSettingsContent, UserSettingsRepository},
+    user::ports::{
+        PartialUserSettingsContent, UserSettings, UserSettingsContent, UserSettingsRepository,
+    },
     UserId,
 };
 
@@ -32,8 +34,14 @@ impl UserSettingsRepository for PostgresUserSettingsRepository {
             .await?;
 
         if let Some(row) = row {
-            let content_json: serde_json::Value = row.get(2);
-            let content: UserSettingsContent = serde_json::from_value(content_json)?;
+            let content_json: serde_json::Value = row.get("content");
+
+            let default_content = UserSettingsContent::default();
+            // Missing fields will be filled from default settings content
+            let partial_content =
+                serde_json::from_value::<PartialUserSettingsContent>(content_json)?;
+            let content = default_content.into_updated(partial_content);
+
             Ok(Some(UserSettings {
                 id: row.get(0),
                 user_id: row.get(1),
@@ -66,20 +74,17 @@ impl UserSettingsRepository for PostgresUserSettingsRepository {
                  VALUES ($1, $2) 
                  ON CONFLICT (user_id) 
                  DO UPDATE SET content = $2, updated_at = NOW()
-                 RETURNING id, user_id, content, created_at, updated_at",
+                 RETURNING id, user_id, created_at, updated_at",
                 &[&user_id, &content_json],
             )
             .await?;
 
-        let content_json: serde_json::Value = row.get(2);
-        let content: UserSettingsContent = serde_json::from_value(content_json)?;
-
         let settings = UserSettings {
-            id: row.get(0),
-            user_id: row.get(1),
+            id: row.get("id"),
+            user_id: row.get("user_id"),
             content,
-            created_at: row.get(3),
-            updated_at: row.get(4),
+            created_at: row.get("created_at"),
+            updated_at: row.get("updated_at"),
         };
 
         tracing::info!(

crates/services/src/user/ports.rs

@@ -108,26 +108,43 @@ pub trait UserService: Send + Sync {
     async fn list_users(&self, limit: i64, offset: i64) -> anyhow::Result<(Vec<User>, u64)>;
 }
 
+/// Appearance preference
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum Appearance {
+    Light,
+    Dark,
+    System,
+}
+
 /// User settings content structure
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct UserSettingsContent {
     pub notification: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub system_prompt: Option<String>,
+    pub web_search: bool,
+    pub appearance: Appearance,
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct PartialUserSettingsContent {
     pub notification: Option<bool>,
     pub system_prompt: Option<String>,
+    pub web_search: Option<bool>,
+    pub appearance: Option<Appearance>,
 }
 
 #[allow(clippy::derivable_impls)]
 impl Default for UserSettingsContent {
+    // When retrieving settings, default values are used to fill in any unset values.
+    // If the value type is `Option<T>`, we cannot distinguish between "unset" and "set null".
+    // Therefore, using `Some(T)` as the default value is NOT recommended, may cause unexpected behavior.
     fn default() -> Self {
         Self {
             notification: false,
             system_prompt: None,
+            web_search: false,
+            appearance: Appearance::System,
         }
     }
 }
@@ -137,6 +154,8 @@ impl UserSettingsContent {
         Self {
             notification: content.notification.unwrap_or(self.notification),
             system_prompt: content.system_prompt.or(self.system_prompt),
+            web_search: content.web_search.unwrap_or(self.web_search),
+            appearance: content.appearance.unwrap_or(self.appearance),
         }
     }
 }
@@ -155,6 +174,7 @@ pub struct UserSettings {
 #[async_trait]
 pub trait UserSettingsRepository: Send + Sync {
     /// Get user settings by user ID
+    /// Returns default settings if not found, and fills missing fields with default values
     async fn get_settings(&self, user_id: UserId) -> anyhow::Result<Option<UserSettings>>;
 
     /// Create or update user settings