Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: move sql
Nathan72fc0cce075f
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 5beac0b3a6..e285ae83c8 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -3115,7 +3115,6 @@ dependencies = ["collab","collab-entity","collab-folder",- "diesel","flowy-error","flowy-folder-pub","flowy-sqlite",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex ee99fcacf1..0112c862a8 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -77,6 +77,7 @@ diesel = { version = "2.1.0", features = ["r2d2","serde_json",] }+diesel_derives = { version = "2.1.0", features = ["sqlite", "r2d2"] }uuid = { version = "1.5.0", features = ["serde", "v4", "v5"] }serde_repr = "0.1"futures = "0.3.31"diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rsindex 7602ff8040..399a8d2d5d 100644--- a/frontend/rust-lib/flowy-ai/src/ai_manager.rs+++ b/frontend/rust-lib/flowy-ai/src/ai_manager.rs@@ -128,6 +128,24 @@ impl AIManager {Ok(())}+ #[instrument(skip_all, err)]+ pub async fn initialize_after_open_workspace(+ &self,+ _workspace_id: &str,+ ) -> Result<(), FlowyError> {+ let local_ai = self.local_ai.clone();+ tokio::spawn(async move {+ if let Err(err) = local_ai.destroy_plugin().await {+ error!("Failed to destroy plugin: {}", err);+ }++ if let Err(err) = local_ai.reload().await {+ error!("[AI Manager] failed to reload local AI: {:?}", err);+ }+ });+ Ok(())+ }+pub async fn open_chat(&self, chat_id: &Uuid) -> Result<(), FlowyError> {self.chats.entry(*chat_id).or_insert_with(|| {Arc::new(Chat::new(diff --git a/frontend/rust-lib/flowy-core/src/user_state_callback.rs b/frontend/rust-lib/flowy-core/src/user_state_callback.rsindex 6002746603..e85b773ec4 100644--- a/frontend/rust-lib/flowy-core/src/user_state_callback.rs+++ b/frontend/rust-lib/flowy-core/src/user_state_callback.rs@@ -106,13 +106,16 @@ impl UserStatusCallback for UserStatusCallbackImpl {self.folder_manager- .initialize_with_workspace_id(user_id)+ .initialize_after_sign_in(user_id).await?;self.database_manager- .initialize(user_id, auth_type.is_local())+ .initialize_after_sign_in(user_id, auth_type.is_local())+ .await?;+ self+ .document_manager+ .initialize_after_sign_in(user_id).await?;- self.document_manager.initialize(user_id).await?;let workspace_id = user_workspace.id.clone();self.init_ai_component(workspace_id);@@ -171,7 +174,7 @@ impl UserStatusCallback for UserStatusCallbackImpl {self.folder_manager- .initialize_with_new_user(+ .initialize_after_sign_up(user_profile.uid,&user_profile.token,is_new_user,@@ -183,13 +186,13 @@ impl UserStatusCallback for UserStatusCallbackImpl {self.database_manager- .initialize_with_new_user(user_profile.uid, auth_type.is_local())+ .initialize_after_sign_up(user_profile.uid, auth_type.is_local()).await.context("DatabaseManager error")?;self.document_manager- .initialize_with_new_user(user_profile.uid)+ .initialize_after_sign_up(user_profile.uid).await.context("DocumentManager error")?;@@ -212,15 +215,24 @@ impl UserStatusCallback for UserStatusCallbackImpl {self.server_provider.set_auth_type(*auth_type);self.folder_manager- .initialize_with_workspace_id(user_id)+ .initialize_after_open_workspace(user_id).await?;self.database_manager- .initialize(user_id, auth_type.is_local())+ .initialize_after_open_workspace(user_id, auth_type.is_local()).await?;- self.document_manager.initialize(user_id).await?;- self.ai_manager.initialize(&user_workspace.id).await?;- self.storage_manager.initialize(&user_workspace.id).await;+ self+ .document_manager+ .initialize_after_open_workspace(user_id)+ .await?;+ self+ .ai_manager+ .initialize_after_open_workspace(&user_workspace.id)+ .await?;+ self+ .storage_manager+ .initialize_after_open_workspace(&user_workspace.id)+ .await;Ok(())}diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex 49a946d108..6ae1e5cf15 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -134,12 +134,30 @@ impl DatabaseManager {}#[instrument(- name = "database_initialize_with_new_user",+ name = "database_initialize_after_sign_up",level = "debug",skip_all,err)]- pub async fn initialize_with_new_user(+ pub async fn initialize_after_sign_up(+ &self,+ user_id: i64,+ is_local_user: bool,+ ) -> FlowyResult<()> {+ self.initialize(user_id, is_local_user).await?;+ Ok(())+ }++ pub async fn initialize_after_open_workspace(+ &self,+ user_id: i64,+ is_local_user: bool,+ ) -> FlowyResult<()> {+ self.initialize(user_id, is_local_user).await?;+ Ok(())+ }++ pub async fn initialize_after_sign_in(&self,user_id: i64,is_local_user: bool,diff --git a/frontend/rust-lib/flowy-document/src/manager.rs b/frontend/rust-lib/flowy-document/src/manager.rsindex 704dcd0865..9c6a383bae 100644--- a/frontend/rust-lib/flowy-document/src/manager.rs+++ b/frontend/rust-lib/flowy-document/src/manager.rs@@ -106,12 +106,23 @@ impl DocumentManager {}#[instrument(- name = "document_initialize_with_new_user",+ name = "document_initialize_after_sign_up",level = "debug",skip_all,err)]- pub async fn initialize_with_new_user(&self, uid: i64) -> FlowyResult<()> {+ pub async fn initialize_after_sign_up(&self, uid: i64) -> FlowyResult<()> {+ self.initialize(uid).await?;+ Ok(())+ }++ pub async fn initialize_after_open_workspace(&self, uid: i64) -> FlowyResult<()> {+ self.initialize(uid).await?;+ Ok(())+ }++ #[instrument(level = "debug", skip_all, err)]+ pub async fn initialize_after_sign_in(&self, uid: i64) -> FlowyResult<()> {self.initialize(uid).await?;Ok(())}diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex e704be043d..8662c1e061 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -263,7 +263,7 @@ impl FolderManager {/// Initialize the folder with the given workspace id./// Fetch the folder updates from the cloud service and initialize the folder.#[tracing::instrument(skip(self, user_id), err)]- pub async fn initialize_with_workspace_id(&self, user_id: i64) -> FlowyResult<()> {+ pub async fn initialize_after_sign_in(&self, user_id: i64) -> FlowyResult<()> {let workspace_id = self.user.workspace_id()?;let object_id = &workspace_id;@@ -312,10 +312,14 @@ impl FolderManager {Ok(())}+ pub async fn initialize_after_open_workspace(&self, uid: i64) -> FlowyResult<()> {+ self.initialize_after_sign_in(uid).await+ }+/// Initialize the folder for the new user./// Using the [DefaultFolderBuilder] to create the default workspace for the new user.#[instrument(level = "info", skip_all, err)]- pub async fn initialize_with_new_user(+ pub async fn initialize_after_sign_up(&self,user_id: i64,_token: &str,diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rsindex 8189ec140c..d378765ebb 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs@@ -15,6 +15,7 @@ use crate::local_server::uid::UserIDGenerator;use flowy_error::FlowyError;use flowy_user_pub::cloud::{UserCloudService, UserCollabParams};use flowy_user_pub::entities::*;+use flowy_user_pub::sql::select_all_user_workspace;use flowy_user_pub::DEFAULT_USER_NAME;use lib_infra::async_trait::async_trait;use lib_infra::box_any::BoxAny;@@ -134,12 +135,8 @@ impl UserCloudService for LocalServerUserServiceImpl {async fn get_all_workspace(&self, uid: i64) -> Result<Vec<UserWorkspace>, FlowyError> {let conn = self.user.get_sqlite_db(uid)?;-- select_all_user_workspaces(&conn).await.map_err(|e| {- FlowyError::internal().with_context(format!("Failed to get all workspaces: {}", e))- })?;-- Ok(vec![])+ let workspaces = select_all_user_workspace(uid, conn)?;+ Ok(workspaces)}async fn create_workspace(&self, _workspace_name: &str) -> Result<UserWorkspace, FlowyError> {diff --git a/frontend/rust-lib/flowy-sqlite/Cargo.toml b/frontend/rust-lib/flowy-sqlite/Cargo.tomlindex 0e85aebee5..345b05f903 100644--- a/frontend/rust-lib/flowy-sqlite/Cargo.toml+++ b/frontend/rust-lib/flowy-sqlite/Cargo.toml@@ -7,7 +7,7 @@ edition = "2018"[dependencies]diesel.workspace = true-diesel_derives = { version = "2.1.0", features = ["sqlite", "r2d2"] }+diesel_derives = { workspace = true, features = ["sqlite", "r2d2"] }diesel_migrations = { version = "2.1.0", features = ["sqlite"] }tracing.workspace = trueserde.workspace = truediff --git a/frontend/rust-lib/flowy-storage/src/manager.rs b/frontend/rust-lib/flowy-storage/src/manager.rsindex dc1bf053ea..619dc47f90 100644--- a/frontend/rust-lib/flowy-storage/src/manager.rs+++ b/frontend/rust-lib/flowy-storage/src/manager.rs@@ -181,6 +181,14 @@ impl StorageManager {}}+ pub async fn initialize_after_open_workspace(&self, workspace_id: &str) {+ self.enable_storage_write_access();++ if let Err(err) = prepare_upload_task(self.uploader.clone(), self.user_service.clone()).await {+ error!("prepare {} upload task failed: {}", workspace_id, err);+ }+ }+pub fn update_network_reachable(&self, reachable: bool) {if reachable {self.uploader.resume();diff --git a/frontend/rust-lib/flowy-user-pub/Cargo.toml b/frontend/rust-lib/flowy-user-pub/Cargo.tomlindex cb6b9b0738..f8a673e918 100644--- a/frontend/rust-lib/flowy-user-pub/Cargo.toml+++ b/frontend/rust-lib/flowy-user-pub/Cargo.toml@@ -22,5 +22,4 @@ collab-folder = { workspace = true }tracing.workspace = truebase64 = "0.21"client-api = { workspace = true }-flowy-sqlite.workspace = true-diesel.workspace = true\ No newline at end of file+flowy-sqlite.workspace = true\ No newline at end of filediff --git a/frontend/rust-lib/flowy-user-pub/src/lib.rs b/frontend/rust-lib/flowy-user-pub/src/lib.rsindex d820e8cd34..773ae96a9a 100644--- a/frontend/rust-lib/flowy-user-pub/src/lib.rs+++ b/frontend/rust-lib/flowy-user-pub/src/lib.rs@@ -1,7 +1,7 @@pub mod cloud;pub mod entities;pub mod session;-mod sql;+pub mod sql;pub mod workspace_service;pub const DEFAULT_USER_NAME: fn() -> String = || "Me".to_string();diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/member_sql.rs b/frontend/rust-lib/flowy-user-pub/src/sql/member_sql.rssimilarity index 95%rename from frontend/rust-lib/flowy-user/src/services/sqlite_sql/member_sql.rsrename to frontend/rust-lib/flowy-user-pub/src/sql/member_sql.rsindex 70351ab105..bc73a8f34c 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/member_sql.rs+++ b/frontend/rust-lib/flowy-user-pub/src/sql/member_sql.rs@@ -1,10 +1,8 @@use diesel::{insert_into, RunQueryDsl};use flowy_error::FlowyResult;-use flowy_sqlite::schema::workspace_members_table;-use flowy_sqlite::schema::workspace_members_table::dsl;-use flowy_sqlite::{query_dsl::*, DBConnection, ExpressionMethods};+use flowy_sqlite::{prelude::*, DBConnection, ExpressionMethods};#[derive(Queryable, Insertable, AsChangeset, Debug)]#[diesel(table_name = workspace_members_table)]diff --git a/frontend/rust-lib/flowy-user-pub/src/sql/mod.rs b/frontend/rust-lib/flowy-user-pub/src/sql/mod.rsindex d5a7aaf317..2a5f7bf891 100644--- a/frontend/rust-lib/flowy-user-pub/src/sql/mod.rs+++ b/frontend/rust-lib/flowy-user-pub/src/sql/mod.rs@@ -1 +1,9 @@-pub mod workspace_sql;+mod member_sql;+mod user_sql;+mod workspace_setting_sql;+mod workspace_sql;++pub use member_sql::*;+pub use user_sql::*;+pub use workspace_setting_sql::*;+pub use workspace_sql::*;diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs b/frontend/rust-lib/flowy-user-pub/src/sql/user_sql.rssimilarity index 81%rename from frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rsrename to frontend/rust-lib/flowy-user-pub/src/sql/user_sql.rsindex 3fbd4c5854..5a910888a8 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs+++ b/frontend/rust-lib/flowy-user-pub/src/sql/user_sql.rs@@ -1,12 +1,9 @@-use diesel::RunQueryDsl;-use flowy_error::FlowyError;--use flowy_user_pub::cloud::UserUpdate;-use flowy_user_pub::entities::*;-+use crate::cloud::UserUpdate;+use crate::entities::{AuthType, UpdateUserProfileParams, UserProfile};+use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::schema::user_table;+use flowy_sqlite::{prelude::*, DBConnection, ExpressionMethods, RunQueryDsl};-use flowy_sqlite::{query_dsl::*, DBConnection, ExpressionMethods};/// The order of the fields in the struct must be the same as the order of the fields in the table./// Check out the [schema.rs] for table schema.#[derive(Clone, Default, Queryable, Identifiable, Insertable)]@@ -109,3 +106,17 @@ pub fn select_user_profile(uid: i64, mut conn: DBConnection) -> Result<UserProfiOk(user)}++pub fn upsert_user(user: UserTable, mut conn: DBConnection) -> FlowyResult<()> {+ conn.immediate_transaction(|conn| {+ // delete old user if exists+ diesel::delete(user_table::dsl::user_table.filter(user_table::dsl::id.eq(&user.id)))+ .execute(conn)?;++ let _ = diesel::insert_into(user_table::table)+ .values(user)+ .execute(conn)?;+ Ok::<(), FlowyError>(())+ })?;+ Ok(())+}diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_setting_sql.rs b/frontend/rust-lib/flowy-user-pub/src/sql/workspace_setting_sql.rssimilarity index 97%rename from frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_setting_sql.rsrename to frontend/rust-lib/flowy-user-pub/src/sql/workspace_setting_sql.rsindex dcd87a36ee..667d1f0ca0 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_setting_sql.rs+++ b/frontend/rust-lib/flowy-user-pub/src/sql/workspace_setting_sql.rs@@ -3,7 +3,7 @@ use flowy_error::FlowyError;use flowy_sqlite::schema::workspace_setting_table;use flowy_sqlite::schema::workspace_setting_table::dsl;use flowy_sqlite::DBConnection;-use flowy_sqlite::{query_dsl::*, ExpressionMethods};+use flowy_sqlite::{prelude::*, ExpressionMethods};use uuid::Uuid;#[derive(Clone, Default, Queryable, Identifiable, Insertable)]diff --git a/frontend/rust-lib/flowy-user-pub/src/sql/workspace_sql.rs b/frontend/rust-lib/flowy-user-pub/src/sql/workspace_sql.rsindex ecd242c240..bcac009527 100644--- a/frontend/rust-lib/flowy-user-pub/src/sql/workspace_sql.rs+++ b/frontend/rust-lib/flowy-user-pub/src/sql/workspace_sql.rs@@ -1,11 +1,10 @@use crate::entities::{AuthType, UserWorkspace};use chrono::{TimeZone, Utc};-use diesel::{RunQueryDsl, SqliteConnection};use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::DBConnection;-use flowy_sqlite::{query_dsl::*, ExpressionMethods};-use tracing::{info, trace, warn};+use flowy_sqlite::{prelude::*, ExpressionMethods, RunQueryDsl, SqliteConnection};+use tracing::{info, warn};#[derive(Clone, Default, Queryable, Identifiable, Insertable)]#[diesel(table_name = user_workspace_table)]diff --git a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rsindex f7a78a8f7d..17b951bae0 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs@@ -2,9 +2,9 @@ use super::AFRolePB;use crate::entities::parser::{UserEmail, UserIcon, UserName};use crate::entities::{AuthTypePB, AuthenticatorPB};use crate::errors::ErrorCode;-use crate::services::sqlite_sql::workspace_sql::UserWorkspaceTable;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_user_pub::entities::*;+use flowy_user_pub::sql::UserWorkspaceTable;use lib_infra::validator_fn::required_not_empty_str;use std::convert::TryInto;use validator::Validate;diff --git a/frontend/rust-lib/flowy-user/src/entities/workspace.rs b/frontend/rust-lib/flowy-user/src/entities/workspace.rsindex d277fb4614..e178b724db 100644--- a/frontend/rust-lib/flowy-user/src/entities/workspace.rs+++ b/frontend/rust-lib/flowy-user/src/entities/workspace.rs@@ -5,10 +5,10 @@ use client_api::entity::billing_dto::{use serde::{Deserialize, Serialize};use validator::Validate;-use crate::services::sqlite_sql::workspace_setting_sql::WorkspaceSettingsTable;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_user_pub::cloud::{AFWorkspaceSettings, AFWorkspaceSettingsChange};use flowy_user_pub::entities::{AuthType, Role, WorkspaceInvitation, WorkspaceMember};+use flowy_user_pub::sql::WorkspaceSettingsTable;use lib_infra::validator_fn::required_not_empty_str;#[derive(ProtoBuf, Default, Clone)]diff --git a/frontend/rust-lib/flowy-user/src/event_handler.rs b/frontend/rust-lib/flowy-user/src/event_handler.rsindex 4cd49649ce..12dd1f3e93 100644--- a/frontend/rust-lib/flowy-user/src/event_handler.rs+++ b/frontend/rust-lib/flowy-user/src/event_handler.rs@@ -1,6 +1,14 @@+use crate::entities::*;+use crate::notification::{send_notification, UserNotification};+use crate::services::cloud_config::{+ get_cloud_config, get_or_create_cloud_config, save_cloud_config,+};+use crate::services::data_import::prepare_import;+use crate::user_manager::UserManager;use flowy_error::{ErrorCode, FlowyError, FlowyResult};use flowy_sqlite::kv::KVStorePreferences;use flowy_user_pub::entities::*;+use flowy_user_pub::sql::UserWorkspaceChangeset;use lib_dispatch::prelude::*;use lib_infra::box_any::BoxAny;use serde_json::Value;@@ -10,15 +18,6 @@ use std::{convert::TryInto, sync::Arc};use tracing::{event, trace};use uuid::Uuid;-use crate::entities::*;-use crate::notification::{send_notification, UserNotification};-use crate::services::cloud_config::{- get_cloud_config, get_or_create_cloud_config, save_cloud_config,-};-use crate::services::data_import::prepare_import;-use crate::services::sqlite_sql::workspace_sql::UserWorkspaceChangeset;-use crate::user_manager::UserManager;-fn upgrade_manager(manager: AFPluginState<Weak<UserManager>>) -> FlowyResult<Arc<UserManager>> {let manager = manager.upgrade()diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rsindex 106e911c1e..2db5f418de 100644--- a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs+++ b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs@@ -3,7 +3,6 @@ use crate::migrations::session_migration::migrate_session_with_user_uuid;use crate::services::data_import::importer::load_collab_by_object_ids;use crate::services::db::UserDBPath;use crate::services::entities::UserPaths;-use crate::services::sqlite_sql::user_sql::select_user_profile;use crate::user_manager::run_collab_data_migration;use anyhow::anyhow;use collab::core::collab::DataSource;@@ -37,6 +36,7 @@ use std::collections::{HashMap, HashSet};use collab_document::blocks::TextDelta;use collab_document::document::Document;+use flowy_user_pub::sql::select_user_profile;use semver::Version;use serde_json::json;use std::ops::{Deref, DerefMut};diff --git a/frontend/rust-lib/flowy-user/src/services/db.rs b/frontend/rust-lib/flowy-user/src/services/db.rsindex f05c0bda95..138ad95819 100644--- a/frontend/rust-lib/flowy-user/src/services/db.rs+++ b/frontend/rust-lib/flowy-user/src/services/db.rs@@ -8,17 +8,12 @@ use dashmap::mapref::entry::Entry;use dashmap::DashMap;use flowy_error::FlowyError;use flowy_sqlite::ConnectionPool;-use flowy_sqlite::{- query_dsl::*,- schema::{user_table, user_table::dsl},- DBConnection, Database, ExpressionMethods,-};+use flowy_sqlite::{DBConnection, Database};use flowy_user_pub::entities::UserProfile;+use flowy_user_pub::sql::select_user_profile;use lib_infra::file_util::{unzip_and_replace, zip_folder};use tracing::{error, event, info, instrument};-use crate::services::sqlite_sql::user_sql::UserTable;-pub trait UserDBPath: Send + Sync + 'static {fn sqlite_db_path(&self, uid: i64) -> PathBuf;fn collab_db_path(&self, uid: i64) -> PathBuf;@@ -131,13 +126,9 @@ impl UserDB {pool: &Arc<ConnectionPool>,uid: i64,) -> Result<UserProfile, FlowyError> {- let uid = uid.to_string();- let mut conn = pool.get()?;- let user = dsl::user_table- .filter(user_table::id.eq(&uid))- .first::<UserTable>(&mut *conn)?;-- Ok(user.into())+ let conn = pool.get()?;+ let profile = select_user_profile(uid, conn)?;+ Ok(profile)}/// Open a collab db for the user. If the db is already opened, return the opened db.diff --git a/frontend/rust-lib/flowy-user/src/services/mod.rs b/frontend/rust-lib/flowy-user/src/services/mod.rsindex 66316fa01a..ab4b3bea37 100644--- a/frontend/rust-lib/flowy-user/src/services/mod.rs+++ b/frontend/rust-lib/flowy-user/src/services/mod.rs@@ -5,4 +5,3 @@ pub mod collab_interact;pub mod data_import;pub mod db;pub mod entities;-pub mod sqlite_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rsdeleted file mode 100644index 635c79ba39..0000000000--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs+++ /dev/null@@ -1,4 +0,0 @@-pub(crate) mod member_sql;-pub(crate) mod user_sql;-pub(crate) mod workspace_setting_sql;-pub(crate) mod workspace_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rsdeleted file mode 100644index 46d5d74e35..0000000000--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs+++ /dev/null@@ -1,188 +0,0 @@-use chrono::{TimeZone, Utc};-use diesel::{RunQueryDsl, SqliteConnection};-use flowy_error::{FlowyError, FlowyResult};-use flowy_sqlite::schema::user_workspace_table;-use flowy_sqlite::DBConnection;-use flowy_sqlite::{query_dsl::*, ExpressionMethods};-use flowy_user_pub::entities::{AuthType, UserWorkspace};-use tracing::{info, trace, warn};--#[derive(Clone, Default, Queryable, Identifiable, Insertable)]-#[diesel(table_name = user_workspace_table)]-pub struct UserWorkspaceTable {- pub id: String,- pub name: String,- pub uid: i64,- pub created_at: i64,- pub database_storage_id: String,- pub icon: String,- pub member_count: i64,- pub role: Option<i32>,- pub auth_type: i32,-}--#[derive(AsChangeset, Identifiable, Default, Debug)]-#[diesel(table_name = user_workspace_table)]-pub struct UserWorkspaceChangeset {- pub id: String,- pub name: Option<String>,- pub icon: Option<String>,-}--impl UserWorkspaceTable {- pub fn from_workspace(- uid: i64,- workspace: &UserWorkspace,- auth_type: AuthType,- ) -> Result<Self, FlowyError> {- if workspace.id.is_empty() {- return Err(FlowyError::invalid_data().with_context("The id is empty"));- }- if workspace.workspace_database_id.is_empty() {- return Err(FlowyError::invalid_data().with_context("The database storage id is empty"));- }-- Ok(Self {- id: workspace.id.clone(),- name: workspace.name.clone(),- uid,- created_at: workspace.created_at.timestamp(),- database_storage_id: workspace.workspace_database_id.clone(),- icon: workspace.icon.clone(),- member_count: workspace.member_count,- role: workspace.role.clone().map(|v| v as i32),- auth_type: auth_type as i32,- })- }-}--pub fn select_user_workspace(- workspace_id: &str,- mut conn: DBConnection,-) -> Option<UserWorkspaceTable> {- user_workspace_table::dsl::user_workspace_table- .filter(user_workspace_table::id.eq(workspace_id))- .first::<UserWorkspaceTable>(&mut *conn)- .ok()-}--pub fn select_all_user_workspace(- user_id: i64,- mut conn: DBConnection,-) -> Result<Vec<UserWorkspace>, FlowyError> {- let rows = user_workspace_table::dsl::user_workspace_table- .filter(user_workspace_table::uid.eq(user_id))- .load::<UserWorkspaceTable>(&mut *conn)?;- Ok(rows.into_iter().map(UserWorkspace::from).collect())-}--pub fn update_user_workspace(- mut conn: DBConnection,- changeset: UserWorkspaceChangeset,-) -> Result<(), FlowyError> {- diesel::update(user_workspace_table::dsl::user_workspace_table)- .filter(user_workspace_table::id.eq(changeset.id.clone()))- .set(changeset)- .execute(&mut conn)?;-- Ok(())-}--pub fn upsert_user_workspace(- uid: i64,- auth_type: AuthType,- user_workspace: UserWorkspace,- conn: &mut SqliteConnection,-) -> Result<(), FlowyError> {- let new_record = UserWorkspaceTable::from_workspace(uid, &user_workspace, auth_type)?;- diesel::insert_into(user_workspace_table::table)- .values(new_record.clone())- .on_conflict(user_workspace_table::id)- .do_update()- .set((- user_workspace_table::name.eq(new_record.name),- user_workspace_table::uid.eq(new_record.uid),- user_workspace_table::created_at.eq(new_record.created_at),- user_workspace_table::database_storage_id.eq(new_record.database_storage_id),- user_workspace_table::icon.eq(new_record.icon),- user_workspace_table::member_count.eq(new_record.member_count),- user_workspace_table::role.eq(new_record.role),- user_workspace_table::auth_type.eq(new_record.auth_type),- ))- .execute(conn)?;-- Ok(())-}--pub fn delete_user_workspace(mut conn: DBConnection, workspace_id: &str) -> FlowyResult<()> {- let n = conn.immediate_transaction(|conn| {- let rows_affected: usize =- diesel::delete(user_workspace_table::table.filter(user_workspace_table::id.eq(workspace_id)))- .execute(conn)?;- Ok::<usize, FlowyError>(rows_affected)- })?;-- if n != 1 {- warn!("expected to delete 1 row, but deleted {} rows", n);- }- Ok(())-}--impl From<UserWorkspaceTable> for UserWorkspace {- fn from(value: UserWorkspaceTable) -> Self {- Self {- id: value.id,- name: value.name,- created_at: Utc- .timestamp_opt(value.created_at, 0)- .single()- .unwrap_or_default(),- workspace_database_id: value.database_storage_id,- icon: value.icon,- member_count: value.member_count,- role: value.role.map(|v| v.into()),- }- }-}--/// Delete all user workspaces for the given user and auth type.-pub fn delete_user_all_workspace(- uid: i64,- auth_type: AuthType,- conn: &mut SqliteConnection,-) -> FlowyResult<()> {- let n = diesel::delete(- user_workspace_table::dsl::user_workspace_table- .filter(user_workspace_table::uid.eq(uid))- .filter(user_workspace_table::auth_type.eq(auth_type as i32)),- )- .execute(conn)?;- info!(- "Delete {} workspaces for user {} and auth type {:?}",- n, uid, auth_type- );- Ok(())-}--/// Delete all user workspaces for the given user and auth type, then insert the provided user workspaces.-pub fn delete_all_then_insert_user_workspaces(- uid: i64,- mut conn: DBConnection,- auth_type: AuthType,- user_workspaces: &[UserWorkspace],-) -> FlowyResult<()> {- conn.immediate_transaction(|conn| {- delete_user_all_workspace(uid, auth_type, conn)?;-- info!(- "Insert {} workspaces for user {} and auth type {:?}",- user_workspaces.len(),- uid,- auth_type- );- for user_workspace in user_workspaces {- upsert_user_workspace(uid, auth_type, user_workspace.clone(), conn)?;- }- Ok::<(), FlowyError>(())- })-}diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager.rsindex 8d75a2c150..86a3dfabce 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager.rs@@ -40,13 +40,10 @@ use crate::services::cloud_config::get_cloud_config;use crate::services::collab_interact::{DefaultCollabInteract, UserReminder};use crate::migrations::doc_key_with_workspace::CollabDocKeyWithWorkspaceIdMigration;-use crate::services::sqlite_sql::user_sql::{select_user_profile, UserTable, UserTableChangeset};-use crate::services::sqlite_sql::workspace_sql::{- delete_all_then_insert_user_workspaces, upsert_user_workspace,-};use crate::user_manager::user_login_state::UserAuthProcess;use crate::{errors::FlowyError, notification::*};use flowy_user_pub::session::Session;+use flowy_user_pub::sql::*;pub struct UserManager {pub(crate) cloud_service: Arc<dyn UserCloudServiceProvider>,@@ -662,18 +659,8 @@ impl UserManager {}async fn save_user(&self, uid: i64, user: UserTable) -> Result<(), FlowyError> {- let mut conn = self.db_connection(uid)?;- conn.immediate_transaction(|conn| {- // delete old user if exists- diesel::delete(user_table::dsl::user_table.filter(user_table::dsl::id.eq(&user.id)))- .execute(conn)?;-- let _ = diesel::insert_into(user_table::table)- .values(user)- .execute(conn)?;- Ok::<(), FlowyError>(())- })?;-+ let conn = self.db_connection(uid)?;+ upsert_user(user, conn)?;Ok(())}diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rsindex 1eaab813e4..cc884dc1d9 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs@@ -15,28 +15,18 @@ use crate::services::billing_check::PeriodicallyCheckBillingState;use crate::services::data_import::{generate_import_data, upload_collab_objects_data, ImportedFolder, ImportedSource,};-use crate::services::sqlite_sql::member_sql::{- select_workspace_member, upsert_workspace_member, WorkspaceMemberTable,-};-use crate::services::sqlite_sql::workspace_setting_sql::{- select_workspace_setting, update_workspace_setting, upsert_workspace_setting,- WorkspaceSettingsChangeset, WorkspaceSettingsTable,-};-use crate::services::sqlite_sql::workspace_sql::{- delete_all_then_insert_user_workspaces, delete_user_workspace, select_all_user_workspace,- select_user_workspace, update_user_workspace, upsert_user_workspace, UserWorkspaceChangeset,- UserWorkspaceTable,-};+use crate::user_manager::UserManager;use collab_integrate::CollabKVDB;use flowy_error::{ErrorCode, FlowyError, FlowyResult};use flowy_folder_pub::entities::{ImportFrom, ImportedCollabData, ImportedFolderData};-use flowy_sqlite::{ConnectionPool, DBConnection, ExpressionMethods};+use flowy_sqlite::ConnectionPool;use flowy_user_pub::cloud::{UserCloudService, UserCloudServiceProvider};use flowy_user_pub::entities::{AuthType, Role, UserWorkspace, WorkspaceInvitation, WorkspaceInvitationStatus, WorkspaceMember,};use flowy_user_pub::session::Session;+use flowy_user_pub::sql::*;use tracing::{error, info, instrument, trace};use uuid::Uuid;