Merge pull request #4042 from Northeastern-Electric-Racing/#3959-task-amount-fix

#3959 fix task amount

Author: chpy04

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

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client';
+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';
@@ -129,7 +129,13 @@ export const getProjectOverviewQueryArgs = (organizationId: string) =>
           manager: getUserQueryArgs(organizationId),
           status: true,
           links: getLinkQueryArgs(),
-          tasks: getTaskQueryArgs(organizationId)
+          _count: {
+            select: {
+              tasks: {
+                where: { AND: [{ dateDeleted: null }, { NOT: { status: Task_Status.DONE } }] }
+              }
+            }
+          }
         }
       },
       workPackages: getWorkPackagePreviewQueryArgs(),

src/backend/src/transformers/projects.transformer.ts

@@ -154,7 +154,7 @@ export const projectPreviewTransformer = (project: Prisma.ProjectGetPayload<Proj
 export const projectOverviewTransformer = (project: Prisma.ProjectGetPayload<ProjectOverviewQueryArgs>): ProjectOverview => {
   return {
     ...projectPreviewTransformer(project),
-    tasks: project.wbsElement.tasks.map(taskTransformer),
+    tasksRemaining: project.wbsElement._count.tasks,
     links: project.wbsElement.links
   };
 };

src/frontend/src/apis/transformers/projects.transformers.ts

@@ -99,8 +99,7 @@ export const projectOverviewTransformer = (project: ProjectOverview): ProjectOve
       startDate: new Date(wp.startDate),
       endDate: new Date(wp.endDate)
     })),
-    links: project.links,
-    tasks: project.tasks.map(taskTransformer)
+    links: project.links
   };
 };
 

src/frontend/src/components/ProjectDetailCard.tsx

@@ -8,7 +8,7 @@ import AttachMoneyIcon from '@mui/icons-material/AttachMoney';
 import ScheduleIcon from '@mui/icons-material/Schedule';
 import { Box, Card, CardContent, Link, Typography, Grid } from '@mui/material';
 import { Link as RouterLink } from 'react-router-dom';
-import { calculateDaysLeftInProject, daysBetween, ProjectOverview, TaskStatus, WbsElementStatus, wbsPipe } from 'shared';
+import { calculateDaysLeftInProject, daysBetween, ProjectOverview, WbsElementStatus, wbsPipe } from 'shared';
 import { daysOrWeeksLeftOrLate, emDashPipe, fullNamePipe } from '../utils/pipes';
 import WorkPackageStageChip from './WorkPackageStageChip';
 import FavoriteProjectButton from './FavoriteProjectButton';
@@ -23,7 +23,6 @@ interface ProjectDetailCardProps {
 
 const ProjectDetailCard: React.FC<ProjectDetailCardProps> = ({ project, projectIsFavorited }) => {
   const containsActiveWorkPackages = project.workPackages.filter((wp) => wp.status === WbsElementStatus.Active).length;
-  const tasksLeft: number = project.tasks.filter((task) => task.status !== TaskStatus.DONE).length;
 
   const ProjectDetailCardTitle = () => (
     <Grid container alignItems="center">
@@ -63,7 +62,8 @@ const ProjectDetailCard: React.FC<ProjectDetailCardProps> = ({ project, projectI
         )}
       </Grid>
       <Grid item display="flex" justifyContent="left" sx={{ marginTop: 0.5 }} xs={4}>
-        <TaskIcon sx={{ mr: 1 }} /> <Typography>{`${tasksLeft} task${tasksLeft === 1 ? '' : 's'} left`}</Typography>
+        <TaskIcon sx={{ mr: 1 }} />{' '}
+        <Typography>{`${project.tasksRemaining} task${project.tasksRemaining === 1 ? '' : 's'} left`}</Typography>
       </Grid>
       <Grid item display="flex" xs={4}>
         <Work sx={{ mr: 1 }} /> <Typography>{fullNamePipe(project.manager)}</Typography>

src/shared/src/types/project-types.ts

@@ -87,7 +87,7 @@ export interface ProjectPreview extends WbsElementPreview {
 
 export interface ProjectOverview extends ProjectPreview {
   links: Link[];
-  tasks: Task[];
+  tasksRemaining: number;
 }
 
 export interface RetrospectiveWorkPackage extends WorkPackage {