mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

fixed calendso busy query timezone issue (#1360)

Browse source 
* fixed calendso busy query timezone issue

* rename tz to timezone for consistency

* added back missing code

Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Nathaniel 2022-02-10 02:34:47 +08:00 committed by GitHub
parent a41dd30467
commit 7f5a2363f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/integrations/calendar/services/BaseCalendarService.ts
View file

@ -1,5 +1,7 @@
import { Credential } from "@prisma/client"; import { Credential } from "@prisma/client";
import dayjs from "dayjs"; import dayjs from "dayjs";
import timezone from "dayjs/plugin/timezone";
import utc from "dayjs/plugin/utc";
import ICAL from "ical.js"; import ICAL from "ical.js";
import { createEvent } from "ics"; import { createEvent } from "ics";
import { import {
@ -24,6 +26,9 @@ import { CalendarEventType, EventBusyDate, NewCalendarEventType } from "../const
import { Calendar, CalendarEvent, IntegrationCalendar } from "../interfaces/Calendar"; import { Calendar, CalendarEvent, IntegrationCalendar } from "../interfaces/Calendar";
import { convertDate, getAttendees, getDuration } from "../utils/CalendarUtils"; import { convertDate, getAttendees, getDuration } from "../utils/CalendarUtils";
dayjs.extend(utc);
dayjs.extend(timezone);
const CALENDSO_ENCRYPTION_KEY = process.env.CALENDSO_ENCRYPTION_KEY || ""; const CALENDSO_ENCRYPTION_KEY = process.env.CALENDSO_ENCRYPTION_KEY || "";
export default abstract class BaseCalendarService implements Calendar { export default abstract class BaseCalendarService implements Calendar {
@ -291,11 +296,11 @@ export default abstract class BaseCalendarService implements Calendar {
vcalendar.getFirstSubcomponent("vtimezone")?.getFirstPropertyValue("tzid") || ""; vcalendar.getFirstSubcomponent("vtimezone")?.getFirstPropertyValue("tzid") || "";
const startDate = calendarTimezone const startDate = calendarTimezone
? dayjs(event.startDate.toJSDate()).tz(calendarTimezone) ? dayjs.tz(event.startDate.toString(), calendarTimezone)
: new Date(event.startDate.toUnixTime() * 1000); : new Date(event.startDate.toUnixTime() * 1000);
const endDate = calendarTimezone const endDate = calendarTimezone
? dayjs(event.endDate.toJSDate()).tz(calendarTimezone) ? dayjs.tz(event.endDate.toString(), calendarTimezone)
: new Date(event.endDate.toUnixTime() * 1000); : new Date(event.endDate.toUnixTime() * 1000);
return { return {