removed design review language from slack messages

Author: chpy04

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

@@ -13,7 +13,8 @@ import {
   Calendar,
   FilterArgs,
   Machinery,
-  ScheduleSlot
+  ScheduleSlot,
+  notGuest
 } from 'shared';
 import { getCalendarQueryArgs } from '../prisma-query-args/calendar.query-args.js';
 import { getEventTypeQueryArgs } from '../prisma-query-args/event-type.query-args.js';
@@ -285,6 +286,8 @@ export default class CalendarService {
       if (!hasPermission) {
         throw new AccessDeniedException('Only admins and heads can create events under this event type');
       }
+    } else if (notGuest(submitter.role)) {
+      throw new AccessDeniedGuestException('Guests cannot create events');
     }
 
     // Validate event follows event type configuration
@@ -501,39 +504,33 @@ export default class CalendarService {
         where: { userId: { in: members.map((member) => member.userId) } }
       });
 
-      if (!memberUserSettings) {
-        throw new NotFoundException('User Settings', 'Cannot find settings of members');
-      }
-
       const workPackageNames = newEvent.workPackages.map((wp) => wp.wbsElement.name).join(', ');
 
       const projects = newEvent.workPackages.map((wp) => wp.project);
 
-      // Send a slack message to all members invited to the event
-      for (const memberUserSetting of memberUserSettings) {
-        if (memberUserSetting.slackId) {
-          try {
-            // For each project associated with this event
-            for (const project of projects) {
-              await sendSlackEventConfirmNotification(
-                memberUserSetting.slackId,
-                newEvent.eventId,
-                newEvent.title,
-                project.wbsElement.name
-              );
-            }
-          } catch (err: unknown) {
-            if (err instanceof Error) {
-              throw new HttpException(500, `Failed to send slack notification: ${err.message}`);
+      // Send a slack message to all members invited to the event if the event requires confirmation
+      if (newEvent.status === Event_Status.UNCONFIRMED) {
+        for (const memberUserSetting of memberUserSettings) {
+          if (memberUserSetting.slackId) {
+            try {
+              // For each project associated with this event
+              for (const project of projects) {
+                await sendSlackEventConfirmNotification(
+                  memberUserSetting.slackId,
+                  newEvent.eventId,
+                  newEvent.title,
+                  project.wbsElement.name
+                );
+              }
+            } catch (err: unknown) {
+              if (err instanceof Error) {
+                throw new HttpException(500, `Failed to send slack notification: ${err.message}`);
+              }
             }
           }
         }
       }
 
-      if (newEvent.status === Event_Status.CONFIRMED) {
-        await sendEventConfirmationToThread(newEvent.notificationSlackThreads, newEvent.userCreated);
-      }
-
       // Send popup notification
       await sendEventPopUp(newEvent, members, submitter, workPackageNames, organization.organizationId);
 

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

@@ -251,7 +251,7 @@ export const sendSlackEventConfirmNotification = async (
 ) => {
   const isProduction = process.env.NODE_ENV === 'production';
   if (!isProduction && !DEV_TESTING_OVERRIDE) return; // don't send msgs unless in prod
-  const msg = `You have been invited to the ${eventName} Design Review in project ${projectName}!`;
+  const msg = `You have been invited to ${eventName} in project ${projectName}!`;
   const fullLink = isProduction
     ? `https://finishlinebyner.com/calendar/event/${eventId}`
     : `http://localhost:3000/calendar/event/${eventId}`;
@@ -338,7 +338,7 @@ export const sendSlackEventNotification = async (
   if (process.env.NODE_ENV !== 'production' && !DEV_TESTING_OVERRIDE) return []; // don't send msgs unless in prod
   const msgs: { channelId: string; ts: string }[] = [];
   const fullMsg = `${message}`;
-  const fullLink = `https://finishlinebyner.com/design-review-calendar`;
+  const fullLink = `https://finishlinebyner.com/calendar`;
   const btnText = `View Calendar`;
   const notification = await sendMessage(team.slackId, fullMsg, fullLink, btnText);
   if (notification) msgs.push(notification);
@@ -355,7 +355,12 @@ export const sendSlackEventNotifications = async (
 ) => {
   if (process.env.NODE_ENV !== 'production' && !DEV_TESTING_OVERRIDE) return []; // don't send msgs unless in prod
   const notifications: { channelId: string; ts: string }[] = [];
-  const message = `:spiral_calendar_pad: Design Review for *${workPackageName}* is being scheduled by ${submitter.firstName} ${submitter.lastName} in project ${projectName}`;
+  let message;
+  if (workPackageName) {
+    message = `:spiral_calendar_pad: ${event.title} for *${workPackageName}* is being scheduled by ${submitter.firstName} ${submitter.lastName} in project ${projectName}`;
+  } else {
+    message = `:spiral_calendar_pad: ${event.title} is being scheduled by ${submitter.firstName} ${submitter.lastName} in project ${projectName}`;
+  }
 
   const completion: Promise<void>[] = teams.map(async (team) => {
     const sentNotifications: { channelId: string; ts: string }[] = await sendSlackEventNotification(team, message);
@@ -447,9 +452,9 @@ export const sendEventScheduledSlackNotif = async (threads: SlackMessageThread[]
 
   const location = zoomLink && inPersonLocation ? `${inPersonLocation} and ${zoomLink}` : inPersonLocation || zoomLink || '';
 
-  const msg = `:spiral_calendar_pad: Design Review for *${drName}* has been scheduled for *${drTime}* ${location} by ${drSubmitter}`;
+  const msg = `:spiral_calendar_pad: ${event.title} for *${drName}* has been scheduled for *${drTime}* ${location} by ${drSubmitter}`;
   const docLink = event.questionDocumentLink ? `<${event.questionDocumentLink}|Doc Link>` : '';
-  const threadMsg = `The Design Review has been Scheduled! \n` + docLink;
+  const threadMsg = `This event has been Scheduled! \n` + docLink;
 
   try {
     if (threads && threads.length !== 0) {