#4148: fixed merge confilcts

Author: jasperpinkus

.ebextensions/03_ssh_keys.config

@@ -0,0 +1,33 @@
+files:
+  "/tmp/add_authorized_keys.sh":
+    mode: "000755"
+    owner: root
+    group: root
+    content: |
+      #!/bin/bash
+      AUTHORIZED_KEYS="/home/ec2-user/.ssh/authorized_keys"
+      mkdir -p /home/ec2-user/.ssh
+      touch "$AUTHORIZED_KEYS"
+      chown ec2-user:ec2-user /home/ec2-user/.ssh
+      chmod 700 /home/ec2-user/.ssh
+
+      add_key() {
+        local key="$1"
+        if ! grep -qF "$key" "$AUTHORIZED_KEYS"; then
+          echo "$key" >> "$AUTHORIZED_KEYS"
+        fi
+      }
+
+      # Chris Pyle
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqV5gwot3utGLPGpAPWr8znU1cjMn1RE7jN8htvaOMt aws-eb"
+
+      # Sean Walker
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICf1UhVM+65hiKahvdvEj20ohDu+bZVS+btVFJTtg0oP seanwalker@Seans-MacBook-Pro-2.local"
+
+      chown ec2-user:ec2-user "$AUTHORIZED_KEYS"
+      chmod 600 "$AUTHORIZED_KEYS"
+
+commands:
+  add_authorized_keys:
+    command: "/tmp/add_authorized_keys.sh"
+    ignoreErrors: false

infrastructure/modules/elasticbeanstalk/variables.tf

@@ -14,7 +14,7 @@ variable "solution_stack_name" {
   description = "Elastic Beanstalk solution stack name"
   type        = string
   # Find the latest: aws elasticbeanstalk list-available-solution-stacks
-  default     = "64bit Amazon Linux 2023 v4.7.4 running Docker"
+  default     = "64bit Amazon Linux 2023 v4.11.0 running Docker"
 }
 
 variable "vpc_id" {

infrastructure/modules/monitoring/main.tf

@@ -357,6 +357,10 @@ resource "aws_cloudwatch_metric_alarm" "eb_memory_high" {
     Environment = var.environment
     Project     = var.project_name
   }
+
+  lifecycle {
+    ignore_changes = [metric_query]
+  }
 }
 
 #############

infrastructure/modules/network/main.tf

@@ -164,6 +164,14 @@ resource "aws_security_group" "eb_instance" {
     security_groups = [aws_security_group.alb.id]
   }
 
+  ingress {
+    description = "SSH access"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   egress {
     description = "Allow all outbound traffic"
     from_port   = 0

infrastructure/scripts/ssh-to-eb.sh

@@ -58,6 +58,7 @@ echo "🔌 Connecting to EB instance..."
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 echo "Instance: $INSTANCE_IP ($INSTANCE_ID)"
+echo "Direct SSH: ssh -i $KEY_PATH_EXPANDED ec2-user@$INSTANCE_IP"
 echo "User: ec2-user"
 echo ""
 echo "Useful commands once connected:"

src/backend/custom.d.ts

@@ -1,11 +1,12 @@
-import { Organization } from '@prisma/client';
+import { Organization, Prisma } from '@prisma/client';
 import { User as SharedUser } from 'shared';
 
 declare global {
   namespace Express {
     export interface Request {
       currentUser: SharedUser;
       organization: Organization;
+      currentCar?: Prisma.CarGetPayload<{ include: { wbsElement: true } }>;
     }
   }
 }

src/backend/index.ts

@@ -3,6 +3,7 @@ import cors from 'cors';
 import cookieParser from 'cookie-parser';
 import { getUserAndOrganization, prodHeaders, requireJwtDev, requireJwtProd } from './src/utils/auth.utils.js';
 import { errorHandler } from './src/utils/errors.utils.js';
+import { getCurrentCar } from './src/utils/car.utils.js';
 import userRouter from './src/routes/users.routes.js';
 import projectRouter from './src/routes/projects.routes.js';
 import teamsRouter from './src/routes/teams.routes.js';
@@ -90,6 +91,9 @@ app.use(isProd ? requireJwtProd : requireJwtDev);
 // get user and organization
 app.use(getUserAndOrganization);
 
+// get current car
+app.use(getCurrentCar);
+
 // routes
 app.use('/users', userRouter);
 app.use('/projects', projectRouter);

src/backend/src/controllers/attendance.controllers.ts

@@ -21,6 +21,16 @@ export default class AttendanceController {
     }
   }
 
+  static async getAttendanceById(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { meetingAttendanceId } = req.params as Record<string, string>;
+      const attendance = await AttendanceService.getAttendanceById(meetingAttendanceId, req.organization);
+      res.status(200).json(attendance);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOngoingAttendance(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;

src/backend/src/controllers/calendar.controllers.ts

@@ -596,4 +596,18 @@ export default class CalendarController {
       next(error);
     }
   }
+
+  static async getAllEventsPaginated(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { cursor, pageSize } = req.body;
+      const paginatedEvents = await CalendarService.getAllEventsPaginated(
+        req.organization,
+        cursor ? new Date(cursor) : undefined,
+        pageSize ? parseInt(pageSize) : undefined
+      );
+      res.status(200).json(paginatedEvents);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -16,7 +16,16 @@ export default class ChangeRequestsController {
 
   static async getAllChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getAllChangeRequests(req.organization);
+      const changeRequests = await ChangeRequestsService.getAllChangeRequests(req.organization, req.currentCar?.carId);
+      res.status(200).json(changeRequests);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllGuestChangeRequests(req: Request, res: Response, next: NextFunction) {
+    try {
+      const changeRequests = await ChangeRequestsService.getAllGuestChangeRequests(req.organization);
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);
@@ -25,7 +34,11 @@ export default class ChangeRequestsController {
 
   static async getToReviewChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getToReviewChangeRequests(req.currentUser, req.organization);
+      const changeRequests = await ChangeRequestsService.getToReviewChangeRequests(
+        req.currentUser,
+        req.organization,
+        req.currentCar?.carId
+      );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);
@@ -41,7 +54,8 @@ export default class ChangeRequestsController {
       const changeRequests = await ChangeRequestsService.getUnreviewedChangeRequests(
         req.currentUser,
         validatedWbs,
-        req.organization
+        req.organization,
+        req.currentCar?.carId
       );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
@@ -58,7 +72,8 @@ export default class ChangeRequestsController {
       const changeRequests = await ChangeRequestsService.getApprovedChangeRequests(
         req.currentUser,
         validatedWbs,
-        req.organization
+        req.organization,
+        req.currentCar?.carId
       );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {