Merge branch 'develop' into #1289-change-expense-type-to-autocomplete

Author: RChandler234

README.md

@@ -8,7 +8,7 @@ A project management web application built in Typescript, React, and Express.
 
 All of our documentation is on [our Confluence page](https://nerdocs.atlassian.net/wiki/spaces/NER/pages/5603329/Software). Start there to learn what the project is all about.
 
-All questions can be directed to `#software` in the [NER Slack](https://nu-electric-racing.slack.com) (backup contact: [`@anthonybernardi`](https://github.com/anthonybernardi)).
+All questions can be directed to `#software` in the [NER Slack](https://nu-electric-racing.slack.com) (backup contact: [`@RChandler234`](https://github.com/RChandler234)).
 
 ## Environment Setup
 

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -72,9 +72,9 @@ export default class ReimbursementRequestsController {
   static async reimburseUser(req: Request, res: Response, next: NextFunction) {
     try {
       const user = await getCurrentUser(res);
-      const { amount } = req.body;
+      const { amount, dateReceived } = req.body;
 
-      const reimbursement = await ReimbursementRequestService.reimburseUser(amount, user);
+      const reimbursement = await ReimbursementRequestService.reimburseUser(amount, dateReceived, user);
       res.status(200).json(reimbursement);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/teams.controllers.ts

@@ -62,4 +62,16 @@ export default class TeamsController {
       next(error);
     }
   }
+
+  static async setTeamLeads(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userIds } = req.body;
+      const { teamId } = req.params;
+      const submitter = await getCurrentUser(res);
+      const team = await TeamsService.setTeamLeads(submitter, teamId, userIds);
+      return res.status(200).json(team);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/prisma/seed.ts

@@ -12,6 +12,7 @@ import {
   Task_Priority,
   Task_Status,
   Team,
+  Vendor,
   WBS_Element_Status
 } from '@prisma/client';
 import { dbSeedAllUsers } from './seed-data/users.seed';
@@ -684,6 +685,10 @@ const performSeed: () => Promise<void> = async () => {
   );
 
   const vendor = await ReimbursementRequestService.createVendor(thomasEmrax, 'Tesla');
+  const vendor2 = await ReimbursementRequestService.createVendor(thomasEmrax, 'Amazon');
+  const vendor3 = await ReimbursementRequestService.createVendor(thomasEmrax, 'Google');
+
+  const vendors: Vendor[] = [vendor, vendor2, vendor3];
 
   const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true);
 

src/backend/src/routes/reimbursement-requests.routes.ts

@@ -111,6 +111,7 @@ reimbursementRequestsRouter.post(
 reimbursementRequestsRouter.post(
   '/reimburse',
   intMinZero(body('amount')),
+  isDate(body('dateReceived')),
   validateInputs,
   ReimbursementRequestController.reimburseUser
 );

src/backend/src/routes/teams.routes.ts

@@ -15,6 +15,13 @@ teamsRouter.post(
   validateInputs,
   TeamsController.setTeamMembers
 );
+teamsRouter.post(
+  '/:teamId/set-leads',
+  body('userIds').isArray(),
+  intMinZero(body('userIds.*')),
+  validateInputs,
+  TeamsController.setTeamLeads
+);
 teamsRouter.post(
   '/:teamId/edit-description',
   body('newDescription').isString(),

src/backend/src/services/reimbursement-requests.services.ts

@@ -130,6 +130,8 @@ export default class ReimbursementRequestService {
 
     if (!expenseType) throw new NotFoundException('Expense Type', expenseTypeId);
 
+    if (!expenseType.allowed) throw new HttpException(400, `The expense type ${expenseType.name} is not allowed!`);
+
     const validatedReimbursementProudcts = await validateReimbursementProducts(reimbursementProducts);
 
     const createdReimbursementRequest = await prisma.reimbursement_Request.create({
@@ -167,10 +169,11 @@ export default class ReimbursementRequestService {
    * Function to reimburse a user for their expenses.
    *
    * @param amount the amount to be reimbursed
+   * @param dateReceived the date the amount was received
    * @param submitter the person performing the reimbursement
    * @returns the created reimbursement
    */
-  static async reimburseUser(amount: number, submitter: User): Promise<Reimbursement> {
+  static async reimburseUser(amount: number, dateReceived: string, submitter: User): Promise<Reimbursement> {
     if (isGuest(submitter.role)) {
       throw new AccessDeniedException('Guests cannot reimburse a user for their expenses.');
     }
@@ -195,11 +198,16 @@ export default class ReimbursementRequestService {
     if (amount > totalOwed - totalReimbursed) {
       throw new HttpException(400, 'Reimbursement is greater than the total amount owed to the user');
     }
+
+    // make the date object but add 12 hours so that the time isn't 00:00 to avoid timezone problems
+    const dateCreated = new Date(dateReceived.split('T')[0]);
+    dateCreated.setTime(dateCreated.getTime() + 12 * 60 * 60 * 1000);
+
     const newReimbursement = await prisma.reimbursement.create({
       data: {
         purchaserId: submitter.userId,
         amount,
-        dateCreated: new Date(),
+        dateCreated: dateReceived,
         userSubmittedId: submitter.userId
       },
       ...reimbursementQueryArgs

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

@@ -6,7 +6,7 @@ import teamQueryArgs from '../prisma-query-args/teams.query-args';
 import prisma from '../prisma/prisma';
 import taskTransformer from '../transformers/tasks.transformer';
 import { NotFoundException, AccessDeniedException, HttpException, DeletedException } from '../utils/errors.utils';
-import { hasPermissionToEditTask } from '../utils/tasks.utils';
+import { hasPermissionToEditTask, sendSlackTaskAssignedNotificationToUsers } from '../utils/tasks.utils';
 import { areUsersPartOfTeams, isUserOnTeam } from '../utils/teams.utils';
 import { getUsers } from '../utils/users.utils';
 import { wbsNumOf } from '../utils/utils';
@@ -79,7 +79,11 @@ export default class TasksService {
       ...taskQueryArgs
     });
 
-    return taskTransformer(createdTask);
+    const newTask = taskTransformer(createdTask);
+
+    sendSlackTaskAssignedNotificationToUsers(newTask, assignees);
+
+    return newTask;
   }
 
   /**
@@ -94,7 +98,10 @@ export default class TasksService {
    */
   static async editTask(user: User, taskId: string, title: string, notes: string, priority: Task_Priority, deadline: Date) {
     const hasPermission = await hasPermissionToEditTask(user, taskId);
-    if (!hasPermission) throw new AccessDeniedException();
+    if (!hasPermission)
+      throw new AccessDeniedException(
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
+      );
 
     const originalTask = await prisma.task.findUnique({ where: { taskId } });
     if (!originalTask) throw new NotFoundException('Task', taskId);
@@ -129,7 +136,7 @@ export default class TasksService {
     const hasPermission = await hasPermissionToEditTask(user, taskId);
     if (!hasPermission)
       throw new AccessDeniedException(
-        'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
       );
 
     const updatedTask = await prisma.task.update({ where: { taskId }, data: { status }, ...taskQueryArgs });
@@ -149,16 +156,20 @@ export default class TasksService {
     const originalTask = await prisma.task.findUnique({
       where: { taskId },
       include: {
-        wbsElement: { include: { project: { ...projectQueryArgs } } }
+        wbsElement: { include: { project: { ...projectQueryArgs } } },
+        assignees: true
       }
     });
     if (!originalTask) throw new NotFoundException('Task', taskId);
     if (originalTask.dateDeleted) throw new DeletedException('Task', taskId);
 
+    const originalAssigneeIds = originalTask.assignees.map((assignee) => assignee.userId);
+    const newAssigneeIds = assignees.filter((userId) => !originalAssigneeIds.includes(userId));
+
     const hasPermission = await hasPermissionToEditTask(user, taskId);
     if (!hasPermission)
       throw new AccessDeniedException(
-        'Only admins, app admins, task creators, project leads, project managers, or project assignees can edit a task'
+        'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
       );
 
     // this throws if any of the users aren't found
@@ -180,17 +191,21 @@ export default class TasksService {
       };
     });
 
-    const updatedTask = await prisma.task.update({
-      where: { taskId },
-      data: {
-        assignees: {
-          set: transformedAssigneeUsers
-        }
-      },
-      ...taskQueryArgs
-    });
-
-    return taskTransformer(updatedTask);
+    const updatedTask = taskTransformer(
+      await prisma.task.update({
+        where: { taskId },
+        data: {
+          assignees: {
+            set: transformedAssigneeUsers
+          }
+        },
+        ...taskQueryArgs
+      })
+    );
+
+    await sendSlackTaskAssignedNotificationToUsers(updatedTask, newAssigneeIds);
+
+    return updatedTask;
   }
 
   /**

src/backend/src/services/teams.services.ts

@@ -162,4 +162,53 @@ export default class TeamsService {
 
     return teamTransformer(updateTeam);
   }
+
+  /**
+   * Update the given teamId's team's leads
+   * @param submitter a user who's making this request
+   * @param teamId a id of team to be updated
+   * @param userIds a array of user Ids that replaces team's old leads
+   * @returns an updated team
+   * @throws if the team is not found, the submitter has no privilege, or any user from the given userIds does not exist
+   */
+  static async setTeamLeads(submitter: User, teamId: string, userIds: number[]): Promise<Team> {
+    const team = await prisma.team.findUnique({
+      where: { teamId },
+      ...teamQueryArgs
+    });
+
+    const newLeads = await getUsers(userIds);
+
+    if (!team) throw new NotFoundException('Team', teamId);
+
+    if (!isAdmin(submitter.role) && submitter.userId !== team.headId) {
+      throw new AccessDeniedException('You must be an admin or the head to update the lead!');
+    }
+
+    if (newLeads.map((lead) => lead.userId).includes(team.headId)) {
+      throw new HttpException(400, 'A lead cannot be the head of the team!');
+    }
+
+    if (team.members.map((member) => member.userId).some((memberId) => userIds.includes(memberId))) {
+      throw new HttpException(400, 'A lead cannot be a member of the team!');
+    }
+
+    const transformedLeads = newLeads.map((lead) => {
+      return {
+        userId: lead.userId
+      };
+    });
+
+    const updateTeam = await prisma.team.update({
+      where: { teamId },
+      data: {
+        leads: {
+          set: transformedLeads
+        }
+      },
+      ...teamQueryArgs
+    });
+
+    return teamTransformer(updateTeam);
+  }
 }

src/backend/src/services/work-packages.services.ts

@@ -154,6 +154,12 @@ export default class WorkPackagesService {
       throw new HttpException(400, 'A Work Package cannot have its own project as a blocker');
     }
 
+    blockedBy.forEach((dep: WbsNumber) => {
+      if (dep.workPackageNumber === 0) {
+        throw new HttpException(400, 'A Project cannot be a Blocker');
+      }
+    });
+
     const wbsElem = await prisma.wBS_Element.findUnique({
       where: {
         wbsNumber: {
@@ -287,6 +293,12 @@ export default class WorkPackagesService {
     // verify user is allowed to edit work packages
     if (isGuest(user.role)) throw new AccessDeniedGuestException('edit work packages');
 
+    blockedBy.forEach((dep: WbsNumber) => {
+      if (dep.workPackageNumber === 0) {
+        throw new HttpException(400, 'A Project cannot be a Blocker');
+      }
+    });
+
     const { userId } = user;
 
     // get the original work package so we can compare things