chore: change parent view id to uuid (#416)

* chore: change parent view id to uuid

* chore: fix clippy issues

* chore: convert folder get workspace id to uuid

* chore: fix clippy issues

* chore: serialize parent view id into empty string if none

* chore: clippy fix

---------

Co-authored-by: Nathan <[email protected]>

Author: Horusiath

collab-folder/src/folder.rs

@@ -173,9 +173,9 @@ impl Folder {
     self.body.get_workspace_info(&txn, workspace_id, uid)
   }
 
-  pub fn get_workspace_id(&self) -> Option<String> {
+  pub fn get_workspace_id(&self) -> Option<ViewId> {
     let txn = self.collab.transact();
-    self.body.get_workspace_id(&txn)
+    self.body.get_workspace_id(&txn)?.parse().ok()
   }
 
   pub fn get_all_views(&self, uid: i64) -> Vec<Arc<View>> {
@@ -721,8 +721,8 @@ impl FolderBody {
     uid: i64,
   ) -> Option<Arc<View>> {
     let view = self.views.get_view_with_txn(txn, view_id, uid)?;
-    if let Ok(parent_uuid) = uuid::Uuid::parse_str(&view.parent_view_id) {
-      self.views.move_child(txn, &parent_uuid, from, to);
+    if let Some(parent_uuid) = &view.parent_view_id {
+      self.views.move_child(txn, parent_uuid, from, to);
     }
     Some(view)
   }
@@ -751,10 +751,10 @@ impl FolderBody {
     }
 
     // dissociate the child from its parent
-    if let Ok(parent_uuid) = uuid::Uuid::parse_str(parent_id) {
+    if let Some(parent_uuid) = parent_id {
       self
         .views
-        .dissociate_parent_child_with_txn(txn, &parent_uuid, view_id);
+        .dissociate_parent_child_with_txn(txn, parent_uuid, 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.
@@ -893,23 +893,23 @@ mod tests {
     let collab = Collab::new_with_options(CollabOrigin::Empty, options).unwrap();
     let view_1 = View::new(
       Uuid::parse_str("00000000-0000-0000-0000-000000000002").unwrap(),
-      workspace_id.to_string(),
+      workspace_id,
       "View 1".to_string(),
       crate::ViewLayout::Document,
       Some(uid),
     );
     let view_1_id = view_1.id;
     let view_2 = View::new(
       Uuid::parse_str("00000000-0000-0000-0000-000000000003").unwrap(),
-      workspace_id.to_string(),
+      workspace_id,
       "View 2".to_string(),
       crate::ViewLayout::Document,
       Some(uid),
     );
     let view_2_id = view_2.id;
     let space_view = View {
       id: Uuid::parse_str("00000000-0000-0000-0000-000000000001").unwrap(),
-      parent_view_id: workspace_id.to_string(),
+      parent_view_id: Some(workspace_id),
       name: "Space 1".to_string(),
       children: RepeatedViewIdentifier::new(vec![
         ViewIdentifier::new(view_1_id),
@@ -969,7 +969,7 @@ mod tests {
       .map(|i| {
         View::new(
           Uuid::parse_str(&format!("00000000-0000-0000-0000-00000000001{}", i)).unwrap(),
-          space_view_id.to_string(),
+          space_view_id,
           format!("View {:?}", i),
           crate::ViewLayout::Document,
           Some(uid),
@@ -978,7 +978,7 @@ mod tests {
       .collect();
     let space_view = View {
       id: space_view_id,
-      parent_view_id: "".to_string(),
+      parent_view_id: None,
       name: "Space".to_string(),
       children: RepeatedViewIdentifier::new(
         views

collab-folder/src/hierarchy_builder.rs

@@ -203,7 +203,7 @@ impl NestedChildViewBuilder {
   pub fn build(self) -> ParentChildViews {
     let view = View {
       id: self.view_id,
-      parent_view_id: self.parent_view_id.to_string(),
+      parent_view_id: Some(self.parent_view_id),
       name: self.name,
       created_at: timestamp(),
       is_favorite: self.is_favorite,
@@ -297,7 +297,7 @@ impl ParentChildViews {
     let indent = "  ".repeat(indent_level);
     writeln!(
       f,
-      "{}: {}, parent id: {}, layout: {:?}",
+      "{}: {}, parent id: {:?}, layout: {:?}",
       indent, self.view.name, self.view.parent_view_id, self.view.layout,
     )?;
 

collab-folder/src/view.rs

@@ -269,7 +269,7 @@ impl ViewsMap {
           None
         }
       })
-      .filter(|view| view.parent_view_id == view.id.to_string())
+      .filter(|view| view.parent_view_id == Some(view.id))
       .collect()
   }
 
@@ -339,13 +339,15 @@ impl ViewsMap {
   pub fn insert(&self, txn: &mut TransactionMut, view: View, index: Option<u32>, uid: i64) {
     let time = timestamp();
 
-    if let Some(parent_map_ref) = self
-      .container
-      .get_with_txn::<_, MapRef>(txn, &view.parent_view_id.to_string())
-    {
+    if let Some(parent_map_ref) = self.container.get_with_txn::<_, MapRef>(
+      txn,
+      &view
+        .parent_view_id
+        .map(|v| v.to_string())
+        .unwrap_or_default(),
+    ) {
       let view_identifier = ViewIdentifier { id: view.id };
-      let parent_view_uuid =
-        uuid::Uuid::parse_str(&view.parent_view_id).unwrap_or_else(|_| uuid::Uuid::nil());
+      let parent_view_uuid = view.parent_view_id.unwrap_or_else(Uuid::nil);
       let updated_view = ViewUpdate::new(
         UserId::from(uid),
         &parent_view_uuid,
@@ -380,7 +382,12 @@ impl ViewsMap {
       let last_edited_time = self.normalize_timestamp(view.last_edited_time);
       update
         .set_name(view.name)
-        .set_bid(&view.parent_view_id)
+        .set_bid(
+          view
+            .parent_view_id
+            .map(|v| v.to_string())
+            .unwrap_or_default(),
+        )
         .set_layout(view.layout)
         .set_created_at(created_at)
         .set_children(view.children)
@@ -513,6 +520,11 @@ pub(crate) fn view_from_map_ref<T: ReadTxn>(
   mappings: impl IntoIterator<Item = ViewId>,
 ) -> Option<View> {
   let parent_view_id: String = map_ref.get_with_txn(txn, VIEW_PARENT_ID)?;
+  let parent_view_id = if parent_view_id.is_empty() {
+    None
+  } else {
+    Uuid::parse_str(&parent_view_id).ok()
+  };
   let id_str: String = map_ref.get_with_txn(txn, FOLDER_VIEW_ID)?;
   let id = Uuid::parse_str(&id_str).ok()?;
   let name: String = map_ref
@@ -782,9 +794,10 @@ impl<'a, 'b, 'c> ViewUpdate<'a, 'b, 'c> {
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct View {
   /// The id of the view
-  pub id: collab_entity::uuid_validation::ViewId,
-  /// The id for given parent view  
-  pub parent_view_id: String,
+  pub id: ViewId,
+  /// The id for given parent view
+  #[serde(with = "collab::preclude::serde_option_uuid")]
+  pub parent_view_id: Option<ViewId>,
   /// The name that display on the left sidebar
   pub name: String,
   /// A list of ids, each of them is the id of other view
@@ -815,14 +828,14 @@ pub struct View {
 impl View {
   pub fn new(
     view_id: ViewId,
-    parent_view_id: String,
+    parent_view_id: ViewId,
     name: String,
     layout: ViewLayout,
     created_by: Option<i64>,
   ) -> Self {
     Self {
       id: view_id,
-      parent_view_id,
+      parent_view_id: Some(parent_view_id),
       name,
       children: Default::default(),
       created_at: timestamp(),

collab-folder/src/workspace.rs

@@ -46,7 +46,7 @@ impl From<Workspace> for View {
   fn from(value: Workspace) -> Self {
     Self {
       id: value.id,
-      parent_view_id: "".to_string(),
+      parent_view_id: None,
       name: value.name,
       children: value.child_views,
       created_at: value.created_at,

collab-folder/tests/folder_test/child_views_test.rs

@@ -1,20 +1,20 @@
+use crate::util::{create_folder_with_workspace, make_test_view, parse_view_id};
 use assert_json_diff::assert_json_include;
+use collab_entity::uuid_validation::view_id_from_any_string;
 use collab_folder::{UserId, timestamp};
 use serde_json::json;
 
-use crate::util::{create_folder_with_workspace, make_test_view, parse_view_id};
-
 #[test]
 fn create_child_views_test() {
   let uid = UserId::from(1);
-  let workspace_id = "fake_w_1".to_string();
-  let folder_test = create_folder_with_workspace(uid.clone(), &workspace_id);
-  let v_1_1 = make_test_view("1_1", "1", vec![]);
-  let v_1_2 = make_test_view("1_2", "1", vec![]);
-  let v_1_2_1 = make_test_view("1_2_1", "1_2", vec![]);
-  let v_1_2_2 = make_test_view("1_2_2", "1_2", vec![]);
-  let v_1_3 = make_test_view("1_3", "1", vec![]);
-  let v_1 = make_test_view("1", &workspace_id, vec![]);
+  let workspace_id = view_id_from_any_string("fake_w_1");
+  let folder_test = create_folder_with_workspace(uid.clone(), workspace_id);
+  let v_1_1 = make_test_view("1_1", view_id_from_any_string("1"), vec![]);
+  let v_1_2 = make_test_view("1_2", view_id_from_any_string("1"), vec![]);
+  let v_1_2_1 = make_test_view("1_2_1", view_id_from_any_string("1_2"), vec![]);
+  let v_1_2_2 = make_test_view("1_2_2", view_id_from_any_string("1_2"), vec![]);
+  let v_1_3 = make_test_view("1_3", view_id_from_any_string("1"), vec![]);
+  let v_1 = make_test_view("1", workspace_id, vec![]);
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();
@@ -57,8 +57,7 @@ fn create_child_views_test() {
     .get_views_belong_to(&txn, &v_1_2.id, uid.as_i64());
   assert_eq!(v_1_2_child_views.len(), 2);
 
-  let workspace_uuid_str =
-    uuid::Uuid::new_v5(&uuid::Uuid::NAMESPACE_OID, workspace_id.as_bytes()).to_string();
+  let workspace_uuid_str = workspace_id.to_string();
   let folder_data = folder
     .body
     .get_folder_data(&txn, &workspace_uuid_str, uid.as_i64())
@@ -187,11 +186,13 @@ fn create_child_views_test() {
 #[test]
 fn move_child_views_test() {
   let uid = UserId::from(1);
-  let folder_test = create_folder_with_workspace(uid.clone(), "w1");
-  let v_1_1 = make_test_view("1_1", "1", vec![]);
-  let v_1_2 = make_test_view("1_2", "1", vec![]);
-  let v_1_3 = make_test_view("1_3", "1", vec![]);
-  let v_1 = make_test_view("1", "w1", vec![]);
+  let workspace_id = view_id_from_any_string("w1");
+  let v_1_id = view_id_from_any_string("1");
+  let folder_test = create_folder_with_workspace(uid.clone(), workspace_id);
+  let v_1_1 = make_test_view("1_1", v_1_id, vec![]);
+  let v_1_2 = make_test_view("1_2", v_1_id, vec![]);
+  let v_1_3 = make_test_view("1_3", v_1_id, vec![]);
+  let v_1 = make_test_view("1", workspace_id, vec![]);
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();
@@ -255,11 +256,12 @@ fn move_child_views_test() {
 #[test]
 fn delete_view_test() {
   let uid = UserId::from(1);
-  let folder_test = create_folder_with_workspace(uid.clone(), "w1");
+  let workspace_id = view_id_from_any_string("w1");
+  let folder_test = create_folder_with_workspace(uid.clone(), workspace_id);
   let workspace_id = folder_test.get_workspace_id().unwrap();
-  let view_1 = make_test_view("1_1", "w1", vec![]);
-  let view_2 = make_test_view("1_2", "w1", vec![]);
-  let view_3 = make_test_view("1_3", "w1", vec![]);
+  let view_1 = make_test_view("1_1", workspace_id, vec![]);
+  let view_2 = make_test_view("1_2", workspace_id, vec![]);
+  let view_3 = make_test_view("1_3", workspace_id, vec![]);
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();
@@ -277,15 +279,11 @@ fn delete_view_test() {
     .views
     .insert(&mut txn, view_3, None, uid.as_i64());
 
-  folder
+  folder.body.views.remove_child(&mut txn, &workspace_id, 1);
+  let w_1_child_views = folder
     .body
     .views
-    .remove_child(&mut txn, &uuid::Uuid::parse_str(&workspace_id).unwrap(), 1);
-  let w_1_child_views =
-    folder
-      .body
-      .views
-      .get_views_belong_to(&txn, &parse_view_id(&workspace_id), uid.as_i64());
+    .get_views_belong_to(&txn, &workspace_id, uid.as_i64());
   assert_eq!(
     w_1_child_views[0].id.to_string(),
     uuid::Uuid::new_v5(&uuid::Uuid::NAMESPACE_OID, "1_1".as_bytes()).to_string()
@@ -299,12 +297,13 @@ fn delete_view_test() {
 #[test]
 fn delete_child_view_test() {
   let uid = UserId::from(1);
-  let folder_test = create_folder_with_workspace(uid.clone(), "w1");
-  let view_1 = make_test_view("v1", "w1", vec![]);
+  let workspace_id = view_id_from_any_string("w1");
+  let folder_test = create_folder_with_workspace(uid.clone(), workspace_id);
+  let view_1 = make_test_view("v1", workspace_id, vec![]);
   let view_1_id = view_1.id.to_string();
-  let view_1_1 = make_test_view("v1_1", "v1", vec![]);
+  let view_1_1 = make_test_view("v1_1", view_id_from_any_string("v1"), vec![]);
   let view_1_1_id = view_1_1.id;
-  let view_2 = make_test_view("v2", "w1", vec![]);
+  let view_2 = make_test_view("v2", workspace_id, vec![]);
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();
@@ -339,12 +338,12 @@ fn delete_child_view_test() {
 #[test]
 fn create_orphan_child_views_test() {
   let uid = UserId::from(1);
-  let workspace_id = "fake_w_1".to_string();
-  let folder_test = create_folder_with_workspace(uid.clone(), &workspace_id);
-  let view_1 = make_test_view("1", &workspace_id, vec![]);
+  let workspace_id = view_id_from_any_string("fake_w_1");
+  let folder_test = create_folder_with_workspace(uid.clone(), workspace_id);
+  let view_1 = make_test_view("1", workspace_id, vec![]);
 
   // The orphan view: the parent_view_id equal to the view_id
-  let view_2 = make_test_view("2", "2", vec![]);
+  let view_2 = make_test_view("2", view_id_from_any_string("2"), vec![]);
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();
@@ -358,13 +357,11 @@ fn create_orphan_child_views_test() {
     .views
     .insert(&mut txn, view_2.clone(), None, uid.as_i64());
 
-  let workspace_uuid_str =
-    uuid::Uuid::new_v5(&uuid::Uuid::NAMESPACE_OID, workspace_id.as_bytes()).to_string();
-  let child_views =
-    folder
-      .body
-      .views
-      .get_views_belong_to(&txn, &parse_view_id(&workspace_uuid_str), uid.as_i64());
+  let workspace_uuid_str = workspace_id.to_string();
+  let child_views = folder
+    .body
+    .views
+    .get_views_belong_to(&txn, &workspace_id, uid.as_i64());
   assert_eq!(child_views.len(), 1);
 
   let orphan_views = folder

collab-folder/tests/folder_test/custom_section.rs

@@ -1,16 +1,16 @@
+use crate::util::create_folder_with_workspace;
 use assert_json_diff::assert_json_include;
 use collab::preclude::Any;
+use collab_entity::uuid_validation::view_id_from_any_string;
 use collab_folder::{Section, SectionItem, UserId, timestamp};
 use serde_json::json;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use crate::util::create_folder_with_workspace;
-
 #[test]
 fn custom_section_test() {
   let uid = UserId::from(1);
-  let folder_test = create_folder_with_workspace(uid.clone(), "w1");
+  let folder_test = create_folder_with_workspace(uid.clone(), view_id_from_any_string("w1"));
 
   let mut folder = folder_test.folder;
   let mut txn = folder.collab.transact_mut();