public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amend logic to figure out the months between dates (#7289)

pull/7291/head
Alex van Andel 2023-02-22 21:36:30 +00:00 committed by GitHub
parent d2b45e52ff
commit a3c10d0beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/pages/[user]/calendar-cache/[month].tsx
View File

@ -30,7 +30,7 @@ export const getStaticProps: GetStaticProps<
},
});
const startDate = (
dayjs(month, "YYYY-MM").isSame(dayjs(), "month") ? dayjs() : dayjs(month, "YYYY-MM")
dayjs(month, "YYYY-MM").isSame(dayjs(), "month") ? dayjs.utc() : dayjs.utc(month, "YYYY-MM")
).startOf("day");
const endDate = startDate.endOf("month");
try {

7
packages/core/CalendarManager.ts
View File

@ -1,4 +1,4 @@
import { SelectedCalendar } from "@prisma/client";
import type { SelectedCalendar } from "@prisma/client";
import _ from "lodash";
import * as process from "process";
@ -10,7 +10,7 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import logger from "@calcom/lib/logger";
import { performance } from "@calcom/lib/server/perfObserver";
import type { CalendarEvent, EventBusyDate, NewCalendarEventType } from "@calcom/types/Calendar";
import { CredentialPayload, CredentialWithAppName } from "@calcom/types/Credential";
import type { CredentialPayload, CredentialWithAppName } from "@calcom/types/Credential";
import type { EventResult } from "@calcom/types/EventManager";
const log = logger.getChildLogger({ prefix: ["CalendarManager"] });
@ -193,9 +193,8 @@ export const getBusyCalendarTimes = async (
results = await getNextCache(username, dayjs(dateFrom).format("YYYY-MM"));
} else {
// if dateFrom and dateTo is from different months get cache by each month
const monthsOfDiff = dayjs(dateTo).diff(dayjs(dateFrom), "month");
const months: string[] = [dayjs(dateFrom).format("YYYY-MM")];
for (let i = 1; i <= monthsOfDiff; i++) {
for (let i = 1; dayjs(dateFrom).add(i, "month").isBefore(dateTo); i++) {
months.push(dayjs(dateFrom).add(i, "month").format("YYYY-MM"));
}
const data: EventBusyDate[][][] = await Promise.all(months.map((month) => getNextCache(username, month)));