Re-order query for clarity

microsoft · Oct 29, 2024 · 6d4f3ae · 6d4f3ae
1 parent 32c362c
commit 6d4f3ae
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/workbench-service/semantic_workbench_service/query.py b/workbench-service/semantic_workbench_service/query.py
@@ -121,15 +121,6 @@ def select_conversation_projections_for(
     include_all_owned: bool = False,
     include_observer: bool = False,
 ) -> Select[tuple[db.Conversation, db.ConversationMessage | None, str]]:
-    latest_message_subquery = (
-        select(
-            db.ConversationMessage.conversation_id,
-            func.max(db.ConversationMessage.sequence).label("latest_message_sequence"),
-        )
-        .group_by(col(db.ConversationMessage.conversation_id))
-        .subquery()
-    )
-
     match principal:
         case auth.UserPrincipal():
             select_query = select(
@@ -152,6 +143,15 @@ def select_conversation_projections_for(
         select_query=select_query,
     )
 
+    latest_message_subquery = (
+        select(
+            db.ConversationMessage.conversation_id,
+            func.max(db.ConversationMessage.sequence).label("latest_message_sequence"),
+        )
+        .group_by(col(db.ConversationMessage.conversation_id))
+        .subquery()
+    )
+
     return query.join_from(
         db.Conversation,
         latest_message_subquery,