Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions src/backend/src/services/calendar.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -813,16 +813,29 @@ export default class CalendarService {

const edittedEvent = eventTransformer(updatedEvent);

if (status === Event_Status.SCHEDULED && foundEventType.sendSlackNotifications) {
await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, edittedEvent, true);
}

if (status === Event_Status.CONFIRMED && foundEventType.sendSlackNotifications) {
await sendEventConfirmationToThread(updatedEvent.notificationSlackThreads, updatedEvent.userCreated);
}
return edittedEvent;
}

static hasScheduleChanged(before: ScheduleSlot[], after: ScheduleSlot[]): boolean {
if (before.length !== after.length) return true;
for (const scheduleSlot of before) {
const afterSlot = after.find((s) => s.scheduleSlotId === scheduleSlot.scheduleSlotId);
if (
!afterSlot ||
scheduleSlot.startTime.getTime() !== afterSlot.startTime.getTime() ||
scheduleSlot.endTime.getTime() !== afterSlot.endTime.getTime() ||
scheduleSlot.allDay !== afterSlot.allDay
) {
return true;
}
}

return false;
}

/**
* Previews which schedule slots would be affected when editing a slot with "edit all in series".
* Returns only the OTHER slots that would be edited (excludes the current slot being edited).
Expand Down Expand Up @@ -1091,8 +1104,22 @@ export default class CalendarService {
});

if (!updatedEvent) throw new NotFoundException('Event', event.eventId);
const updatedEventTransform = eventTransformer(updatedEvent);

return eventTransformer(updatedEvent);
const foundEventType = await prisma.event_Type.findUnique({
where: { eventTypeId: updatedEventTransform.eventTypeId }
});

if (
updatedEventTransform.status === Event_Status.SCHEDULED &&
foundEventType &&
foundEventType.sendSlackNotifications &&
this.hasScheduleChanged(event.scheduledTimes, updatedEvent.scheduledTimes)
) {
await sendEventScheduledSlackNotif(updatedEvent.notificationSlackThreads, updatedEventTransform, true);
Comment thread
glickgNU marked this conversation as resolved.
}

return updatedEventTransform;
}

/**
Expand Down
Loading