4090 maintenance schema changes move notifications to event level

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

@@ -21,8 +21,7 @@ export default class CalendarController {
         documents,
         description,
         onlyHeadsOrAbove,
-        requiresConfirmation,
-        sendSlackNotifications
+        requiresConfirmation
       } = req.body;
 
       const eventType = await CalendarService.createEventType(
@@ -43,8 +42,7 @@ export default class CalendarController {
         documents,
         description,
         onlyHeadsOrAbove,
-        requiresConfirmation,
-        sendSlackNotifications
+        requiresConfirmation
       );
       res.status(200).json(eventType);
     } catch (error: unknown) {
@@ -205,8 +203,7 @@ export default class CalendarController {
         documents,
         description,
         onlyHeadsOrAbove,
-        requiresConfirmation,
-        sendSlackNotifications
+        requiresConfirmation
       } = req.body;
 
       const eventType = await CalendarService.editEventType(
@@ -228,8 +225,7 @@ export default class CalendarController {
         documents,
         description,
         onlyHeadsOrAbove,
-        requiresConfirmation,
-        sendSlackNotifications
+        requiresConfirmation
       );
       res.status(200).json(eventType);
     } catch (error: unknown) {
@@ -278,7 +274,8 @@ export default class CalendarController {
         questionDocumentLink,
         location,
         zoomLink,
-        description
+        description,
+        sendSlackNotifications
       } = req.body;
 
       const parsedScheduleSlots = scheduleSlots.map((slot: any) => ({
@@ -302,6 +299,7 @@ export default class CalendarController {
         workPackageIds,
         parsedScheduleSlots,
         parsedInitialDateScheduled,
+        sendSlackNotifications,
         teamTypeId,
         questionDocumentLink,
         location,
@@ -332,7 +330,8 @@ export default class CalendarController {
         questionDocumentLink,
         location,
         zoomLink,
-        description
+        description,
+        sendSlackNotifications
       } = req.body;
 
       const event = await CalendarService.editEvent(
@@ -348,6 +347,7 @@ export default class CalendarController {
         machineryIds,
         workPackageIds,
         documents,
+        sendSlackNotifications,
         teamTypeId,
         questionDocumentLink,
         location,

src/backend/src/prisma/migrations/20260416232819_move_send_slack_notifs_to_event/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Event" ADD COLUMN     "sendSlackNotifications" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "Event_Type" DROP COLUMN "sendSlackNotifications";

src/backend/src/prisma/schema.prisma

@@ -1179,6 +1179,7 @@ model Event {
   description                String?
   notificationSlackThreads   Message_Info[]
   calendarEventIds           String[]
+  sendSlackNotifications     Boolean         @default(false)
 }
 
 model Calendar {
@@ -1221,7 +1222,6 @@ model Event_Type {
   description                      Boolean
   onlyHeadsOrAboveForEventCreation Boolean
   requiresConfirmation             Boolean
-  sendSlackNotifications           Boolean
   events                           Event[]
   organizationId                   String
   organization                     Organization @relation(fields: [organizationId], references: [organizationId])

src/backend/src/prisma/seed.ts

@@ -3576,7 +3576,6 @@ const performSeed: () => Promise<void> = async () => {
     false,
     true,
     false,
-    false,
     false
   );
 
@@ -3599,7 +3598,6 @@ const performSeed: () => Promise<void> = async () => {
     true,
     true,
     false,
-    true,
     true
   );
 
@@ -3622,7 +3620,6 @@ const performSeed: () => Promise<void> = async () => {
     true,
     false,
     false,
-    false,
     false
   );
 
@@ -3645,7 +3642,6 @@ const performSeed: () => Promise<void> = async () => {
     false,
     false,
     false,
-    false,
     false
   );
 
@@ -3668,6 +3664,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    true,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3709,6 +3706,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    false,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3735,6 +3733,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    false,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3761,6 +3760,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    true,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3787,6 +3787,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    true,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3813,6 +3814,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    false,
     mechanical.teamTypeId,
     undefined,
     'Conference Room A',
@@ -3833,6 +3835,7 @@ const performSeed: () => Promise<void> = async () => {
     [workPackage1.id],
     [],
     weeksFromNow(1),
+    true,
     software.teamTypeId,
     'https://docs.google.com/document/d/2_example',
     'Conference Room B',
@@ -3859,6 +3862,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    true,
     electrical.teamTypeId,
     'https://docs.google.com/document/d/3_example',
     undefined,
@@ -3885,6 +3889,7 @@ const performSeed: () => Promise<void> = async () => {
       }
     ],
     undefined,
+    false,
     mechanical.teamTypeId,
     undefined,
     undefined,

src/backend/src/routes/calendar.routes.ts

@@ -64,7 +64,6 @@ calendarRouter.post(
   body('description').isBoolean(),
   body('onlyHeadsOrAbove').isBoolean(),
   body('requiresConfirmation').isBoolean(),
-  body('sendSlackNotifications').isBoolean(),
   validateInputs,
   CalendarController.createEventType
 );
@@ -88,7 +87,6 @@ calendarRouter.post(
   body('description').isBoolean(),
   body('onlyHeadsOrAbove').isBoolean(),
   body('requiresConfirmation').isBoolean(),
-  body('sendSlackNotifications').isBoolean(),
   validateInputs,
   CalendarController.editEventType
 );
@@ -119,6 +117,7 @@ calendarRouter.post(
   isDate(body('scheduleSlots.*.startTime')),
   isDate(body('scheduleSlots.*.endTime')),
   body('scheduleSlots.*.allDay').isBoolean(),
+  body('sendSlackNotifications').isBoolean(),
   validateInputs,
   CalendarController.createEvent
 );
@@ -147,6 +146,7 @@ calendarRouter.post(
   nonEmptyString(body('documents.*.googleFileId')),
   body('questionDocumentLink').optional().isString(),
   body('description').optional().isString(),
+  body('sendSlackNotifications').isBoolean(),
   validateInputs,
   CalendarController.editEvent
 );

src/backend/src/services/calendar.services.ts

@@ -90,7 +90,6 @@ export default class CalendarService {
    * @param description Determines if a description is associated with this event type.
    * @param onlyHeadsOrAbove Determines if events under this event type can only be created by heads or above.
    * @param requiredConfirmation Determines if events under this event type need to be confirmed.
-   * @param sendSlackNotifications Determines if users will be notified via slack
    *
    * @returns The created event type.
    *
@@ -116,8 +115,7 @@ export default class CalendarService {
     documents: boolean,
     description: boolean,
     onlyHeadsOrAbove: boolean,
-    requiresConfirmation: boolean,
-    sendSlackNotifications: boolean
+    requiresConfirmation: boolean
   ): Promise<EventType> {
     if (!(await userHasPermission(submitter.userId, organization.organizationId, isAdmin))) {
       throw new AccessDeniedAdminOnlyException('create event type');
@@ -176,7 +174,6 @@ export default class CalendarService {
         description,
         onlyHeadsOrAboveForEventCreation: onlyHeadsOrAbove,
         requiresConfirmation,
-        sendSlackNotifications,
         organizationId: organization.organizationId
       },
       ...getEventTypeQueryArgs(organization.organizationId)
@@ -246,6 +243,7 @@ export default class CalendarService {
    * @param location Location of the event.
    * @param zoomLink Zoom Link if the event is online.
    * @param description Describes the event.
+   * @param sendSlackNotifications Determines if this event should receive slack notifications.
    *
    * @returns The created event.
    *
@@ -265,6 +263,7 @@ export default class CalendarService {
     workPackageIds: string[],
     scheduleSlots: ScheduleSlotCreateArgs[],
     initialDateScheduled: Date | undefined,
+    sendSlackNotifications: boolean,
     teamTypeId?: string,
     questionDocumentLink?: string,
     location?: string,
@@ -460,7 +459,8 @@ export default class CalendarService {
         location,
         zoomLink,
         questionDocumentLink,
-        description
+        description,
+        sendSlackNotifications
       },
       ...getEventQueryArgs(organization.organizationId)
     });
@@ -493,7 +493,7 @@ export default class CalendarService {
       }
     }
 
-    if (foundEventType.sendSlackNotifications) {
+    if (sendSlackNotifications) {
       const members = await prisma.user.findMany({
         where: { userId: { in: optionalMemberIds.concat(requiredMemberIds) } }
       });
@@ -567,6 +567,7 @@ export default class CalendarService {
    * @param location Location of the event.
    * @param zoomLink Zoom Link if the event is online.
    * @param description Describes the event.
+   * @param sendSlackNotifications Determines if this event should receive slack notifications.
    *
    * @returns The edited event.
    *
@@ -586,6 +587,7 @@ export default class CalendarService {
     machineryIds: string[],
     workPackageIds: string[],
     documents: EventDocumentCreateArgs[],
+    sendSlackNotifications: boolean,
     teamTypeId?: string,
     questionDocumentLink?: string,
     location?: string,
@@ -773,7 +775,8 @@ export default class CalendarService {
         location,
         zoomLink,
         questionDocumentLink,
-        description
+        description,
+        sendSlackNotifications
       },
       ...getEventQueryArgs(organization.organizationId)
     });
@@ -783,11 +786,11 @@ export default class CalendarService {
 
     const edittedEvent = eventTransformer(updatedEvent);
 
-    if (status === Event_Status.SCHEDULED && foundEventType.sendSlackNotifications) {
+    if (status === Event_Status.SCHEDULED && sendSlackNotifications) {
       await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, edittedEvent);
     }
 
-    if (status === Event_Status.CONFIRMED && foundEventType.sendSlackNotifications) {
+    if (status === Event_Status.CONFIRMED && sendSlackNotifications) {
       await sendEventConfirmationToThread(updatedEvent.notificationSlackThreads, updatedEvent.userCreated);
     }
 
@@ -1350,7 +1353,7 @@ export default class CalendarService {
       if (!foundEventType) throw new NotFoundException('Event Type', eventTypeId);
       if (foundEventType.dateDeleted) throw new DeletedException('Event Type', eventTypeId);
 
-      if (foundEventType.sendSlackNotifications) {
+      if (updatedEvent.sendSlackNotifications) {
         await sendEventUserConfirmationToThread(updatedEvent.notificationSlackThreads, submitter);
       }
 
@@ -1366,7 +1369,7 @@ export default class CalendarService {
             status: Event_Status.CONFIRMED
           }
         });
-        if (foundEventType.sendSlackNotifications) {
+        if (updatedEvent.sendSlackNotifications) {
           await sendEventConfirmationToThread(updatedEvent.notificationSlackThreads, updatedEvent.userCreated);
         }
       }
@@ -1471,12 +1474,7 @@ export default class CalendarService {
       });
     }
 
-    const { eventTypeId } = updatedEvent;
-    const foundEventType = await prisma.event_Type.findUnique({
-      where: { eventTypeId }
-    });
-
-    if (foundEventType?.sendSlackNotifications) {
+    if (updatedEvent.sendSlackNotifications) {
       await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, eventTransformer(updatedEvent));
     }
 
@@ -2209,7 +2207,6 @@ export default class CalendarService {
    * @param description Determines if a description is associated with this event type.
    * @param onlyHeadsOrAbove Determines if events associated with this event type can only be made by heads or above.
    * @param requiredConfirmation Determines if events associated with this event type need to be confirmed.
-   * @param sendSlackNotifications Determines if events associated with this event type should receive slack notifications.
    *
    * @returns The created event type.
    *
@@ -2236,8 +2233,7 @@ export default class CalendarService {
     documents: boolean,
     description: boolean,
     onlyHeadsOrAbove: boolean,
-    requiresConfirmation: boolean,
-    sendSlackNotifications: boolean
+    requiresConfirmation: boolean
   ): Promise<EventType> {
     if (!(await userHasPermission(submitter.userId, organization.organizationId, isAdmin))) {
       throw new AccessDeniedAdminOnlyException('edit event type');
@@ -2295,8 +2291,7 @@ export default class CalendarService {
         documents,
         description,
         onlyHeadsOrAboveForEventCreation: onlyHeadsOrAbove,
-        requiresConfirmation,
-        sendSlackNotifications
+        requiresConfirmation
       },
       ...getEventTypeQueryArgs(organization.organizationId)
     });