split date ranges for calling /freebusy endpoint #11962

CarinaWolli · 2023-10-18T09:57:09Z

What does this PR do?

The Google /freeBusy endpoint has a maximum time span of 90 days. However, in the column view longer timespans can happen. With this PR the duration is segmented into shorter timespans.

Fixes #11704

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Connect google calendar and toggle a calendar to check for conflicts
Edit the default availability that is associated with the event type you will use for testing:
- Enable only one day of the week
- Create several date overrides to disable a few of the available days
Go to to column view of the event type
Now this should show all available days and if the timespan of the 6 days shown is more than 90 days then this would have failed before

vercel · 2023-10-18T09:57:19Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 19, 2023 3:03pm
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 19, 2023 3:03pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 19, 2023 3:03pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 19, 2023 3:03pm

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview	Oct 19, 2023 3:03pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Oct 19, 2023 3:03pm
ui	⬜️ Ignored (Inspect)	Visit Preview	Oct 19, 2023 3:03pm

github-actions · 2023-10-18T09:57:28Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "split date ranges for calling  /freebusy endpoint". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

CarinaWolli · 2023-10-18T10:03:59Z

packages/app-store/googlecalendar/lib/CalendarService.ts

+      const diff = originalEndDate.diff(originalStartDate, "days");
+
+      // /freebusy from google api only allows a date range of 90 days
+      if (diff <= 90) {


similar logic as we have it for zohocalendar

github-actions · 2023-10-18T10:13:56Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

CarinaWolli · 2023-10-18T10:15:21Z

packages/app-store/googlecalendar/lib/CalendarService.ts

+      });
+      return c;
+    }, [] as Prisma.PromiseReturnType<CalendarService["getAvailability"]>);
+    return result;
  }

  async getAvailability(


Unsure how to write a test for this. @joeauyeung Do we already have tests for google calendar

We don't have any merged yet but it's in the works.

CarinaWolli · 2023-10-18T10:18:04Z

packages/app-store/googlecalendar/lib/CalendarService.ts

@@ -369,57 +370,75 @@ export default class GoogleCalendarService implements Calendar {
    timeMin: string;
    timeMax: string;
    items: { id: string }[];
-  }): Promise<calendar_v3.Schema$FreeBusyResponse> {
+  }): Promise<EventBusyDate[] | null> {


The only thing that changed in the getCacheOrFetchAvailability function is that we return nowEventBusyDate[] instead of calendar_v3.Schema$FreeBusyResponse

deploysentinel · 2023-10-18T10:26:46Z

Current Playwright Test Results Summary

✅ 182 Passing - ⚠️ 6 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 10/19/2023 03:07:18pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: a44cb33

Started: 10/19/2023 03:04:26pm UTC

⚠️ Flakes

📄 apps/web/playwright/integrations-stripe.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Stripe integration When event is paid and confirmed Cancelled paid booking should be refunded Retry 1 • Initial Attempt	0.65% (2) 2 / 309 runs failed over last 7 days	2.59% (8) 8 / 309 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme Retry 1 • Initial Attempt	3.14% (10) 10 / 318 runs failed over last 7 days	36.79% (117) 117 / 318 runs flaked over last 7 days
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	8.20% (26) 26 / 317 runs failed over last 7 days	89.91% (285) 285 / 317 runs flaked over last 7 days

📄 apps/web/playwright/webhook.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
FORM_SUBMITTED on submitting user form, triggers user webhook Retry 1 • Initial Attempt	0% (0) 0 / 307 runs failed over last 7 days	2.93% (9) 9 / 307 runs flaked over last 7 days

📄 apps/web/playwright/change-username.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Change username on settings User can change username Retry 1 • Initial Attempt	0.32% (1) 1 / 312 run failed over last 7 days	20.83% (65) 65 / 312 runs flaked over last 7 days

📄 apps/web/playwright/availability.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Availablity tests Date Overrides Retry 1 • Initial Attempt	4.13% (13) 13 / 315 runs failed over last 7 days	1.90% (6) 6 / 315 runs flaked over last 7 days

View Detailed Build Results

joeauyeung

LGTM

Timeslots are being blocked in both Oct and Feb

zomars · 2023-10-26T20:10:42Z

BTW This is conflicting with my calendar cache PR #11928 😢

CarinaWolli · 2023-10-26T20:29:57Z

BTW This is conflicting with my calendar cache PR #11928 😢

Should I help merge it into your branch? Or how would you wanna handle it?

zomars · 2023-10-26T20:58:41Z

I tagged you in a comment explaining my solution. Let me know if t achieves se same effect. Also I do need the raw gCal response in order to use in the inbound webhook. Hence all other changes for this PR were reverted.

Co-authored-by: CarinaWolli <wollencarina@gmail.com>

split date ranges for calling /freebusy endpoint

42f08ac

zomars added the core area: core, team members only label Oct 18, 2023

code clean up

ad5b168

CarinaWolli commented Oct 18, 2023

View reviewed changes

vercel bot deployed to Preview – ai October 18, 2023 10:04 View deployment

vercel bot deployed to Preview – api October 18, 2023 10:06 View deployment

vercel bot deployed to Preview – dev October 18, 2023 10:07 View deployment

vercel bot deployed to Preview – cal-demo October 18, 2023 10:08 View deployment

CarinaWolli commented Oct 18, 2023

View reviewed changes

CarinaWolli marked this pull request as ready for review October 18, 2023 10:15

Merge branch 'main' into fix/split-date-ranges

bf1b4a0

CarinaWolli requested a review from a team October 18, 2023 10:15

CarinaWolli added the Medium priority Created by Linear-GitHub Sync label Oct 18, 2023

CarinaWolli commented Oct 18, 2023

View reviewed changes

vercel bot deployed to Preview – ai October 18, 2023 10:19 View deployment

vercel bot deployed to Preview – ui October 18, 2023 10:20 View deployment

vercel bot deployed to Preview – api October 18, 2023 10:21 View deployment

vercel bot deployed to Preview – dev October 18, 2023 10:23 View deployment

vercel bot deployed to Preview – cal-demo October 18, 2023 10:23 View deployment

Merge branch 'main' into fix/split-date-ranges

a44cb33

vercel bot deployed to Preview – ai October 19, 2023 14:59 View deployment

vercel bot deployed to Preview – api October 19, 2023 15:01 View deployment

vercel bot deployed to Preview – dev October 19, 2023 15:02 View deployment

vercel bot deployed to Preview – cal-demo October 19, 2023 15:03 View deployment

joeauyeung approved these changes Oct 26, 2023

View reviewed changes

CarinaWolli merged commit c2a57fd into main Oct 26, 2023
36 of 37 checks passed

CarinaWolli deleted the fix/split-date-ranges branch October 26, 2023 14:29

CarinaWolli mentioned this pull request Oct 26, 2023

feat: Populate gCal calendar cache via webhooks #11928

Open

6 tasks

hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Nov 28, 2023

split date ranges for calling /freebusy endpoint (calcom#11962)

44abc13

Co-authored-by: CarinaWolli <wollencarina@gmail.com>

hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023

split date ranges for calling /freebusy endpoint (calcom#11962)

3d34790

Co-authored-by: CarinaWolli <wollencarina@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

split date ranges for calling /freebusy endpoint #11962

split date ranges for calling /freebusy endpoint #11962

CarinaWolli commented Oct 18, 2023 •

edited

vercel bot commented Oct 18, 2023 •

edited

github-actions bot commented Oct 18, 2023 •

edited

CarinaWolli Oct 18, 2023

github-actions bot commented Oct 18, 2023 •

edited

CarinaWolli Oct 18, 2023

joeauyeung Oct 26, 2023

CarinaWolli Oct 18, 2023

deploysentinel bot commented Oct 18, 2023 •

edited

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

joeauyeung left a comment

zomars commented Oct 26, 2023

CarinaWolli commented Oct 26, 2023

zomars commented Oct 26, 2023

split date ranges for calling /freebusy endpoint #11962

split date ranges for calling /freebusy endpoint #11962

Conversation

CarinaWolli commented Oct 18, 2023 • edited

What does this PR do?

Type of change

How should this be tested?

vercel bot commented Oct 18, 2023 • edited

github-actions bot commented Oct 18, 2023 • edited

CarinaWolli Oct 18, 2023

Choose a reason for hiding this comment

github-actions bot commented Oct 18, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

CarinaWolli Oct 18, 2023

Choose a reason for hiding this comment

joeauyeung Oct 26, 2023

Choose a reason for hiding this comment

CarinaWolli Oct 18, 2023

Choose a reason for hiding this comment

deploysentinel bot commented Oct 18, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

joeauyeung left a comment

Choose a reason for hiding this comment

zomars commented Oct 26, 2023

CarinaWolli commented Oct 26, 2023

zomars commented Oct 26, 2023

CarinaWolli commented Oct 18, 2023 •

edited

vercel bot commented Oct 18, 2023 •

edited

github-actions bot commented Oct 18, 2023 •

edited

github-actions bot commented Oct 18, 2023 •

edited

deploysentinel bot commented Oct 18, 2023 •

edited