split date ranges for calling /freebusy endpoint (#11962)
Co-authored-by: CarinaWolli <wollencarina@gmail.com>pull/12013/head^2
parent
52386e08f2
commit
c2a57fd72b
|
@ -4,6 +4,7 @@ import type { calendar_v3 } from "googleapis";
|
||||||
import { google } from "googleapis";
|
import { google } from "googleapis";
|
||||||
|
|
||||||
import { MeetLocationType } from "@calcom/app-store/locations";
|
import { MeetLocationType } from "@calcom/app-store/locations";
|
||||||
|
import dayjs from "@calcom/dayjs";
|
||||||
import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
|
import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
|
||||||
import { getLocation, getRichDescription } from "@calcom/lib/CalEventParser";
|
import { getLocation, getRichDescription } from "@calcom/lib/CalEventParser";
|
||||||
import type CalendarService from "@calcom/lib/CalendarService";
|
import type CalendarService from "@calcom/lib/CalendarService";
|
||||||
|
@ -369,17 +370,20 @@ export default class GoogleCalendarService implements Calendar {
|
||||||
timeMin: string;
|
timeMin: string;
|
||||||
timeMax: string;
|
timeMax: string;
|
||||||
items: { id: string }[];
|
items: { id: string }[];
|
||||||
}): Promise<calendar_v3.Schema$FreeBusyResponse> {
|
}): Promise<EventBusyDate[] | null> {
|
||||||
const calendar = await this.authedCalendar();
|
const calendar = await this.authedCalendar();
|
||||||
const flags = await getFeatureFlagMap(prisma);
|
const flags = await getFeatureFlagMap(prisma);
|
||||||
|
|
||||||
|
let freeBusyResult: calendar_v3.Schema$FreeBusyResponse = {};
|
||||||
if (!flags["calendar-cache"]) {
|
if (!flags["calendar-cache"]) {
|
||||||
this.log.warn("Calendar Cache is disabled - Skipping");
|
this.log.warn("Calendar Cache is disabled - Skipping");
|
||||||
const { timeMin, timeMax, items } = args;
|
const { timeMin, timeMax, items } = args;
|
||||||
const apires = await calendar.freebusy.query({
|
const apires = await calendar.freebusy.query({
|
||||||
requestBody: { timeMin, timeMax, items },
|
requestBody: { timeMin, timeMax, items },
|
||||||
});
|
});
|
||||||
return apires.data;
|
|
||||||
}
|
freeBusyResult = apires.data;
|
||||||
|
} else {
|
||||||
const { timeMin: _timeMin, timeMax: _timeMax, items } = args;
|
const { timeMin: _timeMin, timeMax: _timeMax, items } = args;
|
||||||
const { timeMin, timeMax } = handleMinMax(_timeMin, _timeMax);
|
const { timeMin, timeMax } = handleMinMax(_timeMin, _timeMax);
|
||||||
const key = JSON.stringify({ timeMin, timeMax, items });
|
const key = JSON.stringify({ timeMin, timeMax, items });
|
||||||
|
@ -393,8 +397,9 @@ export default class GoogleCalendarService implements Calendar {
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (cached) return cached.value as unknown as calendar_v3.Schema$FreeBusyResponse;
|
if (cached) {
|
||||||
|
freeBusyResult = cached.value as unknown as calendar_v3.Schema$FreeBusyResponse;
|
||||||
|
} else {
|
||||||
const apires = await calendar.freebusy.query({
|
const apires = await calendar.freebusy.query({
|
||||||
requestBody: { timeMin, timeMax, items },
|
requestBody: { timeMin, timeMax, items },
|
||||||
});
|
});
|
||||||
|
@ -419,7 +424,21 @@ export default class GoogleCalendarService implements Calendar {
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return apires.data;
|
freeBusyResult = apires.data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!freeBusyResult.calendars) return null;
|
||||||
|
|
||||||
|
const result = Object.values(freeBusyResult.calendars).reduce((c, i) => {
|
||||||
|
i.busy?.forEach((busyTime) => {
|
||||||
|
c.push({
|
||||||
|
start: busyTime.start || "",
|
||||||
|
end: busyTime.end || "",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return c;
|
||||||
|
}, [] as Prisma.PromiseReturnType<CalendarService["getAvailability"]>);
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAvailability(
|
async getAvailability(
|
||||||
|
@ -444,22 +463,44 @@ export default class GoogleCalendarService implements Calendar {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const calsIds = await getCalIds();
|
const calsIds = await getCalIds();
|
||||||
|
const originalStartDate = dayjs(dateFrom);
|
||||||
|
const originalEndDate = dayjs(dateTo);
|
||||||
|
const diff = originalEndDate.diff(originalStartDate, "days");
|
||||||
|
|
||||||
|
// /freebusy from google api only allows a date range of 90 days
|
||||||
|
if (diff <= 90) {
|
||||||
const freeBusyData = await this.getCacheOrFetchAvailability({
|
const freeBusyData = await this.getCacheOrFetchAvailability({
|
||||||
timeMin: dateFrom,
|
timeMin: dateFrom,
|
||||||
timeMax: dateTo,
|
timeMax: dateTo,
|
||||||
items: calsIds.map((id) => ({ id })),
|
items: calsIds.map((id) => ({ id })),
|
||||||
});
|
});
|
||||||
if (!freeBusyData?.calendars) throw new Error("No response from google calendar");
|
if (!freeBusyData) throw new Error("No response from google calendar");
|
||||||
const result = Object.values(freeBusyData.calendars).reduce((c, i) => {
|
|
||||||
i.busy?.forEach((busyTime) => {
|
return freeBusyData;
|
||||||
c.push({
|
} else {
|
||||||
start: busyTime.start || "",
|
const busyData = [];
|
||||||
end: busyTime.end || "",
|
|
||||||
});
|
const loopsNumber = Math.ceil(diff / 90);
|
||||||
});
|
|
||||||
return c;
|
let startDate = originalStartDate;
|
||||||
}, [] as Prisma.PromiseReturnType<CalendarService["getAvailability"]>);
|
let endDate = originalStartDate.add(90, "days");
|
||||||
return result;
|
|
||||||
|
for (let i = 0; i < loopsNumber; i++) {
|
||||||
|
if (endDate.isAfter(originalEndDate)) endDate = originalEndDate;
|
||||||
|
|
||||||
|
busyData.push(
|
||||||
|
...((await this.getCacheOrFetchAvailability({
|
||||||
|
timeMin: startDate.format(),
|
||||||
|
timeMax: endDate.format(),
|
||||||
|
items: calsIds.map((id) => ({ id })),
|
||||||
|
})) || [])
|
||||||
|
);
|
||||||
|
|
||||||
|
startDate = endDate.add(1, "minutes");
|
||||||
|
endDate = startDate.add(90, "days");
|
||||||
|
}
|
||||||
|
return busyData;
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.log.error("There was an error contacting google calendar service: ", error);
|
this.log.error("There was an error contacting google calendar service: ", error);
|
||||||
throw error;
|
throw error;
|
||||||
|
|
Loading…
Reference in New Issue