fix: create yDoc for workspace created during createUser

client-app/src-tauri/src/commands.rs

@@ -16,6 +16,7 @@ pub fn invoke_handler() -> impl Fn(tauri::Invoke) + Send + Sync + 'static {
     get_workspaces,
     get_workspace,
     create_user,
+    create_doc,
     get_doc,
     put_blob,
     get_blob

client-app/src-tauri/src/commands/document.rs

@@ -1,9 +1,44 @@
-use ipc_types::document::{GetDocumentParameter, GetDocumentResponse, YDocumentUpdate};
+use ipc_types::document::{
+  CreateDocumentParameter, GetDocumentParameter, GetDocumentResponse, YDocumentUpdate,
+};
 use jwst::DocStorage;
+use jwst::Workspace as OctoBaseWorkspace;
+use lib0::any::Any;
 use yrs::StateVector;
 
 use crate::state::AppState;
 
+#[tauri::command]
+/// get yDoc created by create_workspace, using same id
+pub async fn create_doc<'s>(
+  state: tauri::State<'s, AppState>,
+  parameters: CreateDocumentParameter,
+) -> Result<(), String> {
+  let workspace_doc = OctoBaseWorkspace::new(parameters.workspace_id.clone());
+
+  workspace_doc.with_trx(|mut workspace_doc_transaction| {
+    workspace_doc_transaction.set_metadata(
+      "name",
+      Any::String(parameters.workspace_name.clone().into_boxed_str()),
+    );
+  });
+  if let Err(error_message) = &state
+    .0
+    .lock()
+    .await
+    .doc_storage
+    .write_doc(parameters.workspace_id.clone(), workspace_doc.doc())
+    .await
+  {
+    Err(format!(
+      "Failed to write_doc during create_workspace with error {}",
+      error_message.to_string()
+    ))
+  } else {
+    Ok(())
+  }
+}
+
 #[tauri::command]
 /// get yDoc created by create_workspace, using same id
 pub async fn get_doc<'s>(
@@ -25,10 +60,7 @@ pub async fn get_doc<'s>(
       update: doc.encode_state_as_update_v1(&StateVector::default()),
     })
   } else {
-    Err(format!(
-      "Failed to get yDoc from {}",
-      parameters.id
-    ))
+    Err(format!("Failed to get yDoc from {}", parameters.id))
   }
 }
 
@@ -48,9 +80,6 @@ pub async fn update_y_document<'s>(
   {
     Ok(true)
   } else {
-    Err(format!(
-      "Failed to update yDoc to {}",
-      parameters.id
-    ))
+    Err(format!("Failed to update yDoc to {}", parameters.id))
   }
 }

client-app/src-tauri/src/commands/user.rs

@@ -1,23 +1,38 @@
+use ipc_types::document::CreateDocumentParameter;
 use jwst_storage::{CreateUser, User};
 
 use crate::state::AppState;
 
+use super::document::create_doc;
+
 #[tauri::command]
-/// create yDoc for a workspace
+/// create new user and a private workspace
 pub async fn create_user<'s>(
   state: tauri::State<'s, AppState>,
   parameters: CreateUser,
 ) -> Result<User, String> {
-  match &state
+  let new_user_result = &state
     .0
     .lock()
     .await
     .metadata_db
     .create_user(parameters.clone())
-    .await
-  {
+    .await;
+  match new_user_result{
     Ok(new_user_option) => match new_user_option {
-      Some(new_user) => Ok(new_user.clone()),
+      Some((new_user, new_workspace)) => {
+        // a new private workspace is created, we have to create a yDoc for it
+        create_doc(
+          state,
+          CreateDocumentParameter {
+            workspace_id: new_workspace.id.clone(),
+            workspace_name: parameters.name.clone(),
+          },
+        )
+        .await
+        .ok();
+        Ok(new_user.clone())
+      }
       None => Err("User creation failed".to_string()),
     },
     Err(error_message) => Err(error_message.to_string()),

client-app/src-tauri/src/commands/workspace.rs

@@ -1,12 +1,15 @@
-use ipc_types::workspace::{
-  CreateWorkspace, CreateWorkspaceResult, GetWorkspace, GetWorkspaceResult, GetWorkspaces,
-  GetWorkspacesResult, UpdateWorkspace,
+use ipc_types::{
+  document::CreateDocumentParameter,
+  workspace::{
+    CreateWorkspace, CreateWorkspaceResult, GetWorkspace, GetWorkspaceResult, GetWorkspaces,
+    GetWorkspacesResult, UpdateWorkspace,
+  },
 };
-use jwst::{DocStorage, Workspace as OctoBaseWorkspace};
-use lib0::any::Any;
 
 use crate::state::AppState;
 
+use super::document::create_doc;
+
 #[tauri::command]
 /// create yDoc for a workspace
 pub async fn get_workspaces<'s>(
@@ -46,7 +49,7 @@ pub async fn get_workspace<'s>(
       Some(user_workspace) => Ok(GetWorkspaceResult {
         workspace: user_workspace.clone(),
       }),
-      None => Err("Get workspace has no result".to_string())
+      None => Err("Get workspace has no result".to_string()),
     },
     Err(error_message) => Err(error_message.to_string()),
   }
@@ -58,40 +61,33 @@ pub async fn create_workspace<'s>(
   state: tauri::State<'s, AppState>,
   parameters: CreateWorkspace,
 ) -> Result<CreateWorkspaceResult, String> {
-  match &state
+  let new_workspace_result = &state
     .0
     .lock()
     .await
     .metadata_db
     .create_normal_workspace(parameters.user_id)
-    .await
-  {
+    .await;
+  match new_workspace_result {
     Ok(new_workspace) => {
-      let workspace_doc = OctoBaseWorkspace::new(new_workspace.id.clone());
-
-      workspace_doc.with_trx(|mut workspace_doc_transaction| {
-        workspace_doc_transaction.set_metadata(
-          "name",
-          Any::String(parameters.name.clone().into_boxed_str()),
-        );
-      });
-      if let Err(error_message) = &state
-        .0
-        .lock()
-        .await
-        .doc_storage
-        .write_doc(new_workspace.id.clone(), workspace_doc.doc())
-        .await
-      {
-        Err(error_message.to_string())
-      } else {
-        Ok(CreateWorkspaceResult {
-          id: new_workspace.id.clone(),
-          name: parameters.name,
-        })
-      }
+      create_doc(
+        state,
+        CreateDocumentParameter {
+          workspace_id: new_workspace.id.clone(),
+          workspace_name: parameters.name.clone(),
+        },
+      )
+      .await
+      .ok();
+      Ok(CreateWorkspaceResult {
+        id: new_workspace.id.clone(),
+        name: parameters.name,
+      })
     }
-    Err(error_message) => Err(error_message.to_string()),
+    Err(error_message) => Err(format!(
+      "Failed to create_workspace with error {}",
+      error_message.to_string()
+    )),
   }
 }