diff --git a/src/biz/workspace/publish_dup.rs b/src/biz/workspace/publish_dup.rs index fedd40c4..54bbf713 100644 --- a/src/biz/workspace/publish_dup.rs +++ b/src/biz/workspace/publish_dup.rs @@ -1064,20 +1064,6 @@ pub fn collab_from_doc_state(doc_state: Vec, object_id: &str) -> Result Result { - let txn = db_collab.context.transact(); - let db_map = db_collab - .get_with_txn(&txn, "database") - .ok_or_else(|| AppError::RecordNotFound("no database found in database collab".to_string()))? - .cast::() - .map_err(|err| AppError::RecordNotFound(format!("database not a map: {:?}", err)))?; - let db_id = db_map - .get(&txn, "id") - .ok_or_else(|| AppError::RecordNotFound("no id found in database".to_string()))? - .to_string(&txn); - Ok(db_id) -} - fn to_folder_view_icon(icon: workspace_dto::ViewIcon) -> collab_folder::ViewIcon { collab_folder::ViewIcon { ty: to_folder_view_icon_type(icon.ty), diff --git a/tests/workspace/publish.rs b/tests/workspace/publish.rs index 288f6c91..e75e768b 100644 --- a/tests/workspace/publish.rs +++ b/tests/workspace/publish.rs @@ -1,8 +1,6 @@ use app_error::ErrorCode; use appflowy_cloud::biz::collab::folder_view::collab_folder_to_folder_view; -use appflowy_cloud::biz::workspace::publish_dup::{ - collab_from_doc_state, get_database_id_from_collab, -}; +use appflowy_cloud::biz::workspace::publish_dup::collab_from_doc_state; use client_api::entity::{ AFRole, GlobalComment, PublishCollabItem, PublishCollabMetadata, QueryCollab, QueryCollabParams, }; @@ -962,7 +960,7 @@ async fn duplicate_to_workspace_doc_inline_database() { .unwrap(); let db_doc_state = db_collab_collab_resp.encode_collab.doc_state; let db_collab = collab_from_doc_state(db_doc_state.to_vec(), "").unwrap(); - let dup_db_id = get_database_id_from_collab(&db_collab).unwrap(); + let dup_db_id = DatabaseBody::database_id_from_collab(&db_collab).unwrap(); assert_ne!(dup_db_id, pub_db_id); let view_map = { @@ -1225,7 +1223,7 @@ async fn duplicate_to_workspace_db_with_relation() { fn get_database_id_and_row_ids(published_db_blob: &[u8]) -> (String, HashSet) { let pub_db_data = serde_json::from_slice::(published_db_blob).unwrap(); let db_collab = collab_from_doc_state(pub_db_data.database_collab, "").unwrap(); - let pub_db_id = get_database_id_from_collab(&db_collab).unwrap(); + let pub_db_id = DatabaseBody::database_id_from_collab(&db_collab).unwrap(); let row_ids: HashSet = pub_db_data.database_row_collabs.into_keys().collect(); (pub_db_id, row_ids) }