fix: Duplicate Calendar Invites on rescheduling an accepted booking that requires confirmation by hariombalhara · Pull Request #11827 · calcom/cal.diy

hariombalhara · 2023-10-11T11:44:24Z

What does this PR do?

Reason behind the issue was simply that the code always assumed that rescheduling would move the calendar invite to new time but in case of a booking that requires confirmation it is not true as the booking goes to PENDING state on reschedule.

Added a test as well for the flow
Before Fix - Loom
After Fix - Loom

Type of change

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

How should this be tested?

Turn on event approval in settings
Do a booking as booker
Accept the booking as organizer
Reschedule the booking as booker. At this point notice that the calendar event didn't get cancelled, it just moved to new time without confirmation from organizer.
Confirm the new booking. Now, you would see two calendar invites.

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2023-10-11T11:44:24Z

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 12, 2023 5:31am
api	❌ Failed (Inspect)			Oct 12, 2023 5:31am
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 12, 2023 5:31am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 12, 2023 5:31am
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 12, 2023 5:31am

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Oct 12, 2023 5:31am
qa	⬜️ Ignored (Inspect)	Visit Preview		Oct 12, 2023 5:31am

github-actions · 2023-10-11T11:44:39Z

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

hariombalhara · 2023-10-11T11:47:38Z

  };
 };

-export const deleteEvent = async (


It was unused method, started using it and fixed it.

hariombalhara · 2023-10-11T11:49:52Z

-      videoCredential = this.videoCredentials
-        // Whenever a new video connection is added, latest credentials are added with the highest ID.
-        // Because you can't rely on having them in the highest first order here, ensure this by sorting in DESC order
-        .sort((a, b) => {


Sort does the sorting in place, so it modifies this.videoCredentials itself. Moved this sorting to constructor to make the intention more clear and so that others don't need to do it again.

github-actions · 2023-10-11T11:50:50Z

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

deploysentinel · 2023-10-11T11:52:07Z

Current Playwright Test Results Summary

✅ 147 Passing - ⚠️ 3 Flaky

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

(Last updated on 10/12/2023 05:33:33am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 4a361d0

Started: 10/12/2023 05:31:05am UTC

⚠️ Flakes

📄 apps/web/playwright/login.2fa.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
2FA Tests should allow a user to enable 2FA and login using 2FA Retry 1 • Initial Attempt	1.37% (4) 4 / 291 runs failed over last 7 days	36.08% (105) 105 / 291 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 be able to reschedule Retry 1 • Initial Attempt	5.25% (16) 16 / 305 runs failed over last 7 days	94.10% (287) 287 / 305 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 1 • Initial Attempt	2.29% (7) 7 / 306 runs failed over last 7 days	18.95% (58) 58 / 306 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-10-11T12:56:14Z

+        reference.type.includes("_calendar")
+      );
+      // There was a case that booking didn't had any reference and we don't want to throw error on function
+      if (bookingCalendarReference) {


Extracted out in a variable.

hariombalhara · 2023-10-11T12:57:24Z

+      // If the reschedule doesn't require confirmation, we can "update" the events and meetings to new time.
+      const isDedicated = evt.location ? isDedicatedIntegration(evt.location) : null;
+      // If and only if event type is a dedicated meeting, update the dedicated video meeting.
+      if (isDedicated) {
+        const result = await this.updateVideoEvent(evt, booking);
+        const [updatedEvent] = Array.isArray(result.updatedEvent)
+          ? result.updatedEvent
+          : [result.updatedEvent];
+
+        if (updatedEvent) {
+          evt.videoCallData = updatedEvent;


Moved existing code into this else condition

hariombalhara · 2023-10-12T04:11:01Z

          },
        };
      }
+      if (booking.attendees) {


Support creating fake attendees as well.

hariombalhara · 2023-10-12T04:11:25Z

            });
          },
+          deleteEvent: async (...rest: any[]) => {
+            log.silly("mockCalendar.deleteEvent", JSON.stringify({ rest }));


Verify deleteEvent calls

hariombalhara · 2023-10-12T04:11:41Z

                });
              },
