feat: date range overhaul by emrysal · Pull Request #9802 · calcom/cal.com

emrysal · 2023-06-26T12:08:37Z

Would like 3 approvals before merge 🙏

What does this PR do?

Rewrites slot/availability logic by using date ranges. It simplifies the code, it was really tricky to make fixes in the old logic. It also fixes the issue that date overrides in different timezones didn't adjust, resulting in the organizer being booked outside their availability. All existing tests are passing + added new tests for the new logic

How should it be tested?

check if all test pass with yarn test
check if the available slots shown for an event are correct with different combinations of event type settings and time zones:
- organizer and attendee timezones
- working hours
- date overrides
- event type setting (min booking notice, buffers, event duration, etc.)

Fixes that date overrides were not adjusted to different timezones:
Fixes #8666
Fixes #8374
Fixes #8329
Fixes #8000
Fixes #7687
Fixes #7114

…ed hosts

…otice

alannnc

Working fine and also with slots.

leog

Tested a bunch of availability and time zones, as well as different event types courtesy of our pro user. Tests passed too.

zomars

hariombalhara · 2023-07-04T04:03:29Z

I am seeing these 2 failures locally when running tests.

CarinaWolli · 2023-07-04T04:09:44Z

I am seeing these 2 failures locally when running tests.

@hariombalhara What's your system time zone?

hariombalhara · 2023-07-04T04:18:13Z

IST

hariombalhara · 2023-07-04T05:38:08Z

apps/web/test/lib/getSchedule.test.ts

+          `04:15:00.000Z`,
+          `05:00:00.000Z`,
+          `05:45:00.000Z`,
+          `06:30:00.000Z`,
+          `07:15:00.000Z`,
+          `08:00:00.000Z`,
+          `08:45:00.000Z`,
+          `09:30:00.000Z`,
+          `10:15:00.000Z`,
+          `11:00:00.000Z`,
+          `11:45:00.000Z`,


What's the reason for this time shift by 30mins? Was it a bug?

So we used to block out the slots for the duration of the slots - so if there was a 10m meeting at 4:15 and the event length was 45m - the next open slot would be 5:00. We've now changed this, so it will open up the nearest :15 - so 4:30 will open up again instead of 5:00.

PeerRich · 2023-07-04T11:34:08Z

this has two approvals. should I merge? We can do a follow up PR for NITs

hariombalhara · 2023-07-04T12:28:01Z

Created the bookings(133-136) in the order shown below in prisma studio

I was then able to make a booking (with ID 137) for the time that was already booked(See 135).

Not sure if it's important but I used three different events (15min, 30min, 60min).
Also, organizer timezone was PKT and booking was done in IST.

…works

hariombalhara

LGTM !! Let's finish those double bookings

zomars

Let's go!

emrysal and others added 30 commits May 9, 2023 10:08

Started implementing DateRanges

7a31b77

Use groupBy to override working hours with date overrides

207c15c

add getAggregatedAvailabilty to get collective availabilities for fix…

b6e8f04

…ed hosts

fix infinity loop

f2067b0

fix date format

a4cdbd4

remove comment

dccd164

add implement substract function and use for getting freeBusy times

8d3109f

improve variable names

302aa5a

Commit work in progress, test failing right now

4fe81c4

Fixed processor params

c307887

Fix types

9a06dc9

Tests passing, update to processDateOverride to ensure UTC

e7482ca

Moved slots.test.ts into @calcom/lib

9733543

Enables new getSlots logic

9299e96

Merge branch 'main' into feature/date-range-overhaul

6ec607f

fixes OutOfBound error

23a8cf3

fix slot start times of current day + take into account min booking n…

884ba75

…otice

use getAggrededAvailability to get available date ranges

9e8b116

make round robin work (not yet tested)

dbcce6e

substract busy times from available times

a19dcc0

add first test for new slot logic

a794c3b

fix last timeslot before midnight + test passing now

4e16f4c

Merged with main

821fff5

add default value for offsetStart

3d3b3d3

add default value for offsetStart

