mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
feat: migrate user data to cloud (#3078)
* refactor: weak passed-in params in handler * refactor: rename struct * chore: update tables * chore: update schema * chore: add permission * chore: update tables * chore: support transaction mode * chore: workspace database id * chore: add user workspace * feat: return list of workspaces * chore: add user to workspace * feat: separate database row table * refactor: update schema * chore: partition table * chore: use transaction * refactor: dir * refactor: collab db ref * fix: collab db lock * chore: rename files * chore: add tables descriptions * chore: update readme * docs: update documentation * chore: rename crate * chore: update ref * chore: update tests * chore: update tests * refactor: crate deps * chore: update crate ref * chore: remove unused deps * chore: remove unused deps * chore: update collab crate refs * chore: replace client with transaction in pooler * refactor: return error type * refactor: use anyhow error in deps * feat: supabase postgrest user signin (wip) * fix: Cargo.toml source git deps, changed Error to anyhow::Error * fix: uuid serialization * chore: fix conflict * chore: extend the response * feat: add implementation place holders * feat: impl get_user_workspaces * feat: impl get_user_profile * test: create workspace * fix: postgrest: field names and alias * chore: implement folder restful api * chore: implement collab storate with restful api * feat: added placeholders for impl: update_user_profile, check_user * feat: impl: update_user_profile * feat: impl: check_user * fix: use UidResponse, add more debug info for serde serialization error * fix: get_user_profile: use Optional<UserProfileResponse> * chore: imple init sync * chore: support soft delete * feat: postgresql: add migration test * feat: postgresql migration test: added UID display and colored output * feat: postgresql migration test: workspace role * feat: postgresql migration test: create shared common utils * feat: postgresql migration test: fixed shebang * chore: add flush_collab_update pg function * chore: implement datbaase and document restful api * chore: migrate to use restful api * chore: update table schema * chore: fix tests * chore: remove unused code * chore: format code * chore: remove unused env * fix: tauri build * fix: tauri build --------- Co-authored-by: Fu Zi Xiang <speed2exe@live.com.sg>
This commit is contained in:
@ -57,9 +57,6 @@ pub enum ErrorCode {
|
||||
#[error("View name too long")]
|
||||
ViewNameTooLong = 17,
|
||||
|
||||
#[error("Http server connection error")]
|
||||
HttpServerConnectError = 18,
|
||||
|
||||
#[error("Email can not be empty or whitespace")]
|
||||
EmailIsEmpty = 19,
|
||||
|
||||
@ -179,7 +176,7 @@ pub enum ErrorCode {
|
||||
#[error("Sql error")]
|
||||
SqlError = 58,
|
||||
|
||||
#[error("Http request error")]
|
||||
#[error("Http error")]
|
||||
HttpError = 59,
|
||||
|
||||
#[error("The content should not be empty")]
|
||||
@ -215,8 +212,14 @@ pub enum ErrorCode {
|
||||
#[error("Postgres database error")]
|
||||
PgDatabaseError = 70,
|
||||
|
||||
#[error("Postgres transaction error")]
|
||||
PgTransactionError = 71,
|
||||
|
||||
#[error("Enable supabase sync")]
|
||||
SupabaseSyncRequired = 71,
|
||||
SupabaseSyncRequired = 72,
|
||||
|
||||
#[error("Conflict")]
|
||||
Conflict = 73,
|
||||
}
|
||||
|
||||
impl ErrorCode {
|
||||
|
@ -58,7 +58,6 @@ impl FlowyError {
|
||||
static_flowy_error!(view_desc, ErrorCode::ViewDescTooLong);
|
||||
static_flowy_error!(view_data, ErrorCode::ViewDataInvalid);
|
||||
static_flowy_error!(unauthorized, ErrorCode::UserUnauthorized);
|
||||
static_flowy_error!(connection, ErrorCode::HttpServerConnectError);
|
||||
static_flowy_error!(email_empty, ErrorCode::EmailIsEmpty);
|
||||
static_flowy_error!(email_format, ErrorCode::EmailFormatInvalid);
|
||||
static_flowy_error!(email_exist, ErrorCode::EmailAlreadyExists);
|
||||
@ -121,6 +120,7 @@ impl std::convert::From<protobuf::ProtobufError> for FlowyError {
|
||||
|
||||
impl From<anyhow::Error> for FlowyError {
|
||||
fn from(e: anyhow::Error) -> Self {
|
||||
FlowyError::internal().context(e)
|
||||
e.downcast::<FlowyError>()
|
||||
.unwrap_or_else(|err| FlowyError::new(ErrorCode::Internal, err))
|
||||
}
|
||||
}
|
||||
|
@ -1,20 +0,0 @@
|
||||
// #[cfg(feature = "adaptor_ot")]
|
||||
// pub mod ot;
|
||||
|
||||
#[cfg(feature = "adaptor_serde")]
|
||||
pub mod serde;
|
||||
|
||||
#[cfg(feature = "adaptor_dispatch")]
|
||||
pub mod dispatch;
|
||||
|
||||
#[cfg(feature = "adaptor_reqwest")]
|
||||
pub mod reqwest;
|
||||
|
||||
#[cfg(feature = "adaptor_database")]
|
||||
pub mod database;
|
||||
|
||||
#[cfg(feature = "adaptor_server_error")]
|
||||
pub mod http_server;
|
||||
|
||||
#[cfg(feature = "collab")]
|
||||
pub mod collab;
|
@ -9,7 +9,7 @@ impl std::convert::From<ServerErrorCode> for ErrorCode {
|
||||
ServerErrorCode::RecordNotFound => ErrorCode::RecordNotFound,
|
||||
ServerErrorCode::ConnectRefused
|
||||
| ServerErrorCode::ConnectTimeout
|
||||
| ServerErrorCode::ConnectClose => ErrorCode::HttpServerConnectError,
|
||||
| ServerErrorCode::ConnectClose => ErrorCode::HttpError,
|
||||
_ => ErrorCode::Internal,
|
||||
}
|
||||
}
|
26
frontend/rust-lib/flowy-error/src/impl_from/mod.rs
Normal file
26
frontend/rust-lib/flowy-error/src/impl_from/mod.rs
Normal file
@ -0,0 +1,26 @@
|
||||
// #[cfg(feature = "adaptor_ot")]
|
||||
// pub mod ot;
|
||||
|
||||
#[cfg(feature = "impl_from_serde")]
|
||||
pub mod serde;
|
||||
|
||||
#[cfg(feature = "impl_from_dispatch_error")]
|
||||
pub mod dispatch;
|
||||
|
||||
#[cfg(feature = "impl_from_reqwest")]
|
||||
pub mod reqwest;
|
||||
|
||||
#[cfg(feature = "impl_from_sqlite")]
|
||||
pub mod database;
|
||||
|
||||
#[cfg(feature = "impl_from_appflowy_cloud")]
|
||||
pub mod http_server;
|
||||
|
||||
#[cfg(feature = "impl_from_collab")]
|
||||
pub mod collab;
|
||||
|
||||
#[cfg(feature = "impl_from_postgres")]
|
||||
mod postgres;
|
||||
|
||||
#[cfg(feature = "impl_from_tokio")]
|
||||
mod tokio;
|
7
frontend/rust-lib/flowy-error/src/impl_from/postgres.rs
Normal file
7
frontend/rust-lib/flowy-error/src/impl_from/postgres.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use crate::FlowyError;
|
||||
|
||||
impl std::convert::From<tokio_postgres::Error> for FlowyError {
|
||||
fn from(error: tokio_postgres::Error) -> Self {
|
||||
FlowyError::internal().context(error)
|
||||
}
|
||||
}
|
@ -3,6 +3,6 @@ use reqwest::Error;
|
||||
|
||||
impl std::convert::From<reqwest::Error> for FlowyError {
|
||||
fn from(error: Error) -> Self {
|
||||
FlowyError::connection().context(error)
|
||||
FlowyError::http().context(error)
|
||||
}
|
||||
}
|
7
frontend/rust-lib/flowy-error/src/impl_from/tokio.rs
Normal file
7
frontend/rust-lib/flowy-error/src/impl_from/tokio.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use crate::FlowyError;
|
||||
|
||||
// impl<T> std::convert::From<tokio::sync::mpsc::error::SendError<T>> for FlowyError {
|
||||
// fn from(error: tokio::sync::mpsc::error::SendError<T>) -> Self {
|
||||
// FlowyError::internal().context(error)
|
||||
// }
|
||||
// }
|
@ -1,6 +1,6 @@
|
||||
pub mod code;
|
||||
mod errors;
|
||||
mod ext;
|
||||
mod impl_from;
|
||||
pub mod protobuf;
|
||||
|
||||
pub use code::*;
|
||||
|
Reference in New Issue
Block a user