#4469 prisma query optimization

src/backend/src/controllers/projects.controllers.ts

@@ -3,7 +3,7 @@ import {
   MaterialType,
   Project,
   ProjectOverview,
-  ProjectGantt,
+  GanttChartProject,
   ProjectPreview,
   validateWBS,
   WbsNumber,
@@ -16,7 +16,10 @@ import BillOfMaterialsService from '../services/boms.services.js';
 export default class ProjectsController {
   static async getAllProjectsGantt(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectGantt[] = await ProjectsService.getAllProjectsGantt(req.organization, req.currentCar?.carId);
+      const projects: GanttChartProject[] = await ProjectsService.getAllProjectsGantt(
+        req.organization,
+        req.currentCar?.carId
+      );
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);

src/backend/src/prisma-query-args/event.query-args.ts

@@ -5,6 +5,21 @@ export type EventQueryArgs = ReturnType<typeof getEventQueryArgs>;
 
 export type EventWithMembersQueryArgs = ReturnType<typeof getEventWithMembersQueryArgs>;
 
+export type EventPreviewQueryArgs = ReturnType<typeof getEventPreviewQueryArgs>;
+
+// only the fields eventPreviewTransformer reads
+export const getEventPreviewQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.EventDefaultArgs>()({
+    select: {
+      eventId: true,
+      title: true,
+      status: true,
+      initialDateScheduled: true,
+      scheduledTimes: { select: { startTime: true }, orderBy: { startTime: 'asc' }, take: 1 }, // preview shows one date, so fetch earliest slot
+      userCreated: getUserQueryArgs(organizationId)
+    }
+  });
+
 export const getEventQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.EventDefaultArgs>()({
     include: {

src/backend/src/prisma-query-args/gantt-chart.query-args.ts

@@ -0,0 +1,93 @@
+import { Prisma } from '@prisma/client';
+import { getUserPreviewQueryArgs } from './user.query-args.js';
+
+// Base gantt chart query: only what the gantt chart reads (see the GanttChart* types in shared).
+// Other gantt views (e.g. retrospective) can extend these instead of starting from the full project query.
+
+export type GanttChartTaskQueryArgs = ReturnType<typeof getGanttChartTaskQueryArgs>;
+export type GanttChartEventQueryArgs = ReturnType<typeof getGanttChartEventQueryArgs>;
+export type GanttChartWorkPackageQueryArgs = ReturnType<typeof getGanttChartWorkPackageQueryArgs>;
+export type GanttChartProjectQueryArgs = ReturnType<typeof getGanttChartProjectQueryArgs>;
+
+const wbsNumberSelect = { carNumber: true, projectNumber: true, workPackageNumber: true } as const;
+
+// a task bar and its tooltip; saving an edited task reads its other fields from the full project
+export const getGanttChartTaskQueryArgs = () =>
+  Prisma.validator<Prisma.TaskDefaultArgs>()({
+    select: {
+      taskId: true,
+      title: true,
+      status: true,
+      startDate: true,
+      deadline: true,
+      wbsElement: { select: wbsNumberSelect },
+      createdBy: getUserPreviewQueryArgs(),
+      assignees: getUserPreviewQueryArgs()
+    }
+  });
+
+export const getGanttChartEventQueryArgs = () =>
+  Prisma.validator<Prisma.EventDefaultArgs>()({
+    select: {
+      eventId: true,
+      status: true,
+      initialDateScheduled: true,
+      // the event marker shows one date, so just fetch the earliest slot
+      scheduledTimes: { select: { startTime: true }, orderBy: { startTime: 'asc' }, take: 1 }
+    }
+  });
+
+export const getGanttChartWorkPackageQueryArgs = () =>
+  Prisma.validator<Prisma.Work_PackageDefaultArgs>()({
+    select: {
+      workPackageId: true,
+      wbsElementId: true,
+      projectId: true,
+      startDate: true,
+      duration: true,
+      stage: true,
+      wbsElement: {
+        select: {
+          ...wbsNumberSelect,
+          name: true,
+          status: true,
+          dateCreated: true,
+          dateDeleted: true,
+          lead: getUserPreviewQueryArgs(),
+          manager: getUserPreviewQueryArgs(),
+          blocking: { where: { wbsElement: { dateDeleted: null } }, select: { wbsElement: { select: wbsNumberSelect } } }
+        }
+      },
+      events: { where: { dateDeleted: null }, ...getGanttChartEventQueryArgs() }
+    }
+  });
+
+export const getGanttChartProjectQueryArgs = () =>
+  Prisma.validator<Prisma.ProjectDefaultArgs>()({
+    select: {
+      projectId: true,
+      wbsElementId: true,
+      wbsElement: {
+        select: {
+          ...wbsNumberSelect,
+          name: true,
+          dateCreated: true,
+          dateDeleted: true,
+          lead: getUserPreviewQueryArgs(),
+          manager: getUserPreviewQueryArgs(),
+          tasks: {
+            where: { dateDeleted: null },
+            orderBy: [{ dateCreated: 'asc' }, { taskId: 'asc' }],
+            ...getGanttChartTaskQueryArgs()
+          }
+        }
+      },
+      teams: { select: { teamId: true } },
+      workPackages: {
+        where: { wbsElement: { dateDeleted: null } },
+        // orderInProject can repeat after a work package is deleted, so tie-break on the (unique per project) wp number
+        orderBy: [{ orderInProject: 'asc' }, { wbsElement: { workPackageNumber: 'asc' } }],
+        ...getGanttChartWorkPackageQueryArgs()
+      }
+    }
+  });

src/backend/src/prisma-query-args/projects.query-args.ts

@@ -2,9 +2,13 @@ import { Prisma, Task_Status } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args.js';
 import { getDescriptionBulletQueryArgs } from './description-bullets.query-args.js';
 import { getTeamPreviewQueryArgs } from './teams.query-args.js';
-import { getTaskQueryArgs } from './tasks.query-args.js';
+import { getTaskGanttQueryArgs, getTaskQueryArgs } from './tasks.query-args.js';
 import { getLinkQueryArgs } from './links.query-args.js';
-import { getWorkPackageQueryArgs, getWorkPackagePreviewQueryArgs } from './work-packages.query-args.js';
+import {
+  getWorkPackageQueryArgs,
+  getWorkPackageGanttQueryArgs,
+  getWorkPackagePreviewQueryArgs
+} from './work-packages.query-args.js';
 
 export type ProjectQueryArgs = ReturnType<typeof getProjectQueryArgs>;
 
@@ -46,7 +50,12 @@ export const getProjectQueryArgs = (organizationId: string) =>
 
 export const getProjectGanttQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.ProjectDefaultArgs>()({
-    include: {
+    // select rather than include so unused project columns (summary, carId, ...) aren't fetched
+    select: {
+      projectId: true,
+      wbsElementId: true,
+      budget: true,
+      abbreviation: true,
       wbsElement: {
         include: {
           lead: getUserQueryArgs(organizationId),
@@ -55,7 +64,8 @@ export const getProjectGanttQueryArgs = (organizationId: string) =>
             where: {
               dateDeleted: null
             },
-            ...getTaskQueryArgs()
+            orderBy: [{ dateCreated: 'asc' }, { taskId: 'asc' }],
+            ...getTaskGanttQueryArgs()
           }
         }
       },
@@ -71,9 +81,10 @@ export const getProjectGanttQueryArgs = (organizationId: string) =>
             dateDeleted: null
           }
         },
-        ...getWorkPackageQueryArgs(organizationId)
-      },
-      favoritedBy: getUserQueryArgs(organizationId)
+        // orderInProject can repeat after a work package is deleted, so tie-break on the (unique per project) wp number
+        orderBy: [{ orderInProject: 'asc' }, { wbsElement: { workPackageNumber: 'asc' } }],
+        ...getWorkPackageGanttQueryArgs(organizationId)
+      }
     }
   });
 

src/backend/src/prisma-query-args/tasks.query-args.ts

@@ -2,6 +2,7 @@ import { Prisma } from '@prisma/client';
 import { getUserPreviewWithEmailQueryArgs, getUserQueryArgs } from './user.query-args.js';
 
 export type TaskQueryArgs = ReturnType<typeof getTaskQueryArgs>;
+export type TaskGanttQueryArgs = ReturnType<typeof getTaskGanttQueryArgs>;
 export type TaskPreviewQueryArgs = ReturnType<typeof getTaskPreviewQueryArgs>;
 export type CalendarTaskQueryArgs = ReturnType<typeof getCalendarTaskQueryArgs>;
 export type TaskLabelQueryArgs = ReturnType<typeof getTaskLabelQueryArgs>;
@@ -60,6 +61,26 @@ export const getTaskQueryArgs = () =>
     }
   });
 
