refactor: Consolidate query logic with parameter approach

Author: haydnli-shopify

src/dstack/_internal/server/services/projects.py

@@ -81,7 +81,9 @@ async def list_user_accessible_projects(
     if user.global_role == GlobalRole.ADMIN:
         projects = await list_project_models(session=session)
     else:
-        projects = await _list_user_accessible_project_models(session=session, user=user)
+        projects = await list_user_project_models(
+            session=session, user=user, include_public_non_member=True
+        )
 
     projects = sorted(projects, key=lambda p: p.created_at)
     return [
@@ -90,37 +92,6 @@ async def list_user_accessible_projects(
     ]
 
 
-async def _list_user_accessible_project_models(
-    session: AsyncSession,
-    user: UserModel,
-) -> List[ProjectModel]:
-    """
-    Get projects that a user can access:
-    1. Projects where user is a member (regardless of public/private)
-    2. Public projects where user is not a member
-    """
-    res = await session.execute(
-        select(ProjectModel)
-        .where(
-            ProjectModel.deleted == False,
-            # Either user is a member, OR project is public and user is not a member
-            (
-                # User is a member (regardless of public/private)
-                ProjectModel.id.in_(
-                    select(MemberModel.project_id).where(MemberModel.user_id == user.id)
-                )
-            ) | (
-                # OR project is public and user is not a member
-                (ProjectModel.is_public == True) & 
-                ProjectModel.id.notin_(
-                    select(MemberModel.project_id).where(MemberModel.user_id == user.id)
-                )
-            )
-        )
-    )
-    return list(res.scalars().all())
-
-
 async def list_projects(session: AsyncSession) -> List[Project]:
     projects = await list_project_models(session=session)
     return [
@@ -291,19 +262,58 @@ async def list_user_project_models(
     session: AsyncSession,
     user: UserModel,
     include_members: bool = False,
+    include_public_non_member: bool = False,
 ) -> List[ProjectModel]:
+    """
+    Get projects for a user.
+    
+    Args:
+        session: Database session
+        user: User model
+        include_members: Whether to join and load project members
+        include_public_non_member: Whether to include public projects where user is not a member
+    
+    Returns:
+        List of ProjectModel instances
+    """
     options = []
     if include_members:
         options.append(joinedload(ProjectModel.members))
-    res = await session.execute(
-        select(ProjectModel)
-        .where(
-            MemberModel.project_id == ProjectModel.id,
-            MemberModel.user_id == user.id,
-            ProjectModel.deleted == False,
+    
+    if include_public_non_member:
+        # Get both member projects AND public non-member projects
+        res = await session.execute(
+            select(ProjectModel)
+            .where(
+                ProjectModel.deleted == False,
+                # Either user is a member, OR project is public and user is not a member
+                (
+                    # User is a member (regardless of public/private)
+                    ProjectModel.id.in_(
+                        select(MemberModel.project_id).where(MemberModel.user_id == user.id)
+                    )
+                ) | (
+                    # OR project is public and user is not a member
+                    (ProjectModel.is_public == True) & 
+                    ProjectModel.id.notin_(
+                        select(MemberModel.project_id).where(MemberModel.user_id == user.id)
+                    )
+                )
+            )
+            .options(*options)
         )
-        .options(*options)
-    )
+    else:
+        # Original logic - only member projects
+        res = await session.execute(
+            select(ProjectModel)
+            .where(
+                MemberModel.project_id == ProjectModel.id,
+                MemberModel.user_id == user.id,
+                ProjectModel.deleted == False,
+            )
+            .options(*options)
+        )
+    
     return list(res.scalars().unique().all())