chore: uuid ViewsMap

Author: appflowy

collab-folder/src/folder.rs

@@ -738,7 +738,7 @@ impl FolderBody {
     tracing::debug!("Move nested view: {}", view_id);
     let view = self.views.get_view_with_txn(txn, view_id, uid)?;
     let current_workspace_id = self.get_workspace_id_with_txn(txn)?;
-    let parent_id = view.parent_view_id.to_string();
+    let parent_id = view.parent_view_id;
 
     let new_parent_view = self.views.get_view_with_txn(txn, new_parent_id, uid);
 
@@ -753,13 +753,13 @@ impl FolderBody {
     // dissociate the child from its parent
     self
       .views
-      .dissociate_parent_child_with_txn(txn, &parent_id, &view_id.to_string());
+      .dissociate_parent_child_with_txn(txn, &parent_id, view_id);
     // associate the child with its new parent and place it after the prev_view_id. If the prev_view_id is None,
     // place it as the first child.
     self.views.associate_parent_child_with_txn(
       txn,
-      &new_parent_id.to_string(),
-      &view_id.to_string(),
+      new_parent_id,
+      view_id,
       prev_view_id,
     );
     // Update the view's parent ID.

collab-folder/src/view.rs

@@ -100,7 +100,7 @@ impl ViewsMap {
   /// 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: &Uuid, view_id: &Uuid) {
-    self.dissociate_parent_child_with_txn(txn, &parent_id.to_string(), &view_id.to_string());
+    self.dissociate_parent_child_with_txn(txn, parent_id, view_id);
   }
 
   /// Establish a relationship between the parent_id and view_id, and insert the view below the prev_id.
@@ -114,40 +114,30 @@ impl ViewsMap {
     view_id: &Uuid,
     prev_id: Option<ViewId>,
   ) {
-    self.associate_parent_child_with_txn(txn, &parent_id.to_string(), &view_id.to_string(), prev_id);
+    self.associate_parent_child_with_txn(txn, parent_id, view_id, prev_id);
   }
 
   pub fn dissociate_parent_child_with_txn(
     &self,
     txn: &mut TransactionMut,
-    parent_id: &str,
-    view_id: &str,
+    parent_id: &Uuid,
+    view_id: &Uuid,
   ) {
-    if let (Ok(parent_uuid), Ok(view_uuid)) = (
-      uuid::Uuid::parse_str(parent_id),
-      uuid::Uuid::parse_str(view_id),
-    ) {
-      self
-        .parent_children_relation
-        .dissociate_parent_child_with_txn(txn, &parent_uuid, &view_uuid);
-    }
+    self
+      .parent_children_relation
+      .dissociate_parent_child_with_txn(txn, parent_id, view_id);
   }
 
   pub fn associate_parent_child_with_txn(
     &self,
     txn: &mut TransactionMut,
-    parent_id: &str,
-    view_id: &str,
+    parent_id: &Uuid,
+    view_id: &Uuid,
     prev_view_id: Option<ViewId>,
   ) {
-    if let (Ok(parent_uuid), Ok(view_uuid)) = (
-      uuid::Uuid::parse_str(parent_id),
-      uuid::Uuid::parse_str(view_id),
-    ) {
-      self
-        .parent_children_relation
-        .associate_parent_child_with_txn(txn, &parent_uuid, &view_uuid, prev_view_id);
-    }
+    self
+      .parent_children_relation
+      .associate_parent_child_with_txn(txn, parent_id, view_id, prev_view_id);
   }
 
   pub fn remove_child(&self, txn: &mut TransactionMut, parent_id: &Uuid, child_index: u32) {

collab-folder/tests/folder_test/child_views_test.rs

@@ -283,7 +283,7 @@ fn delete_view_test() {
     .views
     .insert(&mut txn, view_3, None, uid.as_i64());
 
-  folder.body.views.remove_child(&mut txn, &workspace_id, 1);
+  folder.body.views.remove_child(&mut txn, &uuid::Uuid::parse_str(&workspace_id).unwrap(), 1);
   let w_1_child_views =
     folder
       .body

collab-folder/tests/folder_test/view_test.rs

@@ -356,51 +356,53 @@ fn dissociate_and_associate_view_test() {
     .views
     .insert(&mut txn, view_2, None, uid.as_i64());
 
-  let v1_uuid_str = crate::util::test_uuid(view_1_id).to_string();
-  let v2_uuid_str = crate::util::test_uuid(view_2_id).to_string();
-  let v1_child_uuid_str = crate::util::test_uuid(view_1_child_id).to_string();
+  let v1_uuid = crate::util::test_uuid(view_1_id);
+  let v2_uuid = crate::util::test_uuid(view_2_id);
+  let v1_child_uuid = crate::util::test_uuid(view_1_child_id);
   let r_view = folder
     .body
     .views
-    .get_view(&txn, &parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&txn, &v1_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(r_view.children.items.iter().len(), 1);
 
   // move out not exist parent view
+  let not_exist_parent_uuid = uuid::Uuid::new_v4();
+  let not_exist_view_uuid = uuid::Uuid::new_v4();
   folder
     .body
     .views
-    .dissociate_parent_child(&mut txn, "not_exist_parent_view", "not_exist_view");
+    .dissociate_parent_child(&mut txn, &not_exist_parent_uuid, &not_exist_view_uuid);
 
   // move in not exist parent view
   folder.body.views.associate_parent_child(
     &mut txn,
-    "not_exist_parent_view",
-    "not_exist_view",
+    &not_exist_parent_uuid,
+    &not_exist_view_uuid,
     None,
   );
 
   // move out view_1_child from view_2
   folder
     .body
     .views
-    .dissociate_parent_child(&mut txn, &v2_uuid_str, &v1_child_uuid_str);
+    .dissociate_parent_child(&mut txn, &v2_uuid, &v1_child_uuid);
   let r_view = folder
     .body
     .views
-    .get_view(&txn, &parse_view_id(&v2_uuid_str), uid.as_i64())
+    .get_view(&txn, &v2_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(r_view.children.items.iter().len(), 0);
 
   folder
     .body
     .views
-    .associate_parent_child(&mut txn, &v1_uuid_str, &v2_uuid_str, None);
+    .associate_parent_child(&mut txn, &v1_uuid, &v2_uuid, None);
 
   let r_view = folder
     .body
     .views
-    .get_view(&txn, &parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&txn, &v1_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(r_view.children.items.iter().len(), 2);
   assert_eq!(
@@ -415,25 +417,25 @@ fn dissociate_and_associate_view_test() {
   folder
     .body
     .views
-    .dissociate_parent_child(&mut txn, &v1_uuid_str, &v2_uuid_str);
+    .dissociate_parent_child(&mut txn, &v1_uuid, &v2_uuid);
   let r_view = folder
     .body
     .views
-    .get_view(&txn, &parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&txn, &v1_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(r_view.children.items.iter().len(), 1);
 
   folder.body.views.associate_parent_child(
     &mut txn,
-    &v1_uuid_str,
-    &v2_uuid_str,
+    &v1_uuid,
+    &v2_uuid,
     Some(crate::util::test_uuid(view_1_child_id)),
   );
 
   let r_view = folder
     .body
     .views
-    .get_view(&txn, &parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&txn, &v1_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(r_view.children.items.iter().len(), 2);
   assert_eq!(
@@ -468,33 +470,33 @@ fn move_view_across_parent_test() {
   folder.insert_view(view_1, None, uid.as_i64());
   folder.insert_view(view_2, None, uid.as_i64());
 
-  let v1_uuid_str = crate::util::test_uuid(view_1_id).to_string();
-  let v2_uuid_str = crate::util::test_uuid(view_2_id).to_string();
-  let v1_child_uuid_str = crate::util::test_uuid(view_1_child_id).to_string();
+  let v1_uuid = crate::util::test_uuid(view_1_id);
+  let v2_uuid = crate::util::test_uuid(view_2_id);
+  let v1_child_uuid = crate::util::test_uuid(view_1_child_id);
 
   // Move out of the current workspace.
   let res = folder.move_nested_view(
-    &parse_view_id(&v1_child_uuid_str),
+    &v1_child_uuid,
     &crate::util::test_uuid("w2"),
     None,
     uid.as_i64(),
   );
   assert!(res.is_none());
   // Move view_1_child from view_1 to view_2.
   folder.move_nested_view(
-    &parse_view_id(&v1_child_uuid_str),
-    &parse_view_id(&v2_uuid_str),
+    &v1_child_uuid,
+    &v2_uuid,
     None,
     uid.as_i64(),
   );
   let view_1 = folder
-    .get_view(&parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&v1_uuid, uid.as_i64())
     .unwrap();
   let view_2 = folder
-    .get_view(&parse_view_id(&v2_uuid_str), uid.as_i64())
+    .get_view(&v2_uuid, uid.as_i64())
     .unwrap();
   let view_1_child = folder
-    .get_view(&parse_view_id(&v1_child_uuid_str), uid.as_i64())
+    .get_view(&v1_child_uuid, uid.as_i64())
     .unwrap();
   assert_eq!(view_1.children.items.iter().len(), 0);
   assert_eq!(view_2.children.items.iter().len(), 1);
@@ -507,19 +509,19 @@ fn move_view_across_parent_test() {
   let workspace_uuid = uuid::Uuid::new_v5(&uuid::Uuid::NAMESPACE_OID, workspace_id.as_bytes());
   let workspace_uuid_str = workspace_uuid.to_string();
   folder.move_nested_view(
-    &parse_view_id(&v1_child_uuid_str),
+    &v1_child_uuid,
     &parse_view_id(&workspace_uuid_str),
     None,
     uid.as_i64(),
   );
   let view_1 = folder
-    .get_view(&parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&v1_uuid, uid.as_i64())
     .unwrap();
   let view_2 = folder
-    .get_view(&parse_view_id(&v2_uuid_str), uid.as_i64())
+    .get_view(&v2_uuid, uid.as_i64())
     .unwrap();
   let view_1_child = folder
-    .get_view(&parse_view_id(&v1_child_uuid_str), uid.as_i64())
+    .get_view(&v1_child_uuid, uid.as_i64())
     .unwrap();
   let workspace = folder
     .get_workspace_info(&workspace_uuid, uid.as_i64())
@@ -538,19 +540,19 @@ fn move_view_across_parent_test() {
 
   // Move view_1_child from position 0 to position 1 in the current workspace.
   folder.move_nested_view(
-    &parse_view_id(&v1_child_uuid_str),
+    &v1_child_uuid,
     &parse_view_id(&workspace_uuid_str),
     Some(crate::util::test_uuid(view_1_id)),
     uid.as_i64(),
   );
   let view_1 = folder
-    .get_view(&parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&v1_uuid, uid.as_i64())
     .unwrap();
   let view_2 = folder
-    .get_view(&parse_view_id(&v2_uuid_str), uid.as_i64())
+    .get_view(&v2_uuid, uid.as_i64())
     .unwrap();
   let view_1_child = folder
-    .get_view(&parse_view_id(&v1_child_uuid_str), uid.as_i64())
+    .get_view(&v1_child_uuid, uid.as_i64())
     .unwrap();
   let workspace = folder
     .get_workspace_info(&workspace_uuid, uid.as_i64())
@@ -573,19 +575,19 @@ fn move_view_across_parent_test() {
 
   // move view_1_child from current workspace to view_1
   folder.move_nested_view(
-    &parse_view_id(&v1_child_uuid_str),
-    &parse_view_id(&v1_uuid_str),
+    &v1_child_uuid,
+    &v1_uuid,
     None,
     uid.as_i64(),
   );
   let view_1 = folder
-    .get_view(&parse_view_id(&v1_uuid_str), uid.as_i64())
+    .get_view(&v1_uuid, uid.as_i64())
     .unwrap();
   let view_2 = folder
-    .get_view(&parse_view_id(&v2_uuid_str), uid.as_i64())
+    .get_view(&v2_uuid, uid.as_i64())
     .unwrap();
   let view_1_child = folder
-    .get_view(&parse_view_id(&v1_child_uuid_str), uid.as_i64())
+    .get_view(&v1_child_uuid, uid.as_i64())
     .unwrap();
   let workspace = folder
     .get_workspace_info(&workspace_uuid, uid.as_i64())