Fix: getCollaborators inflated query (#6003)

concrete-utopia · Jun 19, 2024 · 9359aef · 9359aef
1 parent 66d3479
commit 9359aef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/utopia-remix/app/models/project.server.ts b/utopia-remix/app/models/project.server.ts
@@ -16,6 +16,7 @@ import {
 } from '../types'
 import { ensure } from '../util/api.server'
 import { Status } from '../util/statusCodes'
+import { selectUserDetailsForProjectCollaborator } from './projectCollaborators.server'
 
 const selectProjectWithoutContent: Record<keyof ProjectWithoutContentFromDB, true> = {
   id: true,
@@ -206,7 +207,9 @@ export async function listSharedWithMeProjectsAndCollaborators(params: {
       Project: {
         select: {
           ...selectProjectWithoutContent,
-          ProjectCollaborator: { select: { User: true } },
+          ProjectCollaborator: {
+            select: { User: { select: selectUserDetailsForProjectCollaborator } },
+          },
         },
       },
     },

diff --git a/utopia-remix/app/models/projectCollaborators.server.ts b/utopia-remix/app/models/projectCollaborators.server.ts
@@ -1,24 +1,37 @@
-import type { ProjectCollaborator, UserDetails } from 'prisma-client'
+import type { UserDetails } from 'prisma-client'
 import type { UtopiaPrismaClient } from '../db.server'
 import { prisma } from '../db.server'
-import type { CollaboratorsByProject } from '../types'
-import { userToCollaborator } from '../types'
+import { userToCollaborator, type CollaboratorsByProject } from '../types'
 import type { GetBatchResult } from 'prisma-client/runtime/library.js'
 
+export const selectUserDetailsForProjectCollaborator: Partial<Record<keyof UserDetails, boolean>> =
+  {
+    user_id: true,
+    name: true,
+    picture: true,
+  }
+
 export async function getCollaborators(params: {
   ids: string[]
   userId: string
 }): Promise<CollaboratorsByProject> {
   const projects = await prisma.project.findMany({
     where: { proj_id: { in: params.ids }, owner_id: params.userId },
-    include: { ProjectCollaborator: { include: { User: true } } },
+    select: {
+      proj_id: true,
+      ProjectCollaborator: {
+        select: { User: { select: selectUserDetailsForProjectCollaborator } },
+      },
+    },
   })
 
   let collaboratorsByProject: CollaboratorsByProject = {}
   for (const project of projects) {
     const collaboratorUserDetails = project.ProjectCollaborator.map(({ User }) => User)
     collaboratorsByProject[project.proj_id] = collaboratorUserDetails.map(userToCollaborator)
   }
+
+  // TODO this could return a much slimmer payload by having two objects: 1) projectId -> userId[], 2) userId -> userDetails
   return collaboratorsByProject
 }
 

diff --git a/utopia-remix/app/types.ts b/utopia-remix/app/types.ts
@@ -53,7 +53,9 @@ export interface Collaborator {
 
 export type CollaboratorsByProject = { [projectId: string]: Collaborator[] }
 
-export function userToCollaborator(user: UserDetails): Collaborator {
+export function userToCollaborator(
+  user: Pick<UserDetails, 'user_id' | 'name' | 'picture'>,
+): Collaborator {
   return {
     id: user.user_id,
     name: user.name,