Merge branch 'develop' into #1183-delete-team-endpoint

Author: walker-sean

Dockerfile

@@ -6,8 +6,7 @@ COPY yarn.lock .
 COPY tsconfig.build.json .
 COPY ./src/backend/package.json src/backend/
 COPY ./src/shared/package.json src/shared/
-RUN yarn plugin import workspace-tools
-RUN yarn workspace focus --production backend
+RUN yarn install
 COPY ./src/backend src/backend
 COPY ./src/shared src/shared
 RUN yarn prisma:generate

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/package.json

@@ -25,7 +25,6 @@
     "jsonwebtoken": "^8.5.1",
     "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.1",
-    "prisma": "^4.4.0",
     "shared": "1.0.0"
   },
   "devDependencies": {

src/backend/src/controllers/projects.controllers.ts

@@ -31,7 +31,9 @@ export default class ProjectsController {
       const user: User = await getCurrentUser(res);
       const { crId, carNumber, name, summary, teamId } = req.body;
 
-      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(user, crId, carNumber, name, summary, teamId);
+      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(user, crId, carNumber, name, summary, [
+        teamId
+      ]);
 
       return res.status(200).json(wbsPipe(createdWbsNumber));
     } catch (error: unknown) {

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);
@@ -182,6 +182,10 @@ export default class ReimbursementRequestsController {
 
       const receipt = await ReimbursementRequestService.uploadReceipt(requestId, file, user);
 
+      const isProd = process.env.NODE_ENV === 'production';
+      const origin = isProd ? 'https://finishlinebyner.com' : 'http://localhost:3000';
+
+      res.header('Access-Control-Allow-Origin', origin);
       res.status(200).json(receipt);
     } catch (error: unknown) {
       next(error);

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

@@ -62,15 +62,27 @@ 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);
+    }
+  }
+  
   static async deleteTeam(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params;
       const deleter = await getCurrentUser(res);
       await TeamsService.deleteTeam(deleter, teamId);
       return res.status(204).json({ message: `Successfully deleted team with id ${teamId}` });
-    } catch (error: unknown) {
+      } 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/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/change-requests.services.ts

@@ -118,16 +118,12 @@ export default class ChangeRequestsService {
         await prisma.project.update({
           where: { projectId: foundCR.wbsElement.project.projectId },
           data: {
-            budget: newBudget,
-            wbsElement: {
-              update: {
-                changes: {
-                  create: change
-                }
-              }
-            }
+            budget: newBudget
           }
         });
+
+        //Make the associated budget change if there was a change
+        if (change) await prisma.change.create({ data: change });
       } else if (foundCR.wbsElement.workPackage) {
         // get the project for the work package
         const wpProj = await prisma.project.findUnique({
@@ -167,26 +163,22 @@ export default class ChangeRequestsService {
               update: {
                 where: { workPackageId: foundCR.wbsElement.workPackage.workPackageId },
                 data: {
-                  duration: updatedDuration,
-                  wbsElement: {
-                    update: {
-                      changes: {
-                        create: changes[1]
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            wbsElement: {
-              update: {
-                changes: {
-                  create: changes[0]
+                  duration: updatedDuration
                 }
               }
             }
           }
         });
+
+        //Making associated changes
+        const changePromises = changes.map(async (change) => {
+          //Checking if change is not zero so we dont make changes for zero budget or timeline impact
+          if (change) {
+            await prisma.change.create({ data: change });
+          }
+        });
+
+        await Promise.all(changePromises);
       }
 
       // finally update the proposed solution
@@ -298,12 +290,6 @@ export default class ChangeRequestsService {
       });
     }
 
-    // send the creator of the cr a slack notification that their cr was reviewed
-    const creatorUserSettings = await prisma.user_Settings.findUnique({ where: { userId: foundCR.submitterId } });
-    if (creatorUserSettings && creatorUserSettings.slackId) {
-      await sendSlackCRReviewedNotification(creatorUserSettings.slackId, foundCR.crId);
-    }
-
     // finally we can update change request
     const updated = await prisma.change_Request.update({
       where: { crId },
@@ -316,6 +302,18 @@ export default class ChangeRequestsService {
       include: { activationChangeRequest: true, wbsElement: { include: { workPackage: true } } }
     });
 
+    // send the creator of the cr a slack notification that their cr was reviewed
+    const creatorUserSettings = await prisma.user_Settings.findUnique({ where: { userId: foundCR.submitterId } });
+    if (creatorUserSettings && creatorUserSettings.slackId) {
+      try {
+        await sendSlackCRReviewedNotification(creatorUserSettings.slackId, foundCR.crId);
+      } catch (err: unknown) {
+        if (err instanceof Error) {
+          throw new HttpException(500, `Failed to send slack notification: ${err.message}`);
+        }
+      }
+    }
+
     return updated.crId;
   }
 

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