Merge pull request #1141 from AppFlowy-IO/select-most-recent-non-orig…

…inal-workspace fix: select most recent non original namespace
AppFlowy-IO · Jan 9, 2025 · bb08655 · bb08655
2 parents f380c34 + 6d09fbb
commit bb08655
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...4847dcfa914ceae602c6554ed93162783ee8.json → ...33e8c144d35b3d4c5293f98344b2c62fe6c8.json b/...4847dcfa914ceae602c6554ed93162783ee8.json → ...33e8c144d35b3d4c5293f98344b2c62fe6c8.json
diff --git a/libs/database/src/publish.rs b/libs/database/src/publish.rs
@@ -525,7 +525,7 @@ pub async fn select_default_published_view_id<'a, E: Executor<'a, Database = Pos
   Ok(res)
 }
 
-async fn select_first_non_original_namespace(
+async fn select_most_recent_non_original_namespace(
   pg_pool: &PgPool,
   namespace: &str,
 ) -> Result<Option<String>, AppError> {
@@ -535,7 +535,7 @@ async fn select_first_non_original_namespace(
       FROM af_workspace_namespace
       WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)
         AND is_original = FALSE
-      ORDER BY created_at ASC
+      ORDER BY created_at DESC
       LIMIT 1
     "#,
     namespace,
@@ -575,7 +575,7 @@ pub async fn select_publish_info_for_view_ids(
     return Ok(res);
   }
   if let Some(non_original_namespace) =
-    select_first_non_original_namespace(pg_pool, &res[0].namespace).await?
+    select_most_recent_non_original_namespace(pg_pool, &res[0].namespace).await?
   {
     res.iter_mut().for_each(|info| {
       info.namespace.clone_from(&non_original_namespace);
@@ -633,7 +633,7 @@ async fn use_non_orginal_namespace_if_possible(
   }
 
   if let Some(non_original_namespace) =
-    select_first_non_original_namespace(pg_pool, &publish_infos[0].namespace).await?
+    select_most_recent_non_original_namespace(pg_pool, &publish_infos[0].namespace).await?
   {
     publish_infos.iter_mut().for_each(|info| {
       info.namespace.clone_from(&non_original_namespace);