#1583 merge conflicts

Author: walker-sean

.github/workflows/notifications.yml

@@ -11,4 +11,4 @@ jobs:
     steps:
       - name: Send notifications
         run: |
-          curl -H "Authorization: ${{ secrets.NOTIFICATION_ENDPOINT_SECRET }}" -X POST "${{ env.BACKEND_URL}}/notifications/task-deadlines"
+          curl -H "Authorization: ${{ secrets.NOTIFICATION_ENDPOINT_SECRET }}" -X POST "${{ secrets.BACKEND_URL}}/notifications/task-deadlines"

src/backend/index.ts

@@ -15,6 +15,7 @@ import notificationsRouter from './src/routes/notifications.routes';
 import designReviewsRouter from './src/routes/design-reviews.routes';
 import workPackageTemplatesRouter from './src/routes/work-package-templates.routes';
 import carsRouter from './src/routes/cars.routes';
+import organizationRouter from './src/routes/organizations.routes';
 
 const app = express();
 const port = process.env.PORT || 3001;
@@ -60,6 +61,7 @@ app.use('/design-reviews', designReviewsRouter);
 app.use('/notifications', notificationsRouter);
 app.use('/templates', workPackageTemplatesRouter);
 app.use('/cars', carsRouter);
+app.use('/organizations', organizationRouter);
 app.use('/', (_req, res) => {
   res.json('Welcome to FinishLine');
 });

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

@@ -128,4 +128,19 @@ export default class DesignReviewsController {
       next(error);
     }
   }
+
+  // Set a new status for the design review
+  static async setStatus(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { designReviewId } = req.params;
+      const { status } = req.body;
+      const user = await getCurrentUser(res);
+      const organizationId = getOrganizationId(req.headers);
+
+      const updatedDesignReview = await DesignReviewsService.setStatus(user, designReviewId, status, organizationId);
+      res.status(200).json(updatedDesignReview);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -2,9 +2,9 @@ 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) {
+  static async sendDailySlackNotifications(_req: Request, res: Response, next: NextFunction) {
     try {
-      await NotificationsService.sendTaskDeadlineSlackNotifications();
+      await NotificationsService.sendDailySlackNotifications();
 
       res.status(200).json({ message: 'Successfully sent task deadline notifications!' });
     } catch (error: unknown) {

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

@@ -0,0 +1,30 @@
+import { NextFunction, Request, Response } from 'express';
+import { getCurrentUser } from '../utils/auth.utils';
+import { getOrganizationId } from '../utils/utils';
+import OrganizationsService from '../services/organizations.service';
+
+export default class OrganizationsController {
+  static async setUsefulLinks(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { links } = req.body;
+      const submitter = await getCurrentUser(res);
+      const organizationId = getOrganizationId(req.headers);
+
+      const newLinks = await OrganizationsService.setUsefulLinks(submitter, organizationId, links);
+      res.status(200).json(newLinks);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllUsefulLinks(req: Request, res: Response, next: NextFunction) {
+    try {
+      const organizationId = getOrganizationId(req.headers);
+
+      const links = await OrganizationsService.getAllUsefulLinks(organizationId);
+      res.status(200).json(links);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+}

src/backend/src/controllers/projects.controllers.ts

@@ -9,8 +9,9 @@ import { getOrganizationId } from '../utils/utils';
 export default class ProjectsController {
   static async getAllProjects(req: Request, res: Response, next: NextFunction) {
     try {
+      const includeDeleted = req.params.deleted === 'true';
       const organizationId = getOrganizationId(req.headers);
-      const projects: Project[] = await ProjectsService.getAllProjects(organizationId);
+      const projects: Project[] = await ProjectsService.getAllProjects(organizationId, includeDeleted);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);

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

@@ -295,6 +295,23 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async leadershipApproveReimbursementRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { requestId } = req.params;
+      const user = await getCurrentUser(res);
+      const organizationId = getOrganizationId(req.headers);
+
+      const reimbursementStatus = await ReimbursementRequestService.leadershipApproveReimbursementRequest(
+        requestId,
+        user,
+        organizationId
+      );
+      res.status(200).json(reimbursementStatus);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async approveReimbursementRequest(req: Request, res: Response, next: NextFunction) {
     try {
       const { requestId } = req.params;

src/backend/src/controllers/tasks.controllers.ts

@@ -8,7 +8,7 @@ import { getOrganizationId } from '../utils/utils';
 export default class TasksController {
   static async createTask(req: Request, res: Response, next: NextFunction) {
     try {
-      const { title, deadline, priority, status, assignees } = req.body;
+      const { title, deadline, priority, status, assignees, notes } = req.body;
       const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
       const createdBy: User = await getCurrentUser(res);
       const organizationId = getOrganizationId(req.headers);
@@ -17,7 +17,7 @@ export default class TasksController {
         createdBy,
         wbsNum,
         title,
-        '',
+        notes,
         new Date(deadline),
         priority,
         status,

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

@@ -14,6 +14,7 @@ export const getDesignReviewQueryArgs = (organizationId: string) =>
       deniedMembers: getUserQueryArgs(organizationId),
       attendees: getUserQueryArgs(organizationId),
       userDeleted: getUserQueryArgs(organizationId),
-      wbsElement: true
+      wbsElement: true,
+      notificationSlackThreads: true
     }
   });

src/backend/src/prisma-query-args/user.query-args.ts

@@ -4,6 +4,8 @@ export type UserQueryArgs = ReturnType<typeof getUserQueryArgs>;
 
 export type UserWithSettingsQueryArgs = ReturnType<typeof getUserWithSettingsQueryArgs>;
 
+export type UserScheduleSettingsQueryArgs = ReturnType<typeof getUserScheduleSettingsQueryArgs>;
+
 // DO NOT CALL ANY OTHER QUERY ARGS FROM HERE TO AVOID CIRCULAR DEPENDENCIES
 export const getUserQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.UserDefaultArgs>()({
@@ -25,8 +27,16 @@ export const getUserWithSettingsQueryArgs = (organizationId: string) =>
           organizationId
         }
       },
-      drScheduleSettings: true,
+      drScheduleSettings: getUserScheduleSettingsQueryArgs(),
       userSettings: true,
       organizations: true
     }
   });
+
+export const getUserScheduleSettingsQueryArgs = () => {
+  return Prisma.validator<Prisma.Schedule_SettingsDefaultArgs>()({
+    include: {
+      availabilities: true
+    }
+  });
+};