Merge pull request #783 from AppFlowy-IO/user-profile-improvement

feat: use common table expression to improve user profile sql
AppFlowy-IO · Sep 3, 2024 · 5fe1a87 · 5fe1a87
2 parents b7c9336 + 236d972
commit 5fe1a87
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/...f541fa2e63a629cad4f8e9692a50a4e5e03c.json → ...7719c28dc5acac088686e86980544fe4bbc9.json b/...f541fa2e63a629cad4f8e9692a50a4e5e03c.json → ...7719c28dc5acac088686e86980544fe4bbc9.json
diff --git a/libs/database/src/workspace.rs b/libs/database/src/workspace.rs
@@ -584,8 +584,26 @@ pub async fn select_user_profile<'a, E: Executor<'a, Database = Postgres>>(
   let user_profile = sqlx::query_as!(
     AFUserProfileRow,
     r#"
-      SELECT *
-      FROM public.af_user_profile_view WHERE uuid = $1
+      WITH af_user_row AS (
+        SELECT * FROM af_user WHERE uuid = $1
+      )
+      SELECT
+        af_user_row.uid,
+        af_user_row.uuid,
+        af_user_row.email,
+        af_user_row.password,
+        af_user_row.name,
+        af_user_row.metadata,
+        af_user_row.encryption_sign,
+        af_user_row.deleted_at,
+        af_user_row.updated_at,
+        af_user_row.created_at,
+        (SELECT workspace_id
+         FROM af_workspace_member
+         WHERE uid = af_user_row.uid
+         ORDER BY updated_at DESC
+         LIMIT 1) as latest_workspace_id
+      FROM af_user_row
     "#,
     user_uuid
   )