Merge branch 'develop' into #2137-attendance-tracker-tool

Author: RChandler234

.github/workflows/run-tests.yml

@@ -27,7 +27,15 @@ jobs:
         with:
           node-version: 18.17.1
           cache: 'yarn'
+      - name: Add Env Variables
+        run: cd src/backend && echo "DATABASE_URL=\"postgresql://postgres:docker@localhost:5432/nerpm?schema=public\"" >> .env
+      - name: Pull Docker Image
+        run: docker run --name finishline -e POSTGRES_PASSWORD=docker -p 5432:5432 -d postgres
+      - name: Wait for Postgres to start
+        run: sleep 10s
+      - name: Create Database
+        run: docker exec finishline psql -U postgres -c "CREATE DATABASE nerpm;"
       - name: Install modules
-        run: yarn install && yarn prisma:generate
+        run: yarn install && yarn prisma:generate && yarn prisma:migrate:prod
       - name: Run tests
         run: yarn test:backend; yarn test:frontend

.github/workflows/task-deadline-notifications.yml

@@ -0,0 +1,14 @@
+name: Send Task Deadline Notifications
+
+on:
+  schedule:
+    - cron: '0 9 * * *'
+
+jobs:
+  send_notifications:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send notifications
+        run: |
+          curl -X POST https://api.finishlinebyner.com/notifications/task-deadlines \
+          -H 'Authorization: ${{ secrets.NOTIFICATION_ENDPOINT_SECRET }}'

package.json

@@ -25,6 +25,8 @@
     "test:frontend": "yarn workspace shared build; yarn workspace frontend test",
     "test:backend": "yarn workspace shared build; yarn workspace backend test",
     "test": "yarn test:backend && yarn test:frontend",
+    "test:setup": "echo 'DATABASE_URL=\"postgresql://postgres:docker@localhost:5433/nerpm?schema=public\"' >> src/backend/.env && docker run --name finishline_test -e POSTGRES_PASSWORD=docker -p 5433:5432 -d postgres && sleep 5 && docker exec finishline_test psql -U postgres -c \"CREATE DATABASE nerpm;\" && yarn prisma:migrate:prod",
+    "test:teardown": "docker stop finishline_test && docker rm finishline_test && echo 'DATABASE_URL=\"postgresql://postgres:docker@localhost:5432/nerpm?schema=public\"' >> src/backend/.env",
     "build": "yarn run build:backend && yarn run build:shared && yarn run build:frontend",
     "build:backend": "yarn workspace backend build",
     "build:shared": "yarn workspace shared build",

src/backend/index.ts

@@ -11,6 +11,8 @@ import changeRequestsRouter from './src/routes/change-requests.routes';
 import descriptionBulletsRouter from './src/routes/description-bullets.routes';
 import tasksRouter from './src/routes/tasks.routes';
 import reimbursementRequestsRouter from './src/routes/reimbursement-requests.routes';
+import notificationsRouter from './src/routes/notifications.routes';
+import designReviewsRouter from './src/routes/design-reviews.routes';
 
 const app = express();
 const port = process.env.PORT || 3001;
@@ -52,6 +54,8 @@ app.use('/change-requests', changeRequestsRouter);
 app.use('/description-bullets', descriptionBulletsRouter);
 app.use('/tasks', tasksRouter);
 app.use('/reimbursement-requests', reimbursementRequestsRouter);
+app.use('/design-reviews', designReviewsRouter);
+app.use('/notifications', notificationsRouter);
 app.use('/', (_req, res) => {
   res.json('Welcome to FinishLine');
 });

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

