Merge branch 'develop' into slack-rr-integrations

Author: chpy04

docker-compose.yml

@@ -40,7 +40,7 @@ services:
     container_name: frontend-dev
     build:
       context: ./
-      dockerfile: devContainerization/Dockerfile.frontend.dev
+      dockerfile: src/frontend/Dockerfile
     ports:
       - '3000:3000'
     volumes:

src/backend/Dockerfile

@@ -3,7 +3,7 @@ FROM node:20
 
 WORKDIR /base
 
-COPY package.json .yarn tsconfig.build.json ./
+COPY package.json tsconfig.build.json ./
 COPY ./src/backend src/backend
 COPY ./src/shared src/shared
 

src/backend/src/controllers/users.controllers.ts

@@ -21,6 +21,15 @@ export default class UsersController {
     }
   }
 
+  static async getAllMembers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const users = await UsersService.getAllOrgMembers(req.organization.organizationId);
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getCurrentUser(req: Request, res: Response, next: NextFunction) {
     try {
       const user = await UsersService.getCurrentUser(req.currentUser);

src/backend/src/routes/users.routes.ts

@@ -8,6 +8,7 @@ const userRouter = express.Router();
 
 userRouter.get('/', UsersController.getAllUsers);
 userRouter.get('/organization', UsersController.getAllOrgUsers);
+userRouter.get('/members', UsersController.getAllMembers);
 userRouter.post(
   '/scheduleSettings',
   body('userIds').isArray(),

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

@@ -280,6 +280,14 @@ export default class ChangeRequestsService {
     if (reviewer.userId === foundCR.submitterId)
       throw new AccessDeniedException("You can't review your own change request!");
 
+    // verify that if there are requested reviewers, the reviewer is one of them
+    if (foundCR.requestedReviewers.length > 0) {
+      const isRequestedReviewer = foundCR.requestedReviewers.some((user) => user.userId === reviewer.userId);
+      if (!isRequestedReviewer) {
+        throw new AccessDeniedException('Only requested reviewers can review this change request!');
+      }
+    }
+
     // ScopeChange Request That Has Been Accepted Being Reviewed
     if (foundCR.scopeChangeRequest && accepted) {
       await this.reviewScopeChangeRequest(foundCR, reviewer, psId, organization);

src/backend/src/services/finance.services.ts

@@ -434,13 +434,31 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              wbsElement: {
+                project: {
+                  projectId
+                }
+              }
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
     const { pendingFinance, pendingLeadership, submittedToSabo, reimbursed } = computeRRTotals(reimbursementRequests);
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0) / 100;
+    const totalBalance =
+      reimbursementRequests.reduce((acc, curr) => {
+        const projectProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        return acc + projectProductsCost;
+      }, 0) / 100;
 
     const available = project.budget - totalBalance;
 
@@ -507,15 +525,37 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              wbsElement: {
+                project: {
+                  teams: {
+                    some: {
+                      teamId
+                    }
+                  }
+                }
+              }
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
     const totalBudget = team.projects.reduce((acc, curr) => acc + curr.budget, 0);
 
     const { pendingFinance, pendingLeadership, submittedToSabo, reimbursed } = computeRRTotals(reimbursementRequests);
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0) / 100;
+    const totalBalance =
+      reimbursementRequests.reduce((acc, curr) => {
+        const teamProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        return acc + teamProductsCost;
+      }, 0) / 100;
 
     const available = totalBudget - totalBalance;
 
@@ -910,7 +950,17 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              otherReasonId
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
@@ -935,7 +985,8 @@ export default class FinanceServices {
       const lastStatus = req.reimbursementStatuses.at(-1)?.type;
 
       if (lastStatus && totals[lastStatus] !== undefined) {
-        totals[lastStatus] += req.totalCost;
+        const categoryProductsCost = req.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        totals[lastStatus] += categoryProductsCost;
       }
     });
 
@@ -944,7 +995,10 @@ export default class FinanceServices {
     const submittedToSabo = totals[Reimbursement_Status_Type.SABO_SUBMITTED] ?? 0;
     const reimbursed = totals[Reimbursement_Status_Type.REIMBURSED] ?? 0;
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0);
+    const totalBalance = reimbursementRequests.reduce((acc, curr) => {
+      const categoryProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+      return acc + categoryProductsCost;
+    }, 0);
 
     const available = totalBudget - totalBalance;
 

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

@@ -242,7 +242,7 @@ export default class ReimbursementRequestService {
     dateOfExpense?: Date
   ): Promise<ReimbursementRequest> {
     if (await userHasPermission(recipient.userId, organization.organizationId, isGuest))
-      throw new AccessDeniedGuestException('Guests cannot create a reimbursement request');
+      throw new AccessDeniedGuestException('create a reimbursement request');
 
     if (!recipient.userSecureSettings) throw new HttpException(500, 'User does not have their finance settings set up');
 

src/backend/src/services/users.services.ts

@@ -1,4 +1,4 @@
-import { User_Settings, Organization } from '@prisma/client';
+import { User_Settings, Organization, Role_Type } from '@prisma/client';
 import { OAuth2Client } from 'google-auth-library/build/src/auth/oauth2client';
 import {
   Role,
@@ -59,6 +59,28 @@ export default class UsersService {
     return users.map(userTransformer);
   }
 
+  static async getAllOrgMembers(organizationId: string): Promise<User[]> {
+    const users = await prisma.user.findMany({
+      where: {
+        organizations: {
+          some: {
+            organizationId,
+            roles: {}
+          }
+        },
+        roles: {
+          some: {
+            AND: [{ NOT: { roleType: Role_Type.GUEST } }, { organizationId }]
+          }
+        }
+      },
+      ...getUserQueryArgs(organizationId),
+      orderBy: { lastName: 'asc' }
+    });
+
+    return users.map(userTransformer);
+  }
+
   static async getCurrentUser(user: User): Promise<AuthenticatedUser> {
     const userWithOrgs = await prisma.user.findUnique({ where: { userId: user.userId }, include: { organizations: true } });
 

src/backend/src/utils/finance.utils.ts

@@ -114,6 +114,7 @@ export const computeRRTotals = (
       reimbursementStatusId: string;
       userId: string;
     }[];
+    reimbursementProducts?: { cost: number }[];
   }[]
 ): {
   pendingFinance: number;
@@ -132,7 +133,11 @@ export const computeRRTotals = (
     const lastStatus = req.reimbursementStatuses.at(-1)?.type;
 
     if (lastStatus && totals[lastStatus] !== undefined) {
-      totals[lastStatus] += req.totalCost;
+      // If reimbursementProducts are provided, sum their costs; otherwise use totalCost
+      const costToAdd = req.reimbursementProducts
+        ? req.reimbursementProducts.reduce((acc, prod) => acc + prod.cost, 0)
+        : req.totalCost;
+      totals[lastStatus] += costToAdd;
     }
   });