e0c7623

fix min booking notice if first open slots are on the next day

84550d2

add more tests for slots logic

498dbe0

fix timeslot that ends at midnight

aa06453

Merge branch 'main' into feature/date-range-overhaul

bb390e2

Merge branch 'main' into feature/date-range-overhaul

7fd45ff

PeerRich removed the request for review from roae July 3, 2023 14:57

Return [] when there are no dateranges

198cca4

vercel bot had a problem deploying to Preview – api July 3, 2023 16:05 Failure

vercel bot had a problem deploying to Preview – ui July 3, 2023 16:05 Failure

emrysal added 2 commits July 3, 2023 12:09

Exclude unfixedHosts if there is none

f356c0e

Removed dead code

e88e763

vercel bot had a problem deploying to Preview – api July 3, 2023 16:16 Failure

alannnc previously approved these changes Jul 3, 2023

View reviewed changes

Use dateRanges in the handleNewBooking logic

ebd7a12

leog previously approved these changes Jul 3, 2023

View reviewed changes

Merge branch 'main' into feature/date-range-overhaul

d9f6186

zomars previously approved these changes Jul 4, 2023

View reviewed changes

hariombalhara reviewed Jul 4, 2023

View reviewed changes

emrysal and others added 4 commits July 4, 2023 10:22

Merge branch 'main' into feature/date-range-overhaul

1c88cc7

Fixed a bug in the subtract() function, also added tests to prove it …

34cd999

…works

This was failing in IST - converted to use dateRanges, pass

171c0fe

Merge branch 'main' into feature/date-range-overhaul

eaba122

hariombalhara previously approved these changes Jul 5, 2023

View reviewed changes

PeerRich and others added 2 commits July 5, 2023 12:29

Merge branch 'main' into feature/date-range-overhaul

8ddb390

Merge branch 'main' into feature/date-range-overhaul

e050932

zomars previously approved these changes Jul 5, 2023

View reviewed changes

Linting

0a6cdac

zomars approved these changes Jul 5, 2023

View reviewed changes

PeerRich mentioned this pull request Jul 6, 2023

[CAL-685] Date overrides don't set you as available if the regular weekday has start and end time disabled #6279

Closed

CarinaWolli mentioned this pull request Jul 10, 2023

[CAL-1464] round robin bookable even tho fixed host is OOO #8207

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: date range overhaul#9802

feat: date range overhaul#9802
PeerRich merged 88 commits intomainfrom
feature/date-range-overhaul

emrysal commented Jun 26, 2023 •

edited

Loading

Uh oh!

alannnc left a comment

Uh oh!

leog left a comment

Uh oh!

zomars left a comment

Uh oh!

hariombalhara commented Jul 4, 2023

Uh oh!

CarinaWolli commented Jul 4, 2023 •

edited

Loading

Uh oh!

hariombalhara commented Jul 4, 2023

Uh oh!

hariombalhara Jul 4, 2023

Uh oh!

emrysal Jul 4, 2023

Uh oh!

PeerRich commented Jul 4, 2023

Uh oh!

hariombalhara commented Jul 4, 2023 •

edited

Loading

Uh oh!

hariombalhara left a comment

Uh oh!

zomars left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

emrysal commented Jun 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

How should it be tested?

Uh oh!

alannnc left a comment

Choose a reason for hiding this comment

Uh oh!

leog left a comment

Choose a reason for hiding this comment

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

hariombalhara commented Jul 4, 2023

Uh oh!

CarinaWolli commented Jul 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hariombalhara commented Jul 4, 2023

Uh oh!

hariombalhara Jul 4, 2023

Choose a reason for hiding this comment

Uh oh!

emrysal Jul 4, 2023

Choose a reason for hiding this comment

Uh oh!

PeerRich commented Jul 4, 2023

Uh oh!

hariombalhara commented Jul 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

emrysal commented Jun 26, 2023 •

edited

Loading

CarinaWolli commented Jul 4, 2023 •

edited

Loading

hariombalhara commented Jul 4, 2023 •

edited

Loading