Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: invalid Cancelled / Rescheduled downstream calendar block #14700

Merged
merged 3 commits into from
Apr 22, 2024

Conversation

emrysal
Copy link
Contributor

@emrysal emrysal commented Apr 22, 2024

What does this PR do?

Until we've got bi-directional communication; our bookings table should not generate busyTimes when external calendars are connected.

@graphite-app graphite-app bot requested a review from a team April 22, 2024 10:12
Copy link
Contributor

github-actions bot commented Apr 22, 2024

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

@dosubot dosubot bot added bookings area: bookings, availability, timezones, double booking core area: core, team members only 🐛 bug Something isn't working labels Apr 22, 2024
Copy link

vercel bot commented Apr 22, 2024

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

Name Status Preview Comments Updated (UTC)
platform-starter-kit ❌ Failed (Inspect) Apr 22, 2024 10:53am
3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ai ⬜️ Ignored (Inspect) Visit Preview Apr 22, 2024 10:53am
cal ⬜️ Ignored (Inspect) Visit Preview Apr 22, 2024 10:53am
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview Apr 22, 2024 10:53am

Copy link

graphite-app bot commented Apr 22, 2024

Graphite Automations

"Add foundation team as reviewer" took an action on this PR • (04/22/24)

1 reviewer was added to this PR based on Keith Williams's automation.

Copy link
Contributor

github-actions bot commented Apr 22, 2024

📦 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! 🙌

Copy link

deploysentinel bot commented Apr 22, 2024

Current Playwright Test Results Summary

✅ 310 Passing - ⚠️ 15 Flaky

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

(Last updated on 04/22/2024 11:05:55am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: e3ce933

Started: 04/22/2024 11:02:43am UTC

⚠️ Flakes

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Availablity Can manage single schedule
Retry 1Initial Attempt
1.29% (3) 3 / 233 runs
failed over last 7 days
24.46% (57) 57 / 233 runs
flaked over last 7 days

📄   packages/app-store/routing-forms/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Routing Forms Seeded Routing Form Test preview should return correct route
Retry 1Initial Attempt
0% (0) 0 / 231 runs
failed over last 7 days
35.06% (81) 81 / 231 runs
flaked over last 7 days

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

Top 1 Common Error Messages

null

8 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 1Initial Attempt
11.84% (27) 27 / 228 runs
failed over last 7 days
52.63% (120) 120 / 228 runs
flaked over last 7 days
Popup Tests should be able to reschedule
Retry 1Initial Attempt
-148.15% (-120) -120 / 81 runs
failed over last 7 days
148.15% (120) 120 / 81 runs
flaked over last 7 days
Popup Tests should open Routing Forms embed on click
Retry 1Initial Attempt
-148.15% (-120) -120 / 81 runs
failed over last 7 days
148.15% (120) 120 / 81 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API
Retry 1Initial Attempt
-145.68% (-118) -118 / 81 runs
failed over last 7 days
146.91% (119) 119 / 81 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when configured with 'auto' theme using Embed API
Retry 1Initial Attempt
-148.75% (-119) -119 / 80 runs
failed over last 7 days
148.75% (119) 119 / 80 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Booker Profile Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-148.75% (-119) -119 / 80 runs
failed over last 7 days
148.75% (119) 119 / 80 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Event Booking Page) with dark theme when configured with dark theme using Embed API
Retry 1Initial Attempt
-148.75% (-119) -119 / 80 runs
failed over last 7 days
148.75% (119) 119 / 80 runs
flaked over last 7 days
Popup Tests prendered embed should be loaded and apply the config given to it
Retry 1Initial Attempt
-148.75% (-119) -119 / 80 runs
failed over last 7 days
148.75% (119) 119 / 80 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Teams - NonOrg -- legacy Can create a booking for Round Robin EventType
Retry 1Initial Attempt
12.45% (29) 29 / 233 runs
failed over last 7 days
15.88% (37) 37 / 233 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/namespacing.e2e.ts • 4 Flakes

Top 1 Common Error Messages

null

4 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Namespacing Inline Embed Double install Embed Snippet with inline embed without a namespace(i.e. default namespace)
Retry 1Initial Attempt
0% (0) 0 / 88 runs
failed over last 7 days
48.86% (43) 43 / 88 runs
flaked over last 7 days
Namespacing Inline Embed Double install Embed Snippet with inline embed using a namespace
Retry 1Initial Attempt
0% (0) 0 / 88 runs
failed over last 7 days
46.59% (41) 41 / 88 runs
flaked over last 7 days
Namespacing Inline Embed Add inline embed using a namespace without reload
Retry 1Initial Attempt
1.14% (1) 1 / 88 run
failed over last 7 days
45.45% (40) 40 / 88 runs
flaked over last 7 days
Namespacing Different namespaces can have different init configs
Retry 1Initial Attempt
0% (0) 0 / 88 runs
failed over last 7 days
48.86% (43) 43 / 88 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Member

@CarinaWolli CarinaWolli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good 👍

@emrysal emrysal merged commit 0306ad7 into main Apr 22, 2024
38 of 40 checks passed
@emrysal emrysal deleted the bugfix/cancelled-meetings-blocked-slots branch April 22, 2024 15:10
Copy link
Member

@CarinaWolli CarinaWolli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emrysal I looked at this one again and have some concerns

// TODO: Reflect downstream cancellations in our Booking database and use Booking as
// source of truth.
const busyTimes =
credentials?.length > 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other non-calendar apps are also in credentials. So if there is no calendar but for example true we wouldn't get any busyTimes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're right, but it also seems to me that the input to calendarCredentials is this credentials array.. should be pre-filtered to contain only calendar credentials

}
aggregate.push({
start: dayjs(startTime)
.subtract((eventType?.beforeEventBuffer || 0) + (afterEventBuffer || 0), "minute")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't we now breaking our buffers with that?

keithwillcode pushed a commit that referenced this pull request Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bookings area: bookings, availability, timezones, double booking 🐛 bug Something isn't working core area: core, team members only foundation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants