Merge pull request #3988 from Northeastern-Electric-Racing/calendar-tasks

tasks on calendar

Author: chpy04

src/backend/src/controllers/tasks.controllers.ts

@@ -92,6 +92,26 @@ export default class TasksController {
     }
   }
 
+  static async getFilteredTasks(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { memberIds, teamIds, startPeriod, endPeriod } = req.body;
+
+      const tasks = await TasksService.getFilteredTasks(
+        {
+          memberIds,
+          teamIds,
+          startPeriod: new Date(startPeriod),
+          endPeriod: new Date(endPeriod)
+        },
+        req.organization
+      );
+
+      res.status(200).json(tasks);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOverdueTasksByTeamLeadership(req: Request, res: Response, next: NextFunction) {
     try {
       const { userId } = req.params as Record<string, string>;

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

@@ -3,6 +3,7 @@ import { getUserQueryArgs } from './user.query-args.js';
 
 export type TaskQueryArgs = ReturnType<typeof getTaskQueryArgs>;
 export type TaskPreviewQueryArgs = ReturnType<typeof getTaskPreviewQueryArgs>;
+export type CalendarTaskQueryArgs = ReturnType<typeof getCalendarTaskQueryArgs>;
 
 export const getTaskQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.TaskDefaultArgs>()({
@@ -14,6 +15,27 @@ export const getTaskQueryArgs = (organizationId: string) =>
     }
   });
 
+export const getCalendarTaskQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.TaskDefaultArgs>()({
+    include: {
+      wbsElement: {
+        select: {
+          wbsElementId: true,
+          carNumber: true,
+          projectNumber: true,
+          workPackageNumber: true,
+          organizationId: true,
+          dateDeleted: true,
+          leadId: true,
+          managerId: true
+        }
+      },
+      createdBy: getUserQueryArgs(organizationId),
+      deletedBy: getUserQueryArgs(organizationId),
+      assignees: getUserQueryArgs(organizationId)
+    }
+  });
+
 export const getTaskPreviewQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.TaskDefaultArgs>()({
     include: {

src/backend/src/routes/tasks.routes.ts

@@ -2,9 +2,22 @@ import express from 'express';
 import { body } from 'express-validator';
 import TasksController from '../controllers/tasks.controllers.js';
 import { nonEmptyString, isTaskPriority, isTaskStatus, validateInputs, isOptionalDate } from '../utils/validation.utils.js';
+import { isDate } from '../utils/validation.utils.js';
 
 const tasksRouter = express.Router();
 
+tasksRouter.post(
+  '/filter',
+  isDate(body('startPeriod')),
+  isDate(body('endPeriod')),
+  body('memberIds').optional().isArray(),
+  body('memberIds.*').optional().isString(),
+  body('teamIds').optional().isArray(),
+  body('teamIds.*').optional().isString(),
+  validateInputs,
+  TasksController.getFilteredTasks
+);
+
 tasksRouter.post(
   '/:wbsNum',
   nonEmptyString(body('title')),

src/backend/src/services/projects.services.ts

@@ -66,6 +66,7 @@ export default class ProjectsService {
   static async getAllProjects(organization: Organization): Promise<ProjectPreview[]> {
     const projects = await prisma.project.findMany({
       where: { wbsElement: { dateDeleted: null, organizationId: organization.organizationId } },
+      orderBy: { wbsElement: { dateCreated: 'desc' } },
       ...getProjectPreviewQueryArgs(organization.organizationId)
     });
 

src/backend/src/services/tasks.services.ts

@@ -1,7 +1,18 @@
 import { Task_Priority, Task_Status, Organization } from '@prisma/client';
-import { isAdmin, isUnderWordCount, notGuest, Task, TaskCardPreview, WbsNumber, wbsPipe, User } from 'shared';
+import {
+  CalendarTask,
+  FilterTaskArgs,
+  isAdmin,
+  isUnderWordCount,
+  notGuest,
+  Task,
+  TaskCardPreview,
+  WbsNumber,
+  wbsPipe,
+  User
+} from 'shared';
 import prisma from '../prisma/prisma.js';
-import taskTransformer, { taskCardPreviewTransformer } from '../transformers/tasks.transformer.js';
+import taskTransformer, { calendarTaskTransformer, taskCardPreviewTransformer } from '../transformers/tasks.transformer.js';
 import {
   NotFoundException,
   AccessDeniedException,
@@ -13,7 +24,11 @@ import { sendSlackTaskAssignedNotificationToUsers } from '../utils/tasks.utils.j
 import { getUsers, userHasPermission } from '../utils/users.utils.js';
 import { wbsNumOf } from '../utils/utils.js';
 import { getTeamQueryArgs } from '../prisma-query-args/teams.query-args.js';
-import { getTaskPreviewQueryArgs, getTaskQueryArgs } from '../prisma-query-args/tasks.query-args.js';
+import {
+  getCalendarTaskQueryArgs,
+  getTaskPreviewQueryArgs,
+  getTaskQueryArgs
+} from '../prisma-query-args/tasks.query-args.js';
 import { getProjectQueryArgs } from '../prisma-query-args/projects.query-args.js';
 
 export default class TasksService {
@@ -281,6 +296,66 @@ export default class TasksService {
     return deletedTask.taskId;
   }
 
+  static async getFilteredTasks(filters: FilterTaskArgs, organization: Organization): Promise<CalendarTask[]> {
+    const { memberIds, teamIds, startPeriod, endPeriod } = filters;
+
+    // Validate memberIds if provided
+    if (memberIds && memberIds.length > 0) {
+      const users = await prisma.user.findMany({
+        where: { userId: { in: memberIds }, organizations: { some: { organizationId: organization.organizationId } } }
+      });
+      if (users.length !== memberIds.length) {
+        throw new NotFoundException('User', 'one or more member IDs');
+      }
+    }
+
+    // Validate teamIds if provided
+    if (teamIds && teamIds.length > 0) {
+      const teams = await prisma.team.findMany({
+        where: {
+          teamId: { in: teamIds },
+          organizationId: organization.organizationId
+        }
+      });
+      if (teams.length !== teamIds.length) {
+        throw new NotFoundException('Team', 'one or more team IDs');
+      }
+    }
+
+    const orFilters: any[] = [];
+    if (memberIds && memberIds.length > 0) {
+      orFilters.push({ assignees: { some: { userId: { in: memberIds } } } });
+      orFilters.push({ createdByUserId: { in: memberIds } });
+    }
+    if (teamIds && teamIds.length > 0) {
+      orFilters.push({
+        wbsElement: {
+          project: {
+            teams: { some: { teamId: { in: teamIds } } }
+          }
+        }
+      });
+    }
+
+    const tasks = await prisma.task.findMany({
+      where: {
+        dateDeleted: null,
+        deadline: {
+          gte: startPeriod,
+          lte: endPeriod
+        },
+        wbsElement: {
+          organizationId: organization.organizationId,
+          dateDeleted: null
+        },
+        ...(orFilters.length > 0 ? { OR: orFilters } : {})
+      },
+      ...getCalendarTaskQueryArgs(organization.organizationId)
+    });
+
+    return tasks.map(calendarTaskTransformer);
+  }
+
   static async getOverdueTasksByTeamLeadership(userId: string, organization: Organization): Promise<TaskCardPreview[]> {
     const teams = await prisma.team.findMany({
       where: {

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

@@ -1,9 +1,9 @@
 import { Prisma } from '@prisma/client';
-import { Task, TaskCardPreview } from 'shared';
+import { CalendarTask, Task, TaskCardPreview } from 'shared';
 import { wbsNumOf } from '../utils/utils.js';
 import { convertTaskPriority, convertTaskStatus } from '../utils/tasks.utils.js';
 import { userTransformer } from './user.transformer.js';
-import { TaskQueryArgs, TaskPreviewQueryArgs } from '../prisma-query-args/tasks.query-args.js';
+import { CalendarTaskQueryArgs, TaskQueryArgs, TaskPreviewQueryArgs } from '../prisma-query-args/tasks.query-args.js';
 
 const taskTransformer = (task: Prisma.TaskGetPayload<TaskQueryArgs>): Task => {
   const wbsNum = wbsNumOf(task.wbsElement);
@@ -40,4 +40,25 @@ export const taskCardPreviewTransformer = (task: Prisma.TaskGetPayload<TaskPrevi
   };
 };
 
+export const calendarTaskTransformer = (task: Prisma.TaskGetPayload<CalendarTaskQueryArgs>): CalendarTask => {
+  const wbsNum = wbsNumOf(task.wbsElement);
+  return {
+    taskId: task.taskId,
+    wbsNum,
+    title: task.title,
+    notes: task.notes,
+    deadline: task.deadline ?? undefined,
+    startDate: task.startDate ?? undefined,
+    priority: convertTaskPriority(task.priority),
+    status: convertTaskStatus(task.status),
+    createdBy: userTransformer(task.createdBy),
+    assignees: task.assignees.map(userTransformer),
+    dateDeleted: task.dateDeleted ?? undefined,
+    dateCreated: task.dateCreated,
+    deletedBy: task.deletedBy ? userTransformer(task.deletedBy) : undefined,
+    projectLeadId: task.wbsElement.leadId ?? undefined,
+    projectManagerId: task.wbsElement.managerId ?? undefined
+  };
+};
+
 export default taskTransformer;

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

@@ -3,7 +3,7 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { Task, TaskCardPreview, TaskPriority, TaskStatus, WbsNumber, wbsPipe } from 'shared';
+import { CalendarTask, FilterTaskArgs, Task, TaskCardPreview, TaskPriority, TaskStatus, WbsNumber, wbsPipe } from 'shared';
 import axios from '../utils/axios';
 import { apiUrls } from '../utils/urls';
 import { taskTransformer } from './transformers/tasks.transformers';
@@ -113,6 +113,17 @@ export const deleteSingleTask = (taskId: string) => {
   return axios.post<{ message: string }>(apiUrls.deleteTask(taskId), {});
 };
 
+/**
+ * Gets all tasks that match the filter criteria.
+ * @param payload the filter criteria
+ * @returns an array of tasks that match the filter criteria
+ */
+export const getFilterTasks = (payload: FilterTaskArgs) => {
+  return axios.post<CalendarTask[]>(apiUrls.tasksFilter(), payload, {
+    transformResponse: (data) => JSON.parse(data).map(taskTransformer)
+  });
+};
+
 export const getOverdueTasksByTeamLeader = (userId: string) => {
   return axios.get<TaskCardPreview[]>(apiUrls.overdueTasksByTeamLeadership(userId), {
     transformResponse: (data) => JSON.parse(data).map(taskTransformer)

src/frontend/src/components/NERFormModal.tsx

@@ -9,6 +9,8 @@ interface NERFormModalProps<T extends FieldValues> extends NERModalProps {
   formId: string;
   children?: ReactNode;
   paperProps?: any;
+  titleChildren?: ReactNode;
+  actionsLeftChildren?: ReactNode;
 }
 
 const NERFormModal = ({
@@ -25,7 +27,9 @@ const NERFormModal = ({
   children,
   showCloseButton,
   hideBackDrop = false,
-  paperProps
+  paperProps,
+  titleChildren,
+  actionsLeftChildren
 }: NERFormModalProps<any>) => {
   /**
    * Wrapper function for onSubmit so that form data is reset after submit
@@ -56,6 +60,8 @@ const NERFormModal = ({
       showCloseButton={showCloseButton}
       hideBackDrop={hideBackDrop}
       paperProps={paperProps}
+      titleChildren={titleChildren}
+      actionsLeftChildren={actionsLeftChildren}
     >
       <form id={formId} onSubmit={handleFormSubmit} noValidate>
         {children}

src/frontend/src/components/NERModal.tsx

@@ -15,6 +15,7 @@ export interface NERModalProps {
   onHide: () => void;
   children?: ReactNode;
   titleChildren?: ReactNode;
+  actionsLeftChildren?: ReactNode;
   cancelText?: CancelText;
   submitText?: SubmitText;
   disabled?: boolean;
@@ -40,7 +41,8 @@ const NERModal = ({
   hideBackDrop = false,
   icon,
   paperProps,
-  titleChildren
+  titleChildren,
+  actionsLeftChildren
 }: NERModalProps) => {
   return (
     <Dialog
@@ -110,7 +112,8 @@ const NERModal = ({
         {children}
       </DialogContent>
       {!hideFormButtons && (
-        <DialogActions>
+        <DialogActions sx={{ justifyContent: actionsLeftChildren ? 'space-between' : 'flex-end' }}>
+          {actionsLeftChildren && <Box sx={{ ml: 1 }}>{actionsLeftChildren}</Box>}
           <Box sx={{ display: 'flex', flexDirection: 'row', mb: 1 }}>
             <NERFailButton sx={{ mx: 1 }} form={formId} onClick={onHide}>
               {cancelText || 'Cancel'}

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

@@ -4,14 +4,15 @@
  */
 
 import { useMutation, useQuery, useQueryClient } from 'react-query';
-import { WbsNumber, TaskPriority, TaskStatus, Task, TaskCardPreview } from 'shared';
+import { CalendarTask, FilterTaskArgs, WbsNumber, TaskPriority, TaskStatus, Task, TaskCardPreview } from 'shared';
 import {
   createSingleTask,
   deleteSingleTask,
   editSingleTaskStatus,
   editTask,
   editTaskAssignees,
-  getOverdueTasksByTeamLeader
+  getOverdueTasksByTeamLeader,
+  getFilterTasks
 } from '../apis/tasks.api';
 
 export interface CreateTaskPayload {
@@ -25,6 +26,24 @@ export interface CreateTaskPayload {
   assignees: string[];
 }
 
+/**
+ * Custom React Hook for filtering tasks based on various criteria
+ * @returns the filtered tasks query
+ */
+export const useFilterTasks = (filterArgs: FilterTaskArgs | null) => {
+  return useQuery<CalendarTask[], Error>(
+    ['filter-tasks', filterArgs],
+    async () => {
+      const { data } = await getFilterTasks(filterArgs!);
+      return data;
+    },
+    {
+      keepPreviousData: true,
+      enabled: filterArgs !== null
+    }
+  );
+};
+
 export const useCreateTask = () => {
   const queryClient = useQueryClient();
   return useMutation<Task, Error, CreateTaskPayload>(
@@ -45,6 +64,7 @@ export const useCreateTask = () => {
     {
       onSuccess: () => {
         queryClient.invalidateQueries(['projects']);
+        queryClient.invalidateQueries(['filter-tasks']);
       }
     }
   );
@@ -82,6 +102,7 @@ export const useEditTask = () => {
     {
       onSuccess: () => {
         queryClient.invalidateQueries(['projects']);
+        queryClient.invalidateQueries(['filter-tasks']);
       }
     }
   );
@@ -102,6 +123,7 @@ export const useEditTaskAssignees = () => {
     {
       onSuccess: () => {
         queryClient.invalidateQueries(['projects']);
+        queryClient.invalidateQueries(['filter-tasks']);
       }
     }
   );
@@ -142,6 +164,7 @@ export const useDeleteTask = () => {
     {
       onSuccess: () => {
         queryClient.invalidateQueries(['projects']);
+        queryClient.invalidateQueries(['filter-tasks']);
       }
     }
   );