Merge pull request #3039 from Northeastern-Electric-Racing/Multitenancy-to-Develop

Forward MultitenancyChanges

Author: Peyton-McKee

.github/workflows/production-build.yml

@@ -0,0 +1,25 @@
+
+name: Production Build
+
+on:
+  push:
+    branches:
+      - main
+      - multitenancy
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.17.1
+          cache: 'yarn'
+      - name: Yarn Install
+        run: yarn install
+      - name: Run Tests
+        run: yarn containerize

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1
+FROM node:20
 WORKDIR /base
 
 COPY package.json tsconfig.build.json ./

src/backend/Dockerfile

@@ -1,5 +1,5 @@
 # TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
-FROM node:18
+FROM node:20
 
 WORKDIR /base
 

src/backend/index.ts

@@ -19,6 +19,7 @@ import organizationRouter from './src/routes/organizations.routes';
 import recruitmentRouter from './src/routes/recruitment.routes';
 
 const app = express();
+
 const port = process.env.PORT || 3001;
 const isProd = process.env.NODE_ENV === 'production';
 
@@ -68,7 +69,7 @@ app.use('/cars', carsRouter);
 app.use('/organizations', organizationRouter);
 app.use('/recruitment', recruitmentRouter);
 app.use('/', (_req, res) => {
-  res.json('Welcome to FinishLine');
+  res.status(200).json('Welcome to FinishLine');
 });
 
 // custom error handler middleware

src/backend/package.json

@@ -14,7 +14,7 @@
     "@types/concat-stream": "^2.0.0",
     "@types/cookie-parser": "^1.4.3",
     "@types/cors": "^2.8.12",
-    "@types/express": "^4.17.6",
+    "@types/express": "^5.0.0",
     "@types/multer": "^1.4.7",
     "@types/nodemailer": "^6.4.0",
     "body-parser": "^1.19.0",
@@ -23,7 +23,7 @@
     "cors": "^2.8.5",
     "decimal.js": "^10.4.3",
     "dotenv": "^16.0.1",
-    "express": "^4.17.1",
+    "express": "^5.0.0",
     "express-jwt": "^7.7.5",
     "express-validator": "^6.14.2",
     "google-auth-library": "^8.1.1",

src/backend/src/controllers/cars.controllers.ts

