Merge branch 'develop' into #4037-JasperPinkus-credits

Author: jasperpinkus

.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/index.ts

@@ -27,6 +27,7 @@ import partsRouter from './src/routes/parts.routes.js';
 import financeRouter from './src/routes/finance.routes.js';
 import calendarRouter from './src/routes/calendar.routes.js';
 import prospectiveSponsorRouter from './src/routes/prospective-sponsor.routes.js';
+import attendanceRouter from './src/routes/attendance.routes.js';
 
 const app = express();
 
@@ -112,6 +113,7 @@ app.use('/parts', partsRouter);
 app.use('/finance', financeRouter);
 app.use('/calendar', calendarRouter);
 app.use('/prospective-sponsors', prospectiveSponsorRouter);
+app.use('/attendance', attendanceRouter);
 app.use('/', (_req, res) => {
   res.status(200).json('Welcome to FinishLine');
 });

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/attendance.controllers.ts

@@ -0,0 +1,53 @@
+import { NextFunction, Request, Response } from 'express';
+import AttendanceService from '../services/attendance.services.js';
+
+export default class AttendanceController {
+  static async takeAttendance(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId, message } = req.body;
+      const attendance = await AttendanceService.takeAttendance(req.currentUser, teamId, message, req.organization);
+      res.status(200).json(attendance);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllAttendances(req: Request, res: Response, next: NextFunction) {
+    try {
+      const attendances = await AttendanceService.getAllAttendances(req.organization);
+      res.status(200).json(attendances);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getOngoingAttendance(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId } = req.params as Record<string, string>;
+      const attendance = await AttendanceService.getOngoingAttendance(teamId, req.organization);
+      res.status(200).json(attendance);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async closeOngoingAttendance(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId } = req.params as Record<string, string>;
+      await AttendanceService.closeOngoingAttendance(teamId, req.currentUser, req.organization);
+      res.status(200).json({ message: 'Attendance closed successfully' });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async checkChannel(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { teamId } = req.params as Record<string, string>;
+      const result = await AttendanceService.checkTeamChannel(teamId, req.organization);
+      res.status(200).json(result);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+}

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);