@@ -0,0 +1,119 @@
+import { NextFunction, Request, Response } from 'express';
+import DesignReviewsService from '../services/design-reviews.services';
+import { getCurrentUser } from '../utils/auth.utils';
+import { User } from '@prisma/client';
+
+export default class DesignReviewsController {
+  static async getAllDesignReviews(_req: Request, res: Response, next: NextFunction) {
+    try {
+      const designReviews = await DesignReviewsService.getAllDesignReviews();
+      return res.status(200).json(designReviews);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const drId: string = req.params.designReviewId;
+      const user: User = await getCurrentUser(res);
+      const deletedDesignReview = await DesignReviewsService.deleteDesignReview(user, drId);
+      return res.status(200).json(deletedDesignReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const submitter: User = await getCurrentUser(res);
+      const {
+        dateScheduled,
+        teamTypeId,
+        requiredMemberIds,
+        optionalMemberIds,
+        location,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        docTemplateLink,
+        wbsNum,
+        meetingTimes
+      } = req.body;
+
+      const createdDesignReview = await DesignReviewsService.createDesignReview(
+        submitter,
+        dateScheduled,
+        teamTypeId,
+        requiredMemberIds,
+        optionalMemberIds,
+        isOnline,
+        isInPerson,
+        docTemplateLink,
+        wbsNum,
+        meetingTimes,
+        zoomLink,
+        location
+      );
+      return res.status(200).json(createdDesignReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getSingleDesignReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const drId: string = req.params.designReviewId;
+      const user: User = await getCurrentUser(res);
+      const designReview = await DesignReviewsService.getSingleDesignReview(user, drId);
+      return res.status(200).json(designReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  // Edit a work package to the given specifications
+  static async editDesignReviews(req: Request, res: Response, next: NextFunction) {
+    try {
+      const {
+        dateScheduled,
+        teamType,
+        requiredMembers,
+        optionalMembers,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        location,
+        docTemplateLink,
+        status,
+        attendees,
+        meetingTimes
+      } = req.body;
+
+      const { designReviewId } = req.params;
+
+      // get the user from the submitter
+      const user = await getCurrentUser(res);
+
+      await DesignReviewsService.editDesignReview(
+        user,
+        designReviewId,
+        dateScheduled,
+        teamType.teamTypeId,
+        requiredMembers,
+        optionalMembers,
+        isOnline,
+        isInPerson,
+        zoomLink,
+        location,
+        docTemplateLink,
+        status,
+        attendees,
+        meetingTimes
+      );
+      return res.status(200).json({ message: 'Design Review updated successfully' });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+}

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

@@ -0,0 +1,14 @@
+import { NextFunction, Request, Response } from 'express';
+import NotificationsService from '../services/notifications.services';
+
+export default class NotificationsController {
+  static async sendTaskDeadlineSlackNotifications(_req: Request, res: Response, next: NextFunction) {
+    try {
+      await NotificationsService.sendTaskDeadlineSlackNotifications();
+
+      res.status(200).json({ message: 'Successfully sent task deadline notifications!' });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+}

src/backend/src/controllers/notifications.controllers.ts

@@ -145,4 +145,33 @@ export default class UsersController {
       next(error);
     }
   }
+
+  static async setUserScheduleSettings(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { personalGmail, personalZoomLink, availability } = req.body;
+      const user = await getCurrentUser(res);
+
+      const updatedScheduleSettings = await UsersService.setUserScheduleSettings(
+        user,
+        personalGmail,
+        personalZoomLink,
+        availability
+      );
+
+      return res.status(200).json(updatedScheduleSettings);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getUserScheduleSettings(req: Request, res: Response, next: NextFunction) {
+    try {
+      const userId: number = parseInt(req.params.userId);
+      const submitter = await getCurrentUser(res);
+      const userScheduleSettings = await UsersService.getUserScheduleSettings(userId, submitter);
+      res.status(200).json(userScheduleSettings);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -0,0 +1,17 @@
+import { Prisma } from '@prisma/client';
+
+const designReviewQueryArgs = Prisma.validator<Prisma.Design_ReviewArgs>()({
+  include: {
+    userCreated: true,
+    teamType: true,
+    requiredMembers: true,
+    optionalMembers: true,
+    confirmedMembers: true,
+    deniedMembers: true,
+    attendees: true,
+    userDeleted: true,
+    wbsElement: true
+  }
+});
+
+export default designReviewQueryArgs;

src/backend/src/prisma-query-args/design-reviews.query-args.ts

@@ -0,0 +1,32 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[identifier]` on the table `Reimbursement_Request` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- Select all old RRs that has no identifier in dateCreated ascending order
+CREATE TEMP TABLE cte_table AS (
+    WITH CTE AS (
+        SELECT 
+            "reimbursementRequestId",
+            row_number() OVER (ORDER BY "dateCreated" ASC, "reimbursementRequestId" ASC) AS new_identifier
+        FROM 
+            "Reimbursement_Request"
+    )
+    SELECT * FROM CTE
+);
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Request" ADD COLUMN     "identifier" SERIAL NOT NULL;
+
+-- Assign Identifier to all old Reimbursement Requests based on their dateCreated order
+UPDATE "Reimbursement_Request" AS rr
+SET "identifier" = "cte_table".new_identifier
+FROM cte_table
+WHERE rr."reimbursementRequestId" = "cte_table"."reimbursementRequestId";
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reimbursement_Request_identifier_key" ON "Reimbursement_Request"("identifier");
+
+-- Remove the temporary table
+DROP TABLE cte_table;