chore: uuid importer

Author: appflowy

collab-folder/src/folder.rs

@@ -723,7 +723,7 @@ impl FolderBody {
     let view = self.views.get_view_with_txn(txn, view_id, uid)?;
     self
       .views
-      .move_child(txn, &view.parent_view_id.to_string(), from, to);
+      .move_child(txn, &view.parent_view_id, from, to);
     Some(view)
   }
 

collab-folder/src/view.rs

@@ -89,25 +89,18 @@ impl ViewsMap {
     *self.subscription.lock().await = subscription;
   }
 
-  pub fn move_child(&self, txn: &mut TransactionMut, parent_id: &str, from: u32, to: u32) {
-    if let Ok(parent_uuid) = uuid::Uuid::parse_str(parent_id) {
-      self
-        .parent_children_relation
-        .move_child_with_txn(txn, &parent_uuid, from, to);
-    }
+  pub fn move_child(&self, txn: &mut TransactionMut, parent_id: &Uuid, from: u32, to: u32) {
+    self
+      .parent_children_relation
+      .move_child_with_txn(txn, parent_id, from, to);
   }
 
   /// Dissociate the relationship between parent_id and view_id.
   /// Why don't we use the move method to replace dissociate_parent_child and associate_parent_child?
   /// Because the views and workspaces are stored in two separate maps, we can't directly move a view from one map to another.
   /// So, we have to dissociate the relationship between parent_id and view_id, and then associate the relationship between parent_id and view_id.
-  pub fn dissociate_parent_child(&self, txn: &mut TransactionMut, parent_id: &str, view_id: &str) {
-    if let (Ok(parent_uuid), Ok(view_uuid)) = (
-      uuid::Uuid::parse_str(parent_id),
-      uuid::Uuid::parse_str(view_id),
-    ) {
-      self.dissociate_parent_child_with_txn(txn, &parent_uuid.to_string(), &view_uuid.to_string());
-    }
+  pub fn dissociate_parent_child(&self, txn: &mut TransactionMut, parent_id: &Uuid, view_id: &Uuid) {
+    self.dissociate_parent_child_with_txn(txn, &parent_id.to_string(), &view_id.to_string());
   }
 
   /// Establish a relationship between the parent_id and view_id, and insert the view below the prev_id.
@@ -117,11 +110,11 @@ impl ViewsMap {
   pub fn associate_parent_child(
     &self,
     txn: &mut TransactionMut,
-    parent_id: &str,
-    view_id: &str,
+    parent_id: &Uuid,
+    view_id: &Uuid,
     prev_id: Option<ViewId>,
   ) {
-    self.associate_parent_child_with_txn(txn, parent_id, view_id, prev_id);
+    self.associate_parent_child_with_txn(txn, &parent_id.to_string(), &view_id.to_string(), prev_id);
   }
 
   pub fn dissociate_parent_child_with_txn(
@@ -157,15 +150,13 @@ impl ViewsMap {
     }
   }
 
-  pub fn remove_child(&self, txn: &mut TransactionMut, parent_id: &str, child_index: u32) {
-    if let Ok(parent_uuid) = uuid::Uuid::parse_str(parent_id) {
-      if let Some(parent) = self
-        .parent_children_relation
-        .get_children_with_txn(txn, &parent_uuid)
-      {
-        if let Some(identifier) = parent.remove_child_with_txn(txn, child_index) {
-          self.delete_views(txn, vec![identifier.id]);
-        }
+  pub fn remove_child(&self, txn: &mut TransactionMut, parent_id: &Uuid, child_index: u32) {
+    if let Some(parent) = self
+      .parent_children_relation
+      .get_children_with_txn(txn, parent_id)
+    {
+      if let Some(identifier) = parent.remove_child_with_txn(txn, child_index) {
+        self.delete_views(txn, vec![identifier.id]);
       }
     }
   }

collab-folder/tests/folder_test/child_views_test.rs

@@ -233,11 +233,11 @@ fn move_child_views_test() {
   folder
     .body
     .views
-    .move_child(&mut txn, &v_1.id.to_string(), 2, 0);
+    .move_child(&mut txn, &v_1.id, 2, 0);
   folder
     .body
     .views
-    .move_child(&mut txn, &v_1.id.to_string(), 0, 1);
+    .move_child(&mut txn, &v_1.id, 0, 1);
 
   let v_1_child_views = folder
     .body

collab-importer/src/workspace/space_view_edge_case_handler.rs

@@ -39,8 +39,8 @@ impl SpaceViewEdgeCaseHandler {
     id_mapper
       .id_map
       .insert(space_view_uuid, space_view_uuid);
-    self.reparent_workspace_views(relation_map, &space_view_uuid.to_string())?;
-    self.generate_space_document(&space_view_uuid.to_string(), export_path)?;
+    self.reparent_workspace_views(relation_map, &space_view_uuid)?;
+    self.generate_space_document(&space_view_uuid, export_path)?;
 
     Ok(Some(space_view_uuid.to_string()))
   }
@@ -90,11 +90,11 @@ impl SpaceViewEdgeCaseHandler {
   fn reparent_workspace_views(
     &self,
     relation_map: &mut WorkspaceRelationMap,
-    space_view_id: &str,
+    space_view_id: &Uuid,
   ) -> Result<()> {
     let mut workspace_children = Vec::new();
 
-    let space_view_uuid = Uuid::parse_str(space_view_id)?;
+    let space_view_uuid = *space_view_id;
     let original_workspace_uuid = self.original_workspace_id;
 
     for (view_id, view_metadata) in relation_map.views.iter_mut() {
@@ -114,15 +114,15 @@ impl SpaceViewEdgeCaseHandler {
     Ok(())
   }
 
-  fn generate_space_document(&self, space_view_id: &str, export_path: &Path) -> Result<()> {
+  fn generate_space_document(&self, space_view_id: &Uuid, export_path: &Path) -> Result<()> {
     let documents_dir = export_path.join("collab_jsons").join("documents");
     fs::create_dir_all(&documents_dir)?;
 
     let document_path = documents_dir.join(format!("{}.json", space_view_id));
 
     let document_content = serde_json::json!({
         "document": {
-            "page_id": space_view_id,
+            "page_id": space_view_id.to_string(),
             "blocks": {},
             "meta": {
                 "children_map": {},

collab-importer/tests/notion_test/import_test.rs

@@ -15,13 +15,12 @@ use collab_document::blocks::{
 use collab_document::importer::define::URL_FIELD;
 use collab_entity::CollabType;
 use collab_folder::hierarchy_builder::ParentChildViews;
-use collab_folder::{Folder, View, ViewId, default_folder_data};
+use collab_folder::{Folder, View, default_folder_data};
 use collab_importer::error::ImporterError;
 use collab_importer::imported_collab::{ImportType, ImportedCollabInfo, import_notion_zip_file};
 use collab_importer::notion::page::NotionPage;
 use collab_importer::notion::{CSVContentCache, NotionImporter, is_csv_contained_cached};
 use collab_importer::util::{CSVRow, parse_csv};
-use uuid::Uuid;
 
 use collab::core::collab::default_client_id;
 use collab_document::document::Document;
@@ -55,10 +54,6 @@ use std::sync::Arc;
 //   println!("{}", nested_view);
 // }
 
-/// Helper function to parse string to ViewId for tests
-fn parse_view_id(s: &str) -> ViewId {
-  Uuid::parse_str(s).expect(&format!("Invalid UUID format: {}", s))
-}
 
 #[tokio::test]
 async fn import_zip_file_contains_zip_as_attachments() {
@@ -761,7 +756,7 @@ async fn import_level_test() {
   assert_eq!(view_hierarchy.flatten_views().len(), 14);
   folder.insert_nested_views(view_hierarchy.into_inner(), uid);
 
-  let first_level_views = folder.get_views_belong_to(&parse_view_id(&info.workspace_id.to_string()), uid);
+  let first_level_views = folder.get_views_belong_to(&info.workspace_id, uid);
   assert_eq!(first_level_views.len(), 1);
   assert_eq!(first_level_views[0].children.len(), 3);
   println!("first_level_views: {:?}", first_level_views);

collab-importer/tests/workspace/folder_collab_remapper.rs

@@ -1,14 +1,9 @@
 use crate::util::sync_unzip_asset;
-use collab_folder::{Folder, ViewId, ViewLayout};
+use collab_folder::{Folder, ViewLayout};
 use collab_importer::workspace::folder_collab_remapper::FolderCollabRemapper;
 use collab_importer::workspace::id_mapper::IdMapper;
 use collab_importer::workspace::relation_map_parser::RelationMapParser;
-use uuid::Uuid;
 
-/// Helper function to parse string to ViewId for tests  
-fn parse_view_id(s: &str) -> ViewId {
-  Uuid::parse_str(s).expect(&format!("Invalid UUID format: {}", s))
-}
 
 #[allow(clippy::too_many_arguments)]
 fn verify_view(
@@ -22,7 +17,7 @@ fn verify_view(
   uid: i64,
 ) {
   let new_id = id_mapper.get_new_id(old_id).unwrap();
-  let view = folder.get_view(&parse_view_id(&new_id.to_string()), uid).unwrap();
+  let view = folder.get_view(&new_id, uid).unwrap();
 
   assert_eq!(view.name, expected_name);
   assert_eq!(
@@ -238,6 +233,6 @@ async fn test_folder_hierarchy_structure() {
     uid,
   );
 
-  let child_views = folder.get_views_belong_to(&parse_view_id(&getting_started_new_id.to_string()), uid);
+  let child_views = folder.get_views_belong_to(&getting_started_new_id, uid);
   assert_eq!(child_views.len(), 3);
 }