@@ -6,9 +6,9 @@ export default class CarsController {
     try {
       const cars = await CarsService.getAllCars(req.organization);
 
-      return res.status(200).json(cars);
+      res.status(200).json(cars);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -17,9 +17,9 @@ export default class CarsController {
       const { name } = req.body;
       const car = await CarsService.createCar(req.organization, req.currentUser, name);
 
-      return res.status(201).json(car);
+      res.status(201).json(car);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 }

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

@@ -7,18 +7,18 @@ export default class ChangeRequestsController {
       const { crId } = req.params;
 
       const cr = await ChangeRequestsService.getChangeRequestByID(crId, req.organization);
-      return res.status(200).json(cr);
+      res.status(200).json(cr);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
   static async getAllChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
       const changeRequests = await ChangeRequestsService.getAllChangeRequests(req.organization);
-      return res.status(200).json(changeRequests);
+      res.status(200).json(changeRequests);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -33,9 +33,9 @@ export default class ChangeRequestsController {
         req.organization,
         psId
       );
-      return res.status(200).json({ message: `Change request #${id} successfully reviewed.` });
+      res.status(200).json({ message: `Change request #${id} successfully reviewed.` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -55,9 +55,9 @@ export default class ChangeRequestsController {
         confirmDetails,
         req.organization
       );
-      return res.status(200).json({ message: `Successfully created activation change request with id #${id}` });
+      res.status(200).json({ message: `Successfully created activation change request with id #${id}` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -73,9 +73,9 @@ export default class ChangeRequestsController {
         confirmDone,
         req.organization
       );
-      return res.status(200).json({ message: `Successfully created stage gate request with id #${id}` });
+      res.status(200).json({ message: `Successfully created stage gate request with id #${id}` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -99,9 +99,9 @@ export default class ChangeRequestsController {
         projectProposedChanges,
         workPackageProposedChanges
       );
-      return res.status(200).json(createdCR);
+      res.status(200).json(createdCR);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -117,9 +117,9 @@ export default class ChangeRequestsController {
         scopeImpact,
         req.organization
       );
-      return res.status(200).json({ message: `Successfully added proposed solution with id #${id}` });
+      res.status(200).json({ message: `Successfully added proposed solution with id #${id}` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -128,9 +128,9 @@ export default class ChangeRequestsController {
       const { crId } = req.params;
 
       await ChangeRequestsService.deleteChangeRequest(req.currentUser, crId, req.organization);
-      return res.status(200).json({ message: `Successfully deleted change request #${crId}` });
+      res.status(200).json({ message: `Successfully deleted change request #${crId}` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -140,9 +140,9 @@ export default class ChangeRequestsController {
       const { crId } = req.params;
 
       await ChangeRequestsService.requestCRReview(req.currentUser, userIds, crId, req.organization);
-      return res.status(200).json({ message: `Successfully requested reviewer(s) to change request #${crId}` });
+      res.status(200).json({ message: `Successfully requested reviewer(s) to change request #${crId}` });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 }

src/backend/src/controllers/description-bullets.controllers.ts

@@ -10,18 +10,18 @@ export default class DescriptionBulletsController {
         descriptionId,
         req.organization
       );
-      return res.status(200).json(updatedDB);
+      res.status(200).json(updatedDB);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
   static async getAllDescriptionBulletTypes(req: Request, res: Response, next: NextFunction) {
     try {
       const descriptionBulletTypes = await DescriptionBulletsService.getAllDescriptionBulletTypes(req.organization);
-      return res.status(200).json(descriptionBulletTypes);
+      res.status(200).json(descriptionBulletTypes);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -37,7 +37,7 @@ export default class DescriptionBulletsController {
       );
       res.status(201).json(newDescriptionBulletType);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -52,9 +52,9 @@ export default class DescriptionBulletsController {
         projectRequired,
         req.organization
       );
-      return res.status(200).json(updatedDescriptionBulletType);
+      res.status(200).json(updatedDescriptionBulletType);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 }

src/backend/src/controllers/design-reviews.controllers.ts

@@ -6,19 +6,19 @@ export default class DesignReviewsController {
   static async getAllDesignReviews(req: Request, res: Response, next: NextFunction) {
     try {
       const designReviews = await DesignReviewsService.getAllDesignReviews(req.organization);
-      return res.status(200).json(designReviews);
+      res.status(200).json(designReviews);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
   static async deleteDesignReview(req: Request, res: Response, next: NextFunction) {
     try {
       const drId: string = req.params.designReviewId;
       const deletedDesignReview = await DesignReviewsService.deleteDesignReview(req.currentUser, drId, req.organization);
-      return res.status(200).json(deletedDesignReview);
+      res.status(200).json(deletedDesignReview);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -36,9 +36,9 @@ export default class DesignReviewsController {
         meetingTimes,
         req.organization
       );
-      return res.status(200).json(createdDesignReview);
+      res.status(200).json(createdDesignReview);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -47,9 +47,9 @@ export default class DesignReviewsController {
       const drId: string = req.params.designReviewId;
 
       const designReview = await DesignReviewsService.getSingleDesignReview(req.currentUser, drId, req.organization);
-      return res.status(200).json(designReview);
+      res.status(200).json(designReview);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -90,9 +90,9 @@ export default class DesignReviewsController {
         meetingTimes,
         req.organization
       );
-      return res.status(200).json({ message: 'Design Review updated successfully' });
+      res.status(200).json({ message: 'Design Review updated successfully' });
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -109,9 +109,9 @@ export default class DesignReviewsController {
         user,
         req.organization
       );
-      return res.status(200).json(updatedDesignReview);
+      res.status(200).json(updatedDesignReview);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -127,9 +127,9 @@ export default class DesignReviewsController {
         status,
         req.organization
       );
-      return res.status(200).json(updatedDesignReview);
+      res.status(200).json(updatedDesignReview);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 }

…/controllers/organizations.controller.ts …controllers/organizations.controllers.tssrc/backend/src/controllers/organizations.controller.ts renamed to src/backend/src/controllers/organizations.controllers.ts src/backend/src/controllers/organizations.controller.ts renamed to src/backend/src/controllers/organizations.controllers.ts

@@ -5,19 +5,19 @@ export default class OrganizationsController {
   static async getCurrentOrganization(req: Request, res: Response, next: NextFunction) {
     try {
       const organization = await OrganizationsService.getCurrentOrganization(req.organization.organizationId);
-      return res.status(200).json(organization);
+      res.status(200).json(organization);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
   static async setUsefulLinks(req: Request, res: Response, next: NextFunction) {
     try {
       const { links } = req.body;
       const newLinks = await OrganizationsService.setUsefulLinks(req.currentUser, req.organization.organizationId, links);
-      return res.status(200).json(newLinks);
+      res.status(200).json(newLinks);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
 
@@ -38,17 +38,17 @@ export default class OrganizationsController {
         req.organization
       );
 
-      return res.status(200).json(newImages);
+      res.status(200).json(newImages);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }
   static async getAllUsefulLinks(req: Request, res: Response, next: NextFunction) {
     try {
       const links = await OrganizationsService.getAllUsefulLinks(req.organization.organizationId);
-      return res.status(200).json(links);
+      res.status(200).json(links);
     } catch (error: unknown) {
-      return next(error);
+      next(error);
     }
   }