#4048 tasks for work packages

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

@@ -80,6 +80,19 @@ export default class TasksController {
     }
   }
 
+  static async editTaskWbsElement(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { wbsElementId } = req.body;
+      const { taskId } = req.params as Record<string, string>;
+
+      const updatedTask = await TasksService.editTaskWbsElement(req.currentUser, taskId, wbsElementId, req.organization);
+
+      res.status(200).json(updatedTask);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async deleteTask(req: Request, res: Response, next: NextFunction) {
     try {
       const { taskId } = req.params as Record<string, string>;

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

@@ -4,7 +4,7 @@ import { getDescriptionBulletQueryArgs } from './description-bullets.query-args.
 import { getTeamPreviewQueryArgs } from './teams.query-args.js';
 import { getTaskQueryArgs } from './tasks.query-args.js';
 import { getLinkQueryArgs } from './links.query-args.js';
-import { getWorkPackagePreviewQueryArgs, getWorkPackageQueryArgs } from './work-packages.query-args.js';
+import { getWorkPackageQueryArgs, getWorkPackagePreviewQueryArgs } from './work-packages.query-args.js';
 
 export type ProjectQueryArgs = ReturnType<typeof getProjectQueryArgs>;
 

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

@@ -27,7 +27,8 @@ export const getCalendarTaskQueryArgs = (organizationId: string) =>
           organizationId: true,
           dateDeleted: true,
           leadId: true,
-          managerId: true
+          managerId: true,
+          name: true
         }
       },
       createdBy: getUserQueryArgs(organizationId),

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

@@ -3,6 +3,7 @@ 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 { getTaskQueryArgs } from './tasks.query-args.js';
 
 export type WorkPackageQueryArgs = ReturnType<typeof getWorkPackageQueryArgs>;
 export type WorkPackagePreviewQueryArgs = ReturnType<typeof getWorkPackagePreviewQueryArgs>;
@@ -30,7 +31,8 @@ export const getWorkPackageQueryArgs = (organizationId: string) =>
             orderBy: { dateImplemented: 'asc' }
           },
           blocking: { where: { wbsElement: { dateDeleted: null } }, include: { wbsElement: true } },
-          descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) }
+          descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) },
+          tasks: { where: { dateDeleted: null }, ...getTaskQueryArgs(organizationId) }
         }
       },
       blockedBy: { where: { dateDeleted: null } },

src/backend/src/prisma/seed.ts

@@ -1677,7 +1677,7 @@ const performSeed: () => Promise<void> = async () => {
       "of the wheel and put pedal to the metal. Accelerating down straightaways and taking corners with finesse, it's " +
       'easy to forget McCauley, in his blue racing jacket and jet black helmet, is racing laps around the roof of ' +
       "Columbus Parking Garage on Northeastern's Boston campus. But that's the reality of Northeastern Electric " +
-      'Racing, a student club that has made due and found massive success in the world of electric racing despite its ' +
+      'Racing, a student club that has made do and found massive success in the world of electric racing despite its ' +
       "relative rookie status. McCauley, NER's chief electrical engineer, has seen the club's car, Cinnamon, go from " +
       'a 5-foot drive test to hitting 60 miles per hour in competitions. "It\'s a go-kart that has 110 kilowatts of ' +
       'power, 109 kilowatts of power," says McCauley, a fourth-year electrical and computer engineering student. ' +

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

@@ -48,16 +48,24 @@ tasksRouter.post(
   TasksController.editTask
 );
 
-tasksRouter.post('/:taskId/edit-status', isTaskStatus(body('status')), TasksController.editTaskStatus);
+tasksRouter.post('/:taskId/edit-status', isTaskStatus(body('status')), validateInputs, TasksController.editTaskStatus);
 
 tasksRouter.post(
   '/:taskId/edit-assignees',
   body('assignees').isArray(),
   nonEmptyString(body('assignees.*')),
+  validateInputs,
   TasksController.editTaskAssignees
 );
 
-tasksRouter.post('/:taskId/delete', TasksController.deleteTask);
+tasksRouter.post(
+  '/:taskId/edit-wbs-element',
+  nonEmptyString(body('wbsElementId')),
+  validateInputs,
+  TasksController.editTaskWbsElement
+);
+
+tasksRouter.post('/:taskId/delete', validateInputs, TasksController.deleteTask);
 
 tasksRouter.get('/overdue-by-team-member/:userId', TasksController.getOverdueTasksByTeamLeadership);
 

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

@@ -73,15 +73,25 @@ export default class TasksService {
             wbsElement: true,
             workPackages: { include: { wbsElement: true } }
           }
+        },
+        workPackage: {
+          include: {
+            project: {
+              include: {
+                teams: getTeamQueryArgs(organization.organizationId)
+              }
+            }
+          }
         }
       }
     });
     if (!requestedWbsElement) throw new NotFoundException('WBS Element', wbsPipe(wbsNum));
     if (requestedWbsElement.dateDeleted) throw new DeletedException('WBS Element', wbsPipe(wbsNum));