+// same output as getTaskQueryArgs through taskTransformer for the gantt's tasks, which are non-deleted (so deletedBy is
+// skipped) and project-level (a project's wbs element has no work package, so its blocking work packages are skipped)
+export const getTaskGanttQueryArgs = () =>
+  Prisma.validator<Prisma.TaskDefaultArgs>()({
+    include: {
+      createdBy: getUserPreviewWithEmailQueryArgs(),
+      assignees: getUserPreviewWithEmailQueryArgs(),
+      labels: getTaskLabelQueryArgs(),
+      blockedBy: getTaskBlockedByQueryArgs(),
+      wbsElement: {
+        select: {
+          carNumber: true,
+          projectNumber: true,
+          workPackageNumber: true,
+          name: true
+        }
+      }
+    }
+  });
+
 export const getCalendarTaskQueryArgs = () =>
   Prisma.validator<Prisma.TaskDefaultArgs>()({
     include: {

src/backend/src/prisma-query-args/user.query-args.ts

@@ -2,6 +2,8 @@ import { Prisma } from '@prisma/client';
 
 export type UserQueryArgs = ReturnType<typeof getUserQueryArgs>;
 
+export type UserPreviewQueryArgs = ReturnType<typeof getUserPreviewQueryArgs>;
+
 export type UserPreviewWithEmailQueryArgs = ReturnType<typeof getUserPreviewWithEmailQueryArgs>;
 
 export type UserWithSettingsQueryArgs = ReturnType<typeof getUserWithSettingsQueryArgs>;

src/backend/src/prisma-query-args/work-packages.query-args.ts

@@ -2,9 +2,10 @@ import { Prisma } from '@prisma/client';
 import { getUserPreviewQueryArgs, getUserQueryArgs } from './user.query-args.js';
 import { getDescriptionBulletQueryArgs } from './description-bullets.query-args.js';
 import { getLinkQueryArgs } from './links.query-args.js';
-import { getEventQueryArgs } from './event.query-args.js';
+import { getEventPreviewQueryArgs, getEventQueryArgs } from './event.query-args.js';
 
 export type WorkPackageQueryArgs = ReturnType<typeof getWorkPackageQueryArgs>;
+export type WorkPackageGanttQueryArgs = ReturnType<typeof getWorkPackageGanttQueryArgs>;
 export type WorkPackagePreviewQueryArgs = ReturnType<typeof getWorkPackagePreviewQueryArgs>;
 
 export const getWorkPackageQueryArgs = (organizationId: string) =>
@@ -38,6 +39,43 @@ export const getWorkPackageQueryArgs = (organizationId: string) =>
     }
   });
 
