Merge pull request #959 from AppFlowy-IO/fix/custom-namespace-taken

fix: namespace already taken

libs/database/src/publish.rs

@@ -35,19 +35,16 @@ pub async fn select_user_is_collab_publisher_for_all_views(
 #[inline]
 pub async fn select_workspace_publish_namespace_exists<'a, E: Executor<'a, Database = Postgres>>(
   executor: E,
-  workspace_id: &Uuid,
   namespace: &str,
 ) -> Result<bool, AppError> {
   let res = sqlx::query_scalar!(
     r#"
       SELECT EXISTS(
         SELECT 1
         FROM af_workspace
-        WHERE workspace_id = $1
-          AND publish_namespace = $2
+        WHERE publish_namespace = $1
       )
     "#,
-    workspace_id,
     namespace,
   )
   .fetch_one(executor)

src/biz/workspace/publish.rs

@@ -91,7 +91,7 @@ pub async fn set_workspace_namespace(
   new_namespace: &str,
 ) -> Result<(), AppError> {
   check_workspace_namespace(new_namespace).await?;
-  if select_workspace_publish_namespace_exists(pg_pool, workspace_id, new_namespace).await? {
+  if select_workspace_publish_namespace_exists(pg_pool, new_namespace).await? {
     return Err(AppError::PublishNamespaceAlreadyTaken(
       "publish namespace is already taken".to_string(),
     ));

tests/workspace/publish.rs

@@ -44,6 +44,22 @@ async fn test_set_publish_namespace_set() {
     .await
     .unwrap();
 
+  {
+    // another workspace cannot have the same namespace
+    let (c2, _user) = generate_unique_registered_user_client().await;
+    let workspace_id_2 = get_first_workspace_string(&c2).await;
+    let err = c2
+      .set_workspace_publish_namespace(&workspace_id_2.to_string(), &namespace)
+      .await
+      .unwrap_err();
+    assert_eq!(
+      err.code,
+      ErrorCode::PublishNamespaceAlreadyTaken,
+      "{:?}",
+      err
+    );
+  }
+
   {
     // cannot set the same namespace
     let err = c