Merge branch 'develop' into feature/bom-improvement-pt2

Author: wavehassman

.github/workflows/system-tests.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - multitenancy
       - develop
       - feature/**
 

.gitignore

@@ -70,4 +70,5 @@ eb-deploy/
 
 # Claude Code Files
 CLAUDE.md
-.playwright-mcp/
+.playwright-mcp/
+docs/

Dockerfile

@@ -1,5 +1,5 @@
 # Build stage - compile TypeScript
-FROM node:20 AS builder
+FROM node:25 AS builder
 WORKDIR /app
 
 COPY package.json tsconfig.build.json ./
@@ -11,11 +11,11 @@ RUN cd src/backend && npx prisma generate
 RUN yarn build:shared
 RUN yarn build:backend
 
-FROM node:20-slim
+FROM platformatic/node-caged:25-slim
 WORKDIR /app
 
 # Install OpenSSL for Prisma (slim image needs this)
-RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/* && npm install -g yarn
 
 COPY package.json ./
 

devContainerization/Dockerfile.backend.dev

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:25
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/

devContainerization/Dockerfile.frontend.dev

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:25-alpine
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/frontend/package.json ./src/frontend/tsconfig.json src/frontend/
@@ -11,4 +11,4 @@ COPY ./src/frontend src/frontend
 COPY ./src/shared src/shared
 
 EXPOSE 3000
-CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]
+CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]

package.json

@@ -86,7 +86,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@types/canvas-confetti": "^1.9.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "20.0.0",
+    "@types/node": "^25.0.0",
     "@typescript-eslint/eslint-plugin": "8.20.0",
     "@typescript-eslint/parser": "8.20.0",
     "concurrently": "^9.1.0",

src/backend/Dockerfile

@@ -1,5 +1,6 @@
 # TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
-FROM node:20
+FROM platformatic/node-caged:25-slim
+RUN npm install -g yarn
 
 WORKDIR /base
 

src/backend/package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@types/express-jwt": "^6.0.4",
     "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^20.0.0",
+    "@types/node": "^25.0.0",
     "@types/supertest": "^2.0.12",
     "nodemon": "^2.0.16",
     "supertest": "^6.2.4",

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

@@ -140,6 +140,25 @@ export default class ChangeRequestsController {
     }
   }
 
+  static async createLeadershipChangeRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { wbsNum, leadId, managerId } = req.body;
+
+      const cr = await ChangeRequestsService.createLeadershipChangeRequest(
+        req.currentUser,
+        wbsNum.carNumber,
+        wbsNum.projectNumber,
+        wbsNum.workPackageNumber,
+        leadId,
+        managerId,
+        req.organization
+      );
+      res.status(200).json(cr);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createStandardChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
       const { wbsNum, type, what, why, proposedSolutions, projectProposedChanges, workPackageProposedChanges } = req.body;

src/backend/src/controllers/organizations.controllers.ts

@@ -22,28 +22,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async setImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { applyInterestImage = [], exploreAsGuestImage = [] } = req.files as {
-        applyInterestImage?: Express.Multer.File[];
-        exploreAsGuestImage?: Express.Multer.File[];
-      };
-
-      const applyInterestFile = applyInterestImage[0] || null;
-      const exploreAsGuestFile = exploreAsGuestImage[0] || null;
-
-      const newImages = await OrganizationsService.setImages(
-        applyInterestFile,
-        exploreAsGuestFile,
-        req.currentUser,
-        req.organization
-      );
-
-      res.status(200).json(newImages);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
   static async getAllUsefulLinks(req: Request, res: Response, next: NextFunction) {
     try {
       const links = await OrganizationsService.getAllUsefulLinks(req.organization.organizationId);
@@ -97,15 +75,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async getOrganizationImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const images = await OrganizationsService.getOrganizationImages(req.organization.organizationId);
-      res.status(200).json(images);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async setOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const { projectIds } = req.body;
@@ -142,6 +111,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformLogoImage(req: Request, res: Response, next: NextFunction) {
+    try {
+      if (!req.file) {
+        throw new HttpException(400, 'Invalid or undefined image data');
+      }
+
+      const updatedOrg = await OrganizationsService.setPlatformLogoImage(req.file, req.currentUser, req.organization);
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async setNewMemberImage(req: Request, res: Response, next: NextFunction) {
     try {
       if (!req.file) {
@@ -181,6 +164,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformDescription(req: Request, res: Response, next: NextFunction) {
+    try {
+      const updatedOrg = await OrganizationsService.setPlatformDescription(
+        req.body.platformDescription,
+        req.currentUser,
+        req.organization
+      );
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const featuredProjects = await OrganizationsService.getOrganizationFeaturedProjects(req.organization.organizationId);