Merge pull request #3947 from Northeastern-Electric-Racing/#3913-overdue-task-endpoint

#3913 overdue task endpoint

Author: chpy04

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

@@ -17,7 +17,20 @@ export const getTaskQueryArgs = (organizationId: string) =>
 export const getTaskPreviewQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.TaskDefaultArgs>()({
     include: {
-      wbsElement: true,
+      wbsElement: {
+        include: {
+          project: {
+            select: {
+              projectId: true,
+              wbsElement: {
+                select: {
+                  name: true
+                }
+              }
+            }
+          }
+        }
+      },
       createdBy: getUserQueryArgs(organizationId),
       assignees: getUserQueryArgs(organizationId)
     }

src/backend/src/transformers/tasks.transformer.ts

@@ -26,9 +26,17 @@ const taskTransformer = (task: Prisma.TaskGetPayload<TaskQueryArgs>): Task => {
 
 export const taskCardPreviewTransformer = (task: Prisma.TaskGetPayload<TaskPreviewQueryArgs>): TaskCardPreview => {
   return {
-    ...task,
+    taskId: task.taskId,
+    wbsNum: wbsNumOf(task.wbsElement),
+    title: task.title,
+    deadline: task.deadline ?? undefined,
     priority: convertTaskPriority(task.priority),
-    deadline: task.deadline ?? undefined
+    assignees: task.assignees.map((assignee) => ({
+      userId: assignee.userId,
+      firstName: assignee.firstName,
+      lastName: assignee.lastName
+    })),
+    projectName: task.wbsElement?.project?.wbsElement?.name || 'Unknown Project'
   };
 };
 

src/frontend/src/apis/tasks.api.ts

@@ -3,7 +3,7 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { Task, TaskPriority, TaskStatus, WbsNumber, wbsPipe } from 'shared';
+import { Task, TaskCardPreview, TaskPriority, TaskStatus, WbsNumber, wbsPipe } from 'shared';
 import axios from '../utils/axios';
 import { apiUrls } from '../utils/urls';
 import { taskTransformer } from './transformers/tasks.transformers';
@@ -114,7 +114,7 @@ export const deleteSingleTask = (taskId: string) => {
 };
 
 export const getOverdueTasksByTeamLeader = (userId: string) => {
-  return axios.get<Task[]>(apiUrls.overdueTasksByTeamLeadership(userId), {
+  return axios.get<TaskCardPreview[]>(apiUrls.overdueTasksByTeamLeadership(userId), {
     transformResponse: (data) => JSON.parse(data).map(taskTransformer)
   });
 };

src/frontend/src/hooks/tasks.hooks.ts

@@ -4,7 +4,7 @@
  */
 
 import { useMutation, useQuery, useQueryClient } from 'react-query';
-import { WbsNumber, TaskPriority, TaskStatus, Task } from 'shared';
+import { WbsNumber, TaskPriority, TaskStatus, Task, TaskCardPreview } from 'shared';
 import {
   createSingleTask,
   deleteSingleTask,
@@ -148,7 +148,7 @@ export const useDeleteTask = () => {
 };
 
 export const useOverdueTasksByTeamLeader = (userId: string) => {
-  return useQuery<Task[], Error>([userId, 'tasks'], async () => {
+  return useQuery<TaskCardPreview[], Error>([userId, 'tasks'], async () => {
     const { data } = await getOverdueTasksByTeamLeader(userId);
     return data;
   });

src/frontend/src/pages/HomePage/components/MyTeamsOverdueTasks.tsx

@@ -16,8 +16,8 @@ const NoOverdueTeamTaskDisplay = () => {
   return (
     <EmptyPageBlockDisplay
       icon={<CheckCircleOutlineOutlinedIcon sx={{ fontSize: 128 }} />}
-      heading={"You're team is all caught up!"}
-      message={"You're team has no overdue tasks!"}
+      heading={'Your team is all caught up!'}
+      message={'Your team has no overdue tasks!'}
     />
   );
 };

src/frontend/src/pages/HomePage/components/TeamTaskCard.tsx

@@ -2,10 +2,7 @@ import { Box, Card, CardContent, Chip, Link, Stack, Typography } from '@mui/mate
 import { Link as RouterLink } from 'react-router-dom';
 import { useTheme } from '@mui/system';
 import React from 'react';
-import { Task, wbsPipe } from 'shared';
-import LoadingIndicator from '../../../components/LoadingIndicator';
-import ErrorPage from '../../ErrorPage';
-import { useSingleProject } from '../../../hooks/projects.hooks';
+import { Task, TaskCardPreview, wbsPipe } from 'shared';
 import { routes } from '../../../utils/routes';
 import { fullNamePipe } from '../../../utils/pipes';
 import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
@@ -14,15 +11,12 @@ import { taskPriorityColor } from '../../../utils/task.utils';
 import { formatDate } from '../../../utils/datetime.utils';
 
 interface TeamTaskCardProps {
-  task: Task;
+  task: TaskCardPreview;
   taskNumber: number;
 }
 
 const TeamTaskCard: React.FC<TeamTaskCardProps> = ({ task, taskNumber }) => {
   const theme = useTheme();
-  const { data: project, isLoading, isError, error } = useSingleProject(task.wbsNum);
-  if (isLoading || !project) return <LoadingIndicator />;
-  if (isError) return <ErrorPage message={error.message} />;
 
   return (
     <Card
@@ -49,7 +43,7 @@ const TeamTaskCard: React.FC<TeamTaskCardProps> = ({ task, taskNumber }) => {
             </Typography>
             <Link component={RouterLink} to={`${routes.PROJECTS}/${wbsPipe(task.wbsNum)}`} noWrap>
               <Typography fontWeight={'regular'} variant="subtitle2">
-                {wbsPipe(task.wbsNum)} - {project.name}
+                {wbsPipe(task.wbsNum)} - {task.projectName}
               </Typography>
             </Link>
             <Stack direction={'row'} spacing={1}>
@@ -60,7 +54,7 @@ const TeamTaskCard: React.FC<TeamTaskCardProps> = ({ task, taskNumber }) => {
           <Stack spacing={1}>
             <Chip
               sx={{
-                background: taskPriorityColor(task)
+                background: taskPriorityColor({ priority: task.priority } as Task)
               }}
               label={task.priority}
               size="medium"

src/shared/src/types/task-types.ts

@@ -34,8 +34,9 @@ export interface Task {
   status: TaskStatus;
 }
 
-export type TaskCardPreview = Pick<Task, 'taskId' | 'title' | 'deadline' | 'priority'> & {
-  assignees: { firstName: string; lastName: string }[];
+export type TaskCardPreview = Pick<Task, 'taskId' | 'title' | 'deadline' | 'priority' | 'wbsNum'> & {
+  assignees: { userId: string; firstName: string; lastName: string }[];
+  projectName: string;
 };
 
 export interface TaskWithIndex extends Task {