Merge branch 'develop' into feature/seed-data-revamp

Author: Steph375

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

@@ -496,14 +496,14 @@ export default class ReimbursementRequestsController {
       const editedVendor = await ReimbursementRequestService.editVendor(
         name,
         vendorId,
-        username,
-        password,
-        discountCode,
         taxExempt,
         twoFactorContacts,
-        notes,
         req.currentUser,
-        req.organization
+        req.organization,
+        username,
+        password,
+        discountCode,
+        notes
       );
       res.status(200).json(editedVendor);
     } catch (error: unknown) {

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

@@ -96,13 +96,13 @@ reimbursementRequestsRouter.get('/reimbursements', ReimbursementRequestControlle
 reimbursementRequestsRouter.post(
   '/:vendorId/vendors/edit',
   nonEmptyString(body('name')),
-  nonEmptyString(body('username')).optional(),
-  nonEmptyString(body('password')).optional(),
-  nonEmptyString(body('discountCode')).optional(),
+  nonEmptyString(body('username')).optional({ checkFalsy: true }),
+  nonEmptyString(body('password')).optional({ checkFalsy: true }),
+  nonEmptyString(body('discountCode')).optional({ checkFalsy: true }),
   body('taxExempt').isBoolean(),
   body('twoFactorContacts').isArray(),
   nonEmptyString(body('twoFactorContacts.*')),
-  nonEmptyString(body('notes')).optional(),
+  nonEmptyString(body('notes')).optional({ checkFalsy: true }),
   validateInputs,
   ReimbursementRequestController.editVendor
 );

src/backend/src/routes/tasks.routes.ts

@@ -42,7 +42,7 @@ tasksRouter.post(
 tasksRouter.post(
   '/:taskId/edit',
   nonEmptyString(body('title')),
-  nonEmptyString(body('notes')),
+  body('notes').isString(),
   isOptionalDateOnly(body('deadline')),
   isOptionalDateOnly(body('startDate')),
   isTaskPriority(body('priority')),

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

@@ -15,7 +15,7 @@ import {
   Machinery,
   ScheduleSlot,
   notGuest,
-  isSameDay,
+  isSameDayUTC,
   EventInstance,
   SlackMentionType
 } from 'shared';
@@ -274,6 +274,7 @@ export default class CalendarService {
     description?: string,
     mention?: SlackMentionType
   ): Promise<Event> {
+    if (!title.trim()) throw new HttpException(400, 'Title cannot be only whitespace');
     // Validate eventTypeId
     const foundEventType = await prisma.event_Type.findUnique({
       where: { eventTypeId }
@@ -502,11 +503,7 @@ export default class CalendarService {
 
     if (foundEventType.sendSlackNotifications) {
       const members = await prisma.user.findMany({
-        where: {
-          userId: {
-            in: optionalMemberIds.concat(allRequiredMembers)
-          }
-        }
+        where: { userId: { in: optionalMemberIds.concat(allRequiredMembers) } }
       });
 
       // get the user settings for all the members invited, who are leaderingship
@@ -604,6 +601,7 @@ export default class CalendarService {
     zoomLink?: string,
     description?: string
   ): Promise<Event> {
+    if (!title.trim()) throw new HttpException(400, 'Title cannot be only whitespace');
     // validate eventId
     const foundEvent = await prisma.event.findUnique({
       where: { eventId },
@@ -799,13 +797,12 @@ export default class CalendarService {
     const edittedEvent = eventTransformer(updatedEvent);
 
     if (status === Event_Status.SCHEDULED && foundEventType.sendSlackNotifications) {
-      await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, edittedEvent);
+      await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, edittedEvent, true);
     }
 
     if (status === Event_Status.CONFIRMED && foundEventType.sendSlackNotifications) {
       await sendEventConfirmationToThread(updatedEvent.notificationSlackThreads, updatedEvent.userCreated);
     }
-
     return edittedEvent;
   }
 
@@ -941,7 +938,11 @@ export default class CalendarService {
         userCreatedId: true,
         location: true,
         dateDeleted: true,
-        approved: true
+        approved: true,
+        status: true,
+        title: true,
+        workPackages: true,
+        scheduledTimes: true
       }
     });
 
@@ -1422,10 +1423,48 @@ export default class CalendarService {
 
     if (!event) throw new NotFoundException('Event', eventId);
     if (event.dateDeleted) throw new DeletedException('Event', eventId);
-
-    // Cannot schedule an already scheduled event
     if (event.status === Event_Status.SCHEDULED) {
-      throw new HttpException(400, 'Event is already scheduled');
+      const timeSlots = await prisma.schedule_Slot.findMany({
+        where: { eventId: event.eventId }
+      });
+
+      // Restore the old scheduled time from confirmed members' availabilities
+      // so they get their time back from the old scheduled event
+      for (const slot of timeSlots) {
+        if (!slot.startTime || !slot.endTime) continue;
+        const startHour = new Date(slot.startTime).getHours();
+        const endHour = new Date(slot.endTime).getHours();
+
+        for (const member of event.confirmedMembers) {
+          if (!member.drScheduleSettings) continue;
+          const existingAvailability = member.drScheduleSettings.availabilities.find((a) =>
+            isSameDayUTC(a.dateSet, slot.startTime)
+          );
+          if (!existingAvailability) continue;
+          // Availability index i represents local hour (10 + i); remove indices that fall within [startHour, endHour)
+          const returnedAvailability = Array.from({ length: endHour - startHour }, (_, i) => startHour + i - 10).filter(
+            (i) => i >= 0
+          );
+
+          const updatedAvailability = [...new Set([...existingAvailability.availability, ...returnedAvailability])].sort(
+            (a, b) => a - b
+          );
+
+          await prisma.availability.update({
+            where: { availabilityId: existingAvailability.availabilityId },
+            data: { availability: updatedAvailability }
+          });
+        }
+      }
+
+      await prisma.event.update({
+        where: { eventId: event.eventId },
+        data: { status: Event_Status.SCHEDULED }
+      });
+
+      await prisma.schedule_Slot.deleteMany({
+        where: { eventId: event.eventId }
+      });
     }
 
     // Only the event creator can schedule the event
@@ -1462,9 +1501,12 @@ export default class CalendarService {
             allDay: false
           }
         },
+
+        initialDateScheduled: event.initialDateScheduled ?? null,
         approved: hasConflict ? Conflict_Status.PENDING : event.approved,
         approvalRequiredFromUserId: hasConflict ? conflictingEvent?.userCreated.userId : event.approvalRequiredFromUserId
       },
+
       ...getEventQueryArgs(organization.organizationId)
     });
 
@@ -1474,7 +1516,7 @@ export default class CalendarService {
     const endHour = endTime.getHours();
     for (const member of event.confirmedMembers) {
       if (!member.drScheduleSettings) continue;
-      const existingAvailability = member.drScheduleSettings.availabilities.find((a) => isSameDay(a.dateSet, startTime));
+      const existingAvailability = member.drScheduleSettings.availabilities.find((a) => isSameDayUTC(a.dateSet, startTime));
       if (!existingAvailability) continue;
       // Availability index i represents local hour (10 + i); remove indices that fall within [startHour, endHour)
       const updatedAvailability = existingAvailability.availability.filter(
@@ -1492,9 +1534,12 @@ export default class CalendarService {
     });
 
     if (foundEventType?.sendSlackNotifications) {
-      await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, eventTransformer(updatedEvent));
+      await sendEventScheduledSlackNotif(
+        updatedEvent.notificationSlackThreads,
+        eventTransformer(updatedEvent),
+        event.status === Event_Status.SCHEDULED
+      );
     }
-
     return eventTransformer(updatedEvent);
   }
 

src/backend/src/services/notifications.services.ts

@@ -44,6 +44,9 @@ export default class NotificationsService {
         },
         dateDeleted: null
       },
+      orderBy: {
+        deadline: 'asc' // earliest (most overdue) first
+      },
       include: {
         assignees: {
           include: {
@@ -78,9 +81,10 @@ export default class NotificationsService {
       });
     });
 
-    // send the notifications to each team for their respective tasks
+    // send the notifications to each team for their respective tasks sorted by deadline
     const promises = Array.from(teamTaskMap).map(async ([slackId, tasks]) => {
       const messageBlock = tasks
+        .sort((a, b) => a.deadline!.getTime() - b.deadline!.getTime())
         .map((task) => {
           // prisma call earlier allows the forced unwrap (deadline is guaranteed to be a non-null value)
           const todayMidnightUTC = new Date(new Date().setUTCHours(0, 0, 0, 0));
@@ -236,7 +240,6 @@ export default class NotificationsService {
   static async sendSponsorTaskNotifications() {
     const startOfToday = new Date(new Date().setUTCHours(0, 0, 0, 0));
     const endOfToday = startOfDayTomorrow();
-
     const sponsorTasks = await prisma.sponsor_Task.findMany({
       where: {
         notifyDate: {

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

@@ -1510,14 +1510,14 @@ export default class ReimbursementRequestService {
   static async editVendor(
     name: string,
     vendorId: string,
-    username: string,
-    password: string,
-    discountCode: string,
     taxExempt: boolean,
     twoFactorContacts: string[],
-    notes: string,
     submitter: User,
-    organization: Organization
+    organization: Organization,
+    username?: string,
+    password?: string,
+    discountCode?: string,
+    notes?: string
   ): Promise<Vendor> {
     const existingVendor = await prisma.vendor.findUnique({
       where: { vendorId, dateDeleted: null },

src/backend/src/services/tasks.services.ts

@@ -104,6 +104,10 @@ export default class TasksService {
     if (!isUnderWordCount(title, 15)) throw new HttpException(400, 'Title must be less than 15 words');
     if (!isUnderWordCount(notes, 250)) throw new HttpException(400, 'Notes must be less than 250 words');
 
+    if (startDate && deadline && startDate > deadline) {
+      throw new HttpException(400, 'Start date must be before or on the same day as the deadline');
+    }
+
     if (status === 'IN_PROGRESS' && (!deadline || assignees.length === 0)) {
       throw new HttpException(400, 'Tasks in progress must have a dealine and assignees');
     }
@@ -175,6 +179,13 @@ export default class TasksService {
     if (!isUnderWordCount(title, 15)) throw new HttpException(400, 'Title must be less than 15 words');
     if (!isUnderWordCount(notes, 250)) throw new HttpException(400, 'Notes must be less than 250 words');
 
+    const effectiveStartDate = startDate ?? originalTask.startDate ?? undefined;
+    const effectiveDeadline = deadline ?? originalTask.deadline ?? undefined;
+
+    if (effectiveStartDate && effectiveDeadline && effectiveStartDate > effectiveDeadline) {
+      throw new HttpException(400, 'Start date must be before or on the same day as the deadline');
+    }
+
     // if wbsNum passed, error if there's a problem with the wbs element
     if (wbsNum) {
       const newWbsElement = await prisma.wBS_Element.findUnique({

src/backend/src/utils/slack.utils.ts

@@ -473,9 +473,13 @@ export const sendEventConfirmationToThread = async (threads: SlackMessageThread[
   }
 };
 
-export const sendEventScheduledSlackNotif = async (threads: SlackMessageThread[], event: Event) => {
+export const sendEventScheduledSlackNotif = async (
+  threads: SlackMessageThread[],
+  event: Event,
+  beingRescheduled: boolean = false
+) => {
   if (process.env.NODE_ENV !== 'production' && !DEV_TESTING_OVERRIDE) return; // don't send msgs unless in prod
-
+  const scheduledOrRescheduled = beingRescheduled ? 'rescheduled' : 'scheduled';
   // Get work package names
   const wpNames = event.workPackages.map((wp) => wp.wbsElement.name).join(', ');
   const drName = event.title + (wpNames ? ` (${wpNames})` : '');
@@ -507,9 +511,12 @@ export const sendEventScheduledSlackNotif = async (threads: SlackMessageThread[]
   const validSlackIds = resolvedSlackIds.filter((id): id is string => !!id);
   const mentionPrefix = buildSlackMentionPrefix(SlackMentionType.USER, validSlackIds);
 
-  const msg = `:spiral_calendar_pad: ${event.title} for *${drName}* has been scheduled for *${drTime}* ${location} by ${drSubmitter}`;
+  const msg =
+    `:spiral_calendar_pad: ${event.title} for *${drName}* has been ` +
+    scheduledOrRescheduled +
+    ` for *${drTime}* ${location} by ${drSubmitter}`;
   const docLink = event.questionDocumentLink ? `<${event.questionDocumentLink}|Doc Link>` : '';
-  const threadMsg = `${mentionPrefix}This event has been Scheduled! \n` + docLink;
+  const threadMsg = `${mentionPrefix}This event has been ` + scheduledOrRescheduled + ` \n` + docLink;
 
   if (threads && threads.length !== 0) {
     const msgs = threads.map((thread) => editMessage(thread.channelId, thread.timestamp, msg));

src/backend/src/utils/validation.utils.ts

@@ -24,7 +24,7 @@ export const decimalMinZero = (validationObject: ValidationChain): ValidationCha
 };
 
 export const nonEmptyString = (validationObject: ValidationChain): ValidationChain => {
-  return validationObject.isString().not().isEmpty({ ignore_whitespace: true });
+  return validationObject.isString().not().isEmpty();
 };
 
 export const isRole = (validationObject: ValidationChain): ValidationChain => {

src/backend/tests/unit/reimbursement-requests.test.ts

@@ -359,14 +359,14 @@ describe('Reimbursement Requests', () => {
       const editedVendor = await ReimbursementRequestService.editVendor(
         'Google',
         createdVendor.vendorId,
-        'ner@gmail.com',
-        'racecar',
-        'DISCOUNT',
         false,
         [],
-        'no notes',
         createdUser,
-        org
+        org,
+        'ner@gmail.com',
+        'racecar',
+        'DISCOUNT',
+        'no notes'
       );
       expect(editedVendor.name).toEqual('Google');
       expect(editedVendor.username).toEqual('ner@gmail.com');