From 6d09fbb236314d441b7e0cbe3485d909bdebbd49 Mon Sep 17 00:00:00 2001
From: khorshuheng <solemnpriest@gmail.com>
Date: Wed, 8 Jan 2025 21:24:56 +0800
Subject: [PATCH] fix: select most recent non original workspace

---
 ...d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json} | 4 ++--
 libs/database/src/publish.rs                              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename .sqlx/{query-f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8.json => query-2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json} (76%)

diff --git a/.sqlx/query-f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8.json b/.sqlx/query-2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json
similarity index 76%
rename from .sqlx/query-f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8.json
rename to .sqlx/query-2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json
index f52a96691..8ec4e4e96 100644
--- a/.sqlx/query-f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8.json
+++ b/.sqlx/query-2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n      SELECT namespace\n      FROM af_workspace_namespace\n      WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)\n        AND is_original = FALSE\n      ORDER BY created_at ASC\n      LIMIT 1\n    ",
+  "query": "\n      SELECT namespace\n      FROM af_workspace_namespace\n      WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)\n        AND is_original = FALSE\n      ORDER BY created_at DESC\n      LIMIT 1\n    ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8"
+  "hash": "2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8"
 }
diff --git a/libs/database/src/publish.rs b/libs/database/src/publish.rs
index 4843f9a3d..e9f23a742 100644
--- 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);