+              deleteMeeting: async (...rest: any[]) => {
+                log.silly("MockVideoApiAdapter.deleteMeeting", JSON.stringify(rest));


Allow verifying deleteMeeting calls

hariombalhara · 2023-10-12T04:12:34Z

+      // Whenever a new video connection is added, latest credentials are added with the highest ID.
+      // Because you can't rely on having them in the highest first order here, ensure this by sorting in DESC order
+      // We also don't have updatedAt or createdAt dates on credentials so this is the best we can do
+      .sort((a, b) => {
+        return b.id - a.id;
+      });


Moved here from other place.

…ooking requires confirmation

…r-events-for-rescheduled-booking

…hm in separate PR

hariombalhara · 2023-10-12T05:25:03Z

+      );
+
+      // eslint-disable-next-line playwright/no-skipped-test
+      test.skip(


Wrote the following 2 tests but they were failing as there is bug in identifying properly when an organizer reschedules the booking. Fill fix it in the followup PR as that's taking time.

CarinaWolli

Tested and works. Code looks good as well 🙏

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

hariombalhara changed the title ~~Delete calendar events and meetings for previous booking in case of b…~~ fix: Duplicate Calendar Invites on rescheduling an accepted booking that requires confirmation Oct 11, 2023

vercel Bot deployed to Preview – ai October 11, 2023 11:47 View deployment

hariombalhara commented Oct 11, 2023

View reviewed changes

vercel Bot deployed to Preview – ui October 11, 2023 11:48 View deployment

vercel Bot deployed to Preview – api October 11, 2023 11:49 View deployment

hariombalhara commented Oct 11, 2023

View reviewed changes

vercel Bot deployed to Preview – dev October 11, 2023 11:50 View deployment

vercel Bot deployed to Preview – cal-demo October 11, 2023 11:51 View deployment

hariombalhara force-pushed the fix/duplicate-calendar-events-for-rescheduled-booking branch from 46581f0 to 3ec69ad Compare October 11, 2023 12:47

hariombalhara commented Oct 11, 2023

View reviewed changes

hariombalhara force-pushed the fix/duplicate-calendar-events-for-rescheduled-booking branch from 7021226 to fa50c7c Compare October 11, 2023 13:45

vercel Bot deployed to Preview – ai October 11, 2023 13:49 View deployment

vercel Bot deployed to Preview – ui October 11, 2023 13:49 View deployment

vercel Bot deployed to Preview – api October 11, 2023 13:51 View deployment

vercel Bot deployed to Preview – dev October 11, 2023 13:52 View deployment

vercel Bot deployed to Preview – cal-demo October 11, 2023 13:53 View deployment

hariombalhara force-pushed the fix/duplicate-calendar-events-for-rescheduled-booking branch from fa50c7c to 73db1d5 Compare October 12, 2023 04:10

hariombalhara commented Oct 12, 2023

View reviewed changes

vercel Bot deployed to Preview – ai October 12, 2023 04:14 View deployment

vercel Bot deployed to Preview – ui October 12, 2023 04:14 View deployment

hariombalhara commented Oct 12, 2023

View reviewed changes

Comment thread packages/features/bookings/lib/handleNewBooking.ts Outdated

vercel Bot deployed to Preview – api October 12, 2023 04:16 View deployment

vercel Bot deployed to Preview – dev October 12, 2023 04:16 View deployment

hariombalhara commented Oct 12, 2023

View reviewed changes

Comment thread packages/features/bookings/lib/handleNewBooking.ts

vercel Bot deployed to Preview – cal-demo October 12, 2023 04:17 View deployment

hariombalhara commented Oct 12, 2023

View reviewed changes

Comment thread packages/features/bookings/lib/handleNewBooking.ts Outdated

hariombalhara added 3 commits October 12, 2023 10:49

Delete calendar events and meetings for previous booking in case of b…

99f7ee9

…ooking requires confirmation

Merge remote-tracking branch 'origin/main' into fix/duplicate-calenda…

44e9a64

…r-events-for-rescheduled-booking

Remove requiresConfirmation organizer rescheduling fixes, will add te…

4a361d0

…hm in separate PR

hariombalhara force-pushed the fix/duplicate-calendar-events-for-rescheduled-booking branch from 73db1d5 to 4a361d0 Compare October 12, 2023 05:23

hariombalhara commented Oct 12, 2023

View reviewed changes

vercel Bot deployed to Preview – ai October 12, 2023 05:27 View deployment

vercel Bot had a problem deploying to Preview – api October 12, 2023 05:27 Failure

vercel Bot deployed to Preview – ui October 12, 2023 05:27 View deployment

vercel Bot deployed to Preview – dev October 12, 2023 05:31 View deployment

vercel Bot deployed to Preview – cal-demo October 12, 2023 05:31 View deployment

hariombalhara marked this pull request as ready for review October 12, 2023 05:32

hariombalhara requested a review from a team October 12, 2023 07:02

hariombalhara added High priority Created by Linear-GitHub Sync bookings area: bookings, availability, timezones, double booking labels Oct 12, 2023

Udit-takkar self-requested a review October 12, 2023 08:44

CarinaWolli approved these changes Oct 12, 2023

View reviewed changes

CarinaWolli merged commit db059d8 into main Oct 12, 2023

CarinaWolli deleted the fix/duplicate-calendar-events-for-rescheduled-booking branch October 12, 2023 12:29

Conversation

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

Uh oh!

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Uh oh!

vercel Bot commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hariombalhara Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

deploysentinel Bot commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Top 1 Common Error Messages

Test Case Results

Uh oh!

hariombalhara Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CarinaWolli left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hariombalhara commented Oct 11, 2023 •

edited

Loading

vercel Bot commented Oct 11, 2023 •

edited

Loading

github-actions Bot commented Oct 11, 2023 •

edited

Loading

hariombalhara Oct 11, 2023 •

edited

Loading

github-actions Bot commented Oct 11, 2023 •

edited

Loading

deploysentinel Bot commented Oct 11, 2023 •

edited

Loading

hariombalhara Oct 12, 2023 •

edited

Loading