feat: support user appearance preferences with persisted theme and language #85

src/modules/account/grant.rs

@@ -28,7 +28,7 @@ use crate::{
         users::{
             permissions::Permission,
             role::{RoleType, UserRole},
-            BichonUser,
+            UserModel,
         },
     },
     raise_error, utc_now,
@@ -68,7 +68,7 @@ impl BatchAccountRoleRequest {
         }
 
         for id in &self.user_ids {
-            let exists = BichonUser::find(*id).await?; // Assuming an exists helper
+            let exists = UserModel::find(*id).await?; // Assuming an exists helper
             if exists.is_none() {
                 return Err(raise_error!(
                     format!("User ID {} not found", id),
@@ -90,7 +90,7 @@ impl BatchAccountRoleRequest {
                 // Fetch the current user record from the database
                 let user = rw
                     .get()
-                    .primary::<BichonUser>(uid)
+                    .primary::<UserModel>(uid)
                     .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?
                     .ok_or_else(|| {
                         raise_error!(

src/modules/account/migration.rs

@@ -36,7 +36,7 @@ use crate::{
         database::{list_all_impl, with_transaction},
         error::BichonResult,
         indexer::manager::{EML_INDEX_MANAGER, ENVELOPE_INDEX_MANAGER},
-        users::{role::DEFAULT_ACCOUNT_MANAGER_ROLE_ID, BichonUser, DEFAULT_ADMIN_USER_ID},
+        users::{role::DEFAULT_ACCOUNT_MANAGER_ROLE_ID, UserModel, DEFAULT_ADMIN_USER_ID},
     },
     utc_now,
 };
@@ -238,7 +238,7 @@ impl AccountV3 {
                 .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
             let user = rw
                 .get()
-                .primary::<BichonUser>(user_id)
+                .primary::<UserModel>(user_id)
                 .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?
                 .ok_or_else(|| {
                     raise_error!(
@@ -312,7 +312,7 @@ impl AccountV3 {
             MAIL_CONTEXT.clean_account(account.id).await?;
         }
         OAuth2AccessToken::try_delete(account.id).await?;
-        BichonUser::cleanup_account(account.id).await?;
+        UserModel::cleanup_account(account.id).await?;
         MailBox::clean(account.id).await?;
         ENVELOPE_INDEX_MANAGER
             .delete_account_envelopes(account.id)

src/modules/account/view.rs

@@ -27,7 +27,7 @@ use crate::modules::{
         migration::{AccountModel, AccountType},
         since::{DateSince, RelativeDate},
     },
-    users::BichonUser,
+    users::UserModel,
 };
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, Deserialize, Serialize, Object)]
@@ -57,7 +57,7 @@ pub struct AccountResp {
 }
 
 impl AccountResp {
-    pub fn from_model(account: AccountModel, user_map: &HashMap<u64, BichonUser>) -> AccountResp {
+    pub fn from_model(account: AccountModel, user_map: &HashMap<u64, UserModel>) -> AccountResp {
         let user = user_map.get(&account.created_by);
         AccountResp {
             id: account.id,