+// same output as getWorkPackageQueryArgs through workPackageTransformer, but only fetches what the gantt reads
+export const getWorkPackageGanttQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Work_PackageDefaultArgs>()({
+    include: {
+      project: {
+        select: {
+          wbsElement: { select: { name: true } },
+          teams: { select: { teamType: true } }
+        }
+      },
+      wbsElement: {
+        include: {
+          lead: getUserQueryArgs(organizationId),
+          manager: getUserQueryArgs(organizationId),
+          changes: {
+            where: { changeRequest: { dateDeleted: null } },
+            include: { implementer: getUserQueryArgs(organizationId), changeRequest: { select: { identifier: true } } },
+            orderBy: { dateImplemented: 'asc' }
+          },
+          blocking: {
+            where: { wbsElement: { dateDeleted: null } },
+            select: { wbsElement: { select: { carNumber: true, projectNumber: true, workPackageNumber: true } } }
+          },
+          descriptionBullets: {
+            where: { dateDeleted: null },
+            select: { ...getDescriptionBulletQueryArgs(organizationId).select, userChecked: getUserPreviewQueryArgs() }
+          }
+        }
+      },
+      blockedBy: {
+        where: { dateDeleted: null },
+        select: { carNumber: true, projectNumber: true, workPackageNumber: true }
+      },
+      events: { where: { dateDeleted: null }, ...getEventPreviewQueryArgs(organizationId) }
+    }
+  });
+
 export const getWorkPackagePreviewQueryArgs = () =>
   Prisma.validator<Prisma.Work_PackageDefaultArgs>()({
     select: {

src/backend/src/prisma/factories/event.factory.ts

@@ -3,6 +3,7 @@ import { Conflict_Status, Event_Status, Prisma } from '@prisma/client';
 import { arrayOrNull } from '../utils/arrays.js';
 import { DAY_MS, MINUTE_MS } from '../dates.js';
 import { addDaysToDate } from 'shared';
+import { seedConfig } from '../seed-config.js';
 
 type ConflictResult = {
   approved: Conflict_Status;
@@ -56,6 +57,9 @@ const CONFIRMED_WINDOW = 14;
 
 export const generateEventCount = (faker: Faker): number => faker.number.int({ min: 1, max: EVENTS_PER_PROJECT });
 
+export const generateEventWorkPackageLinkCount = (faker: Faker): number =>
+  faker.helpers.weightedArrayElement(seedConfig.event.workPackageLinkWeights);
+
 export const generateScheduleSlotCount = (faker: Faker, title: string): number => {
   const isRecurring =
     title.includes('Weekly') || title.includes('Meeting') || title.includes('Office Hours') || title.includes('Bay Time');
@@ -210,7 +214,8 @@ export const eventCreateInput = (
   confirmedMemberIds: string[],
   deniedMemberIds: string[],
   dateCreated: Date,
-  approvalRequiredFromUserId?: string
+  approvalRequiredFromUserId?: string,
+  workPackageIds: string[] = []
 ): Prisma.EventCreateInput => ({
   title,
   status,
@@ -237,6 +242,9 @@ export const eventCreateInput = (
   ...(eventType.questionDocument && questionDocumentLink ? { questionDocumentLink } : {}),
   ...(approved !== Conflict_Status.NO_CONFLICT && approvalRequiredFromUserId
     ? { approvalRequiredBy: { connect: { userId: approvalRequiredFromUserId } } }
+    : {}),
+  ...(workPackageIds.length > 0
+    ? { workPackages: { connect: workPackageIds.map((workPackageId) => ({ workPackageId })) } }
     : {})
 });
 

src/backend/src/prisma/migrations/20261005023559_schedule_slot_event_id_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "Schedule_Slot_eventId_idx" ON "Schedule_Slot"("eventId");

src/backend/src/prisma/schema.prisma

@@ -1178,6 +1178,7 @@ model Schedule_Slot {
 
   @@index([endTime])
   @@index([startTime])
+  @@index([eventId])
 }
 
 enum Conflict_Status {

src/backend/src/prisma/seed-config.json

@@ -47,6 +47,13 @@
       { "weight": 5, "value": 8 }
     ]
   },
+  "event": {
+    "workPackageLinkWeights": [
+      { "weight": 40, "value": 0 },
+      { "weight": 45, "value": 1 },
+      { "weight": 15, "value": 2 }
+    ]
+  },
   "changeRequest": {
     "projectCountWeights": [
       { "weight": 15, "value": 0 },

src/backend/src/prisma/seed-config.ts

@@ -64,6 +64,10 @@ export interface SeedConfig {
   task: {
     countForProject: WeightedCount[];
   };
+  event: {
+    // how many of its project's work packages each event is linked to (capped at how many the project has)
+    workPackageLinkWeights: WeightedValue<number>[];
+  };
 }
 
 export const seedConfig: SeedConfig = JSON.parse(