fix: handle collective multiple host on destinationCalendar #8
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,7 +125,8 @@ export default class LarkCalendarService implements Calendar { | |
| async createEvent(event: CalendarEvent): Promise<NewCalendarEventType> { | ||
| let eventId = ""; | ||
| let eventRespData; | ||
| const [mainHostDestinationCalendar] = event.destinationCalendar ?? []; | ||
| const calendarId = mainHostDestinationCalendar?.externalId; | ||
| if (!calendarId) { | ||
| throw new Error("no calendar id"); | ||
| } | ||
|
|
@@ -160,7 +161,8 @@ export default class LarkCalendarService implements Calendar { | |
| } | ||
|
|
||
| private createAttendees = async (event: CalendarEvent, eventId: string) => { | ||
| const [mainHostDestinationCalendar] = event.destinationCalendar ?? []; | ||
| const calendarId = mainHostDestinationCalendar?.externalId; | ||
| if (!calendarId) { | ||
| this.log.error("no calendar id provided in createAttendees"); | ||
| throw new Error("no calendar id provided in createAttendees"); | ||
|
|
@@ -187,7 +189,8 @@ export default class LarkCalendarService implements Calendar { | |
| async updateEvent(uid: string, event: CalendarEvent, externalCalendarId?: string) { | ||
| const eventId = uid; | ||
| let eventRespData; | ||
| const [mainHostDestinationCalendar] = event.destinationCalendar ?? []; | ||
| const calendarId = externalCalendarId || mainHostDestinationCalendar?.externalId; | ||
| if (!calendarId) { | ||
| this.log.error("no calendar id provided in updateEvent"); | ||
| throw new Error("no calendar id provided in updateEvent"); | ||
|
|
@@ -231,7 +234,8 @@ export default class LarkCalendarService implements Calendar { | |
| * @returns | ||
| */ | ||
| async deleteEvent(uid: string, event: CalendarEvent, externalCalendarId?: string) { | ||
| const [mainHostDestinationCalendar] = event.destinationCalendar ?? []; | ||
| const calendarId = externalCalendarId || mainHostDestinationCalendar?.externalId; | ||
| if (!calendarId) { | ||
| this.log.error("no calendar id provided in deleteEvent"); | ||
| throw new Error("no calendar id provided in deleteEvent"); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,9 +70,10 @@ export default class Office365CalendarService implements Calendar { | |
| } | ||
|
|
||
| async createEvent(event: CalendarEvent): Promise<NewCalendarEventType> { | ||
| const [mainHostDestinationCalendar] = event.destinationCalendar ?? []; | ||
| try { | ||
| const eventsUrl = mainHostDestinationCalendar?.externalId | ||
| ? `/me/calendars/${mainHostDestinationCalendar?.externalId}/events` | ||
| : "/me/calendar/events"; | ||
|
|
||
| const response = await this.fetcher(eventsUrl, { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -217,7 +217,8 @@ export const getBusyCalendarTimes = async ( | |
|
|
||
| export const createEvent = async ( | ||
| credential: CredentialWithAppName, | ||
| calEvent: CalendarEvent, | ||
| externalId?: string | ||
| ): Promise<EventResult<NewCalendarEventType>> => { | ||
| const uid: string = getUid(calEvent); | ||
| const calendar = await getCalendar(credential); | ||
|
|
@@ -226,29 +227,31 @@ export const createEvent = async ( | |
|
|
||
| // Check if the disabledNotes flag is set to true | ||
| if (calEvent.hideCalendarNotes) { | ||
| calEvent.additionalNotes = "Notes have been hidden by the organizer"; // TODO: i18n this string? | ||
| } | ||
|
|
||
| // TODO: Surface success/error messages coming from apps to improve end user visibility | ||
| const creationResult = calendar | ||
| ? await calendar | ||
| .createEvent(calEvent, credential.id) | ||
| .catch(async (error: { code: number; calError: string }) => { | ||
| success = false; | ||
| /** | ||
| * There is a time when selectedCalendar externalId doesn't match witch certain credential | ||
| * so google returns 404. | ||
| * */ | ||
| if (error?.code === 404) { | ||
| return undefined; | ||
| } | ||
| if (error?.calError) { | ||
| calError = error.calError; | ||
| } | ||
| log.error("createEvent failed", JSON.stringify(error), calEvent); | ||
| // @TODO: This code will be off till we can investigate an error with it | ||
| //https://github.com/calcom/cal.com/issues/3949 | ||
| // await sendBrokenIntegrationEmail(calEvent, "calendar"); | ||
| return undefined; | ||
| }) | ||
| : undefined; | ||
|
|
||
| return { | ||
|
|
@@ -261,6 +264,8 @@ export const createEvent = async ( | |
| originalEvent: calEvent, | ||
| calError, | ||
| calWarnings: creationResult?.additionalInfo?.calWarnings || [], | ||
| externalId, | ||
| credentialId: credential.id, | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔷 Medium: Changing the empty case to [] alters truthiness (an empty array is truthy), which can cause downstream checks like
if (evt.destinationCalendar)to behave as if a calendar is present. To avoid subtle bugs across consumers, return null when there is no destination calendar or ensure all consumers check.length > 0.