Merge branch 'develop' into #1395-MottoSereeyothin-credits

Author: msereeyothin

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/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/services/reimbursement-requests.services.ts

@@ -167,10 +167,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 +196,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/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

src/backend/src/utils/slack.utils.ts

@@ -1,6 +1,7 @@
-import { ChangeRequest, daysBetween, User, wbsPipe, WorkPackage } from 'shared';
+import { ChangeRequest, daysBetween, Task, User, wbsPipe, WorkPackage } from 'shared';
 import { sendMessage } from '../integrations/slack';
 import { getUserSlackId } from './users.utils';
+import prisma from '../prisma/prisma';
 
 // build the "due" string for the upcoming deadlines slack message
 const buildDueString = (daysUntilDeadline: number): string => {
@@ -51,3 +52,18 @@ export const sendSlackRequestedReviewNotification = async (slackId: string, chan
   const fullMsg = `Your review has been requested on CR #${changeRequest.crId}: ${changeRequestLink}.`;
   await sendMessage(slackId, fullMsg);
 };
+
+/**
+ * Send Task assigned notification to assignee on Slack
+ * @param slackId the slack id of the assignee
+ * @param task the task they were assigned to
+ */
+export const sendSlackTaskAssignedNotification = async (slackId: string, task: Task): Promise<void> => {
+  if (process.env.NODE_ENV !== 'production') return; // don't send msgs unless in prod
+
+  const project = await prisma.wBS_Element.findUnique({ where: { wbsNumber: task.wbsNum } });
+  const msg = `You have been assigned to a task: ${task.title} on project ${wbsPipe(task.wbsNum)} - ${project?.name}`;
+  const link = `https://finishlinebyner.com/projects/${wbsPipe(task.wbsNum)}/tasks`;
+  const linkButtonText = 'View Task';
+  await sendMessage(slackId, msg, link, linkButtonText);
+};

src/backend/src/utils/tasks.utils.ts

@@ -1,6 +1,7 @@
 import { Task_Priority, Task_Status, User } from '@prisma/client';
-import { isHead, TaskPriority, TaskStatus } from 'shared';
+import { isHead, Task, TaskPriority, TaskStatus } from 'shared';
 import prisma from '../prisma/prisma';
+import { sendSlackTaskAssignedNotification } from './slack.utils';
 
 export const convertTaskPriority = (priority: Task_Priority): TaskPriority =>
   ({
@@ -103,3 +104,17 @@ export const hasPermissionToEditTask = async (user: User, taskId: string): Promi
 
   return false;
 };
+
+/**
+ * Sends a task assigned notification to the specified users on Slack
+ * @param task the task the users are assigned to
+ * @param assigneeIds the user ids of the users assigned to the task
+ */
+export const sendSlackTaskAssignedNotificationToUsers = async (task: Task, assigneeIds: number[]) => {
+  const assigneeSettings = await prisma.user_Settings.findMany({ where: { userId: { in: assigneeIds } } });
+  assigneeSettings.forEach(async (settings) => {
+    if (settings.slackId) {
+      await sendSlackTaskAssignedNotification(settings.slackId, task);
+    }
+  });
+};

src/backend/tests/reimbursement-requests.test.ts

@@ -573,7 +573,7 @@ describe('Reimbursement Requests', () => {
 
   describe('Reimbursement User Tests', () => {
     test('Throws an error if user is a guest', async () => {
-      await expect(ReimbursementRequestService.reimburseUser(100, theVisitor)).rejects.toThrow(
+      await expect(ReimbursementRequestService.reimburseUser(100, '2023-01-11T11:12:33.409Z', theVisitor)).rejects.toThrow(
         new AccessDeniedException('Guests cannot reimburse a user for their expenses.')
       );
     });
@@ -590,7 +590,7 @@ describe('Reimbursement Requests', () => {
         }
       ]);
 
-      await expect(ReimbursementRequestService.reimburseUser(200, batman)).rejects.toThrow(
+      await expect(ReimbursementRequestService.reimburseUser(200, '2023-01-01T09:12:33.409Z', batman)).rejects.toThrow(
         new HttpException(400, 'Reimbursement is greater than the total amount owed to the user')
       );
     });
@@ -602,7 +602,7 @@ describe('Reimbursement Requests', () => {
         reimbursementId: 'reimbursementMockId',
         purchaserId: batman.userId,
         amount: reimbursementAmount,
-        dateCreated: new Date(),
+        dateCreated: new Date('2023-01-01'),
         userSubmitted: batman,
         userSubmittedId: batman.userId
       };
@@ -619,7 +619,11 @@ describe('Reimbursement Requests', () => {
       ]);
       vi.spyOn(prisma.reimbursement, 'create').mockResolvedValue(reimbursementMock);
 
-      const newReimbursement = await ReimbursementRequestService.reimburseUser(reimbursementAmount, batman);
+      const newReimbursement = await ReimbursementRequestService.reimburseUser(
+        reimbursementAmount,
+        '2023-01-01T19:12:33.409Z',
+        batman
+      );
 
       expect(newReimbursement).toStrictEqual(reimbursementTransformer(reimbursementMock));
     });

src/backend/tests/tasks.test.ts

@@ -16,7 +16,16 @@ import {
   taskSaveTheDayPrisma,
   taskSaveTheDayShared
 } from './test-data/tasks.test-data';
-import { aquaman, batman, greenlantern, superman, theVisitor, wonderwoman } from './test-data/users.test-data';
+import {
+  aquaman,
+  batman,
+  batmanSettings,
+  greenlantern,
+  superman,
+  supermanSettings,
+  theVisitor,
+  wonderwoman
+} from './test-data/users.test-data';
 import { prismaWbsElement1 } from './test-data/wbs-element.test-data';
 import { prismaProject1 } from './test-data/projects.test-data';
 import { justiceLeague, prismaTeam1 } from './test-data/teams.test-data';
@@ -129,6 +138,7 @@ describe('Tasks', () => {
       vi.spyOn(teamUtils, 'areUsersPartOfTeams').mockReturnValue(true);
       vi.spyOn(prisma.task, 'create').mockResolvedValue(taskSaveTheDayPrisma);
       vi.spyOn(prisma.user, 'findMany').mockResolvedValue([batman, wonderwoman]);
+      vi.spyOn(prisma.user_Settings, 'findMany').mockResolvedValue([batmanSettings, supermanSettings]);
 
       const task = await TasksService.createTask(batman, mockWBSNum, 'hellow world', '', mockDate, 'HIGH', 'DONE', [
         batman.userId,
@@ -201,7 +211,7 @@ describe('Tasks', () => {
       // Try updating from IN_PROGRESS to IN_BACKLOG
       await expect(() => TasksService.editTaskStatus(aquaman, taskId, Task_Status.IN_BACKLOG)).rejects.toThrow(
         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'
         )
       );
     });
@@ -216,7 +226,7 @@ describe('Tasks', () => {
       // Aquaman is a leader, but did not create this task
       await expect(() => TasksService.editTaskStatus(aquaman, taskId, Task_Status.IN_BACKLOG)).rejects.toThrow(
         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'
         )
       );
     });
@@ -243,6 +253,7 @@ describe('Tasks', () => {
       vi.spyOn(taskTransformer, 'default').mockReturnValue(taskSaveTheDayInProgressShared);
       vi.spyOn(userUtils, 'getUsers').mockResolvedValue([batman, wonderwoman]);
       vi.spyOn(teamUtils, 'areUsersPartOfTeams').mockReturnValue(true);
+      vi.spyOn(prisma.user_Settings, 'findMany').mockResolvedValue([batmanSettings, supermanSettings]);
 
       const taskId = '1';
       const userIds = [
@@ -288,7 +299,7 @@ describe('Tasks', () => {
         TasksService.editTaskAssignees(aquaman, taskId, [superman.userId, wonderwoman.userId])
       ).rejects.toThrow(
         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'
         )
       );
     });
@@ -391,7 +402,11 @@ describe('Tasks', () => {
       vi.spyOn(taskUtils, 'hasPermissionToEditTask').mockResolvedValue(false);
       await expect(() =>
         TasksService.editTask(wonderwoman, taskId, fakeTitle, fakeNotes, fakePriority, fakeDeadline)
-      ).rejects.toThrow(new AccessDeniedException());
+      ).rejects.toThrow(
+        new AccessDeniedException(
+          'Only admins, app admins, heads, task creators, project leads, project managers, or project assignees can edit a task'
+        )
+      );
     });
 
     test('Task not found', async () => {

src/frontend/src/apis/change-requests.api.ts

@@ -141,3 +141,12 @@ export const addProposedSolution = (
     budgetImpact
   });
 };
+
+/**
+ * Request reviewers in change request
+ * @param crId The ID of the associated change request.
+ * @param crReviewData The data to request reviewers
+ */
+export const requestCRReview = (crId: string, crReviewData: { userIds: number[] }) => {
+  return axios.post<{ message: string }>(apiUrls.changeRequestRequestReviewer(crId), crReviewData);
+};