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

Revert "Revert "fix: weekly limits (#10404)"" 

This reverts commit 83678dfea2.
pull/10544/head
Alex van Andel 2023-08-02 16:27:30 +01:00
parent 83678dfea2
commit bf050b498c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/getUserAvailability.ts
View File

@ -42,6 +42,7 @@ const getEventType = async (id: number) => {
bookingLimits: true,
durationLimits: true,
timeZone: true,
length: true,
metadata: true,
schedule: {
select: {
@ -165,8 +166,9 @@ export async function getUserAvailability(
const busyTimes = await getBusyTimes({
credentials: user.credentials,
startTime: dateFrom.toISOString(),
endTime: dateTo.toISOString(),
// needed to correctly apply limits (weeks can be part of two months)
startTime: dateFrom.startOf("week").toISOString(),
endTime: dateTo.endOf("week").toISOString(),
eventTypeId,
userId: user.id,
username: `${user.username}`,
@ -374,7 +376,7 @@ const getBusyTimesFromDurationLimits = async (
// loop through all dates and check if we have reached the limit
for (const date of dates) {
let total = duration ?? 0;
let total = (duration || eventType?.length) ?? 0;
const startDate = date.startOf(filter);
const endDate = date.endOf(filter);