-    const { project } = requestedWbsElement;
-    if (!project) throw new HttpException(400, "This task's wbs element is not linked to a project!");
 
-    const { teams } = project;
+    if (!requestedWbsElement.project && !requestedWbsElement.workPackage)
+      throw new HttpException(400, "This task's wbs element is not linked to a project or work package!");
+
+    const teams = requestedWbsElement.project?.teams ?? requestedWbsElement.workPackage?.project?.teams;
     if (!teams || teams.length === 0)
       throw new HttpException(400, 'This project needs to be assigned to a team to create a task!');
 
@@ -173,13 +183,16 @@ export default class TasksService {
   /**
    * Edits the status of a task in the database
    * @param user the user editing the task
-   * @param organizationId the organizqtion Id
+   * @param organizationId the organization Id
    * @param taskId the id of the task
    * @param status the new status
    * @returns the updated task
    * @throws if the task does not exist, the task is already deleted, or if the user does not have permissions
    */
   static async editTaskStatus(user: User, organizationId: string, taskId: string, status: Task_Status) {
+    const hasPermission = await userHasPermission(user.userId, organizationId, notGuest);
+    if (!hasPermission) throw new AccessDeniedException('Guests cannot edit tasks');
+
     // Get the original task and check if it exists
     const originalTask = await prisma.task.findUnique({ where: { taskId }, include: { assignees: true, wbsElement: true } });
     if (!originalTask) throw new NotFoundException('Task', taskId);
@@ -190,9 +203,6 @@ export default class TasksService {
       throw new HttpException(400, 'A task in progress must have a deadline and assignees!');
     }
 
-    const hasPermission = await userHasPermission(user.userId, organizationId, notGuest);
-    if (!hasPermission) throw new AccessDeniedException('Guests cannot edit tasks');
-
     const updatedTask = await prisma.task.update({
       where: { taskId },
       data: { status },
@@ -216,6 +226,9 @@ export default class TasksService {
     assignees: string[],
     organization: Organization
   ): Promise<Task> {
+    const hasPermission = await userHasPermission(user.userId, organization.organizationId, notGuest);
+    if (!hasPermission) throw new AccessDeniedException('Guests cannot edit tasks');
+
     // Get the original task and check if it exists
     const originalTask = await prisma.task.findUnique({
       where: { taskId },
@@ -230,9 +243,6 @@ export default class TasksService {
     const originalAssigneeIds = originalTask.assignees.map((assignee) => assignee.userId);
     const newAssigneeIds = assignees.filter((userId) => !originalAssigneeIds.includes(userId));
 
-    const hasPermission = await userHasPermission(user.userId, organization.organizationId, notGuest);
-    if (!hasPermission) throw new AccessDeniedException('Guests cannot edit tasks');
-
     // this throws if any of the users aren't found
     const assigneeUsers = await getUsers(assignees);
 
@@ -261,6 +271,53 @@ export default class TasksService {
     return updatedTask;
   }
 
+  /**
+   * Edits the wbs element of a task in the database
+   * @param user the user editing the task
+   * @param taskId the id of the task
+   * @param wbsElementId the id of the new wbs element
+   * @param organization the organization that the user is currently in
+   * @returns the updated task
+   * @throws if the task does not exist, the task is already deleted, the wbs element doesn't exist, or if the user does not have permissions
+   */
+  static async editTaskWbsElement(
+    user: User,
+    taskId: string,
+    wbsElementId: string,
+    organization: Organization
+  ): Promise<Task> {
+    const hasPermission = await userHasPermission(user.userId, organization.organizationId, notGuest);
+    if (!hasPermission) throw new AccessDeniedException('Guests cannot edit tasks');
+
+    // get the original task and check if it exists
+    const originalTask = await prisma.task.findUnique({
+      where: { taskId },
+      include: { wbsElement: true }
+    });
+
+    // throw error if there are issues with the task
+    if (!originalTask) throw new NotFoundException('Task', taskId);
+    if (originalTask.dateDeleted) throw new DeletedException('Task', taskId);
+    if (originalTask.wbsElement.organizationId !== organization.organizationId)
+      throw new InvalidOrganizationException('Task');
+
+    const newWbsElement = await prisma.wBS_Element.findUnique({
+      where: { wbsElementId }
+    });
+
+    // throw error if there are issues with the wbs element
+    if (!newWbsElement) throw new NotFoundException('WBS Element', wbsElementId);
+    if (newWbsElement.dateDeleted) throw new DeletedException('WBS Element', wbsElementId);
+
+    const updatedTask = await prisma.task.update({
+      where: { taskId },
+      data: { wbsElement: { connect: { wbsElementId } } },
+      ...getTaskQueryArgs(organization.organizationId)
+    });
+
+    return taskTransformer(updatedTask);
+  }
+
   /**
    * Delete task in the database
    * @param taskId the id number of the given task

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

@@ -62,7 +62,10 @@ const projectTransformer = (project: Prisma.ProjectGetPayload<ProjectQueryArgs>)
     startDate: calculateProjectStartDate(project.workPackages),
     endDate: calculateProjectEndDate(project.workPackages),
     descriptionBullets: wbsElement.descriptionBullets.map(descBulletConverter),
-    tasks: wbsElement.tasks.map(taskTransformer),
+    tasks: [
+      ...wbsElement.tasks.map(taskTransformer), // this project's tasks
+      ...project.workPackages.flatMap((wp) => wp.wbsElement.tasks.map(taskTransformer)) // all of this project's work packages' tasks, flattened to one array
+    ],
     workPackages: project.workPackages.map(workPackageTransformer),
     abbreviation: project.abbreviation ?? undefined
   };
@@ -91,7 +94,10 @@ export const projectGanttTransformer = (project: Prisma.ProjectGetPayload<Projec
     })),
     duration: calculateDuration(project.workPackages),
     startDate: calculateProjectStartDate(project.workPackages),
-    tasks: project.wbsElement.tasks.map(taskTransformer),
+    tasks: [
+      ...wbsElement.tasks.map(taskTransformer), // this project's tasks
+      ...project.workPackages.flatMap((wp) => wp.wbsElement.tasks.map(taskTransformer)) // all of this project's work packages' tasks, flattened to one array
+    ],
     workPackages: project.workPackages.map(workPackageTransformer),
     abbreviation: project.abbreviation ?? undefined
   };

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

@@ -5,11 +5,12 @@ import { convertTaskPriority, convertTaskStatus } from '../utils/tasks.utils.js'
 import { userTransformer } from './user.transformer.js';
 import { CalendarTaskQueryArgs, TaskQueryArgs, TaskPreviewQueryArgs } from '../prisma-query-args/tasks.query-args.js';
 
-const taskTransformer = (task: Prisma.TaskGetPayload<TaskQueryArgs>): Task => {
+export const taskTransformer = (task: Prisma.TaskGetPayload<TaskQueryArgs>): Task => {
   const wbsNum = wbsNumOf(task.wbsElement);
   return {
     taskId: task.taskId,
     wbsNum,
+    wbsName: task.wbsElement.name,
     title: task.title,
     notes: task.notes,
     deadline: task.deadline ?? undefined,
@@ -45,6 +46,7 @@ export const calendarTaskTransformer = (task: Prisma.TaskGetPayload<CalendarTask
   return {
     taskId: task.taskId,
     wbsNum,
+    wbsName: task.wbsElement.name,
     title: task.title,
     notes: task.notes,
     deadline: task.deadline ?? undefined,

src/backend/src/transformers/work-packages.transformer.ts

@@ -6,6 +6,7 @@ import { userTransformer } from './user.transformer.js';
 import { WorkPackageQueryArgs, WorkPackagePreviewQueryArgs } from '../prisma-query-args/work-packages.query-args.js';
 import { teamTypeTransformer } from './team-types.transformer.js';
 import { eventPreviewTransformer } from './calendar.transformer.js';
+import { taskTransformer } from './tasks.transformer.js';
 
 const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<WorkPackageQueryArgs>): WorkPackage => {
   const wbsNum = wbsNumOf(wpInput.wbsElement);
@@ -42,6 +43,7 @@ const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<WorkPacka
     events: wpInput.events.map((event) =>
       eventPreviewTransformer(event, `${wpInput.project.wbsElement.name} - ${wpInput.wbsElement.name}`)
     ),
+    tasks: wpInput.wbsElement.tasks.map(taskTransformer),
     deleted: wpInput.wbsElement.dateDeleted !== null
   };
 };

src/backend/src/utils/validation.utils.ts

@@ -288,6 +288,7 @@ export const materialValidators = [
   body('linkUrl').optional().isString(),
   body('notes').isString().optional()
 ];
+
 export const validateInputs = (req: Request, res: Response, next: Function): void => {
   const errors = validationResult(req);
   if (!errors.isEmpty()) {