fix: `videoCallUrl` not updating when rescheduling with a broken Calendar integration #11923

hariombalhara · 2023-10-16T15:03:07Z

What does this PR do?

Fixes, videoCallUrl not updating when rescheduling with a broken Calendar integration

Added an asssertion that verifies that it works now.
Added assertion to verify appsStatus also in email
Started using node-html-parser to easily test more things in email HTML

More details https://threads.com/34542266165?s=iejN9Cku3XDgLFAaAXrKBo

Type of change

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

How should this be tested?

Connect Google Calendar and setup Daily Video
Book a meeting with an event-type that uses the Google Calendar and has Daily Video as location
Go to Credential table and modify refresh_token and access_token for Google Calendar so that it can no longer fix itself
Reschedule the previous booking and notice that it is giving the previous Cal Video URL instead of a new one corresponding to the new booking UID.

Mandatory Tasks

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

vercel · 2023-10-16T15:03:17Z

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 17, 2023 10:11am
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 17, 2023 10:11am
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 17, 2023 10:11am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 17, 2023 10:11am

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview	Oct 17, 2023 10:11am
qa	⬜️ Ignored (Inspect)	Visit Preview	Oct 17, 2023 10:11am
ui	⬜️ Ignored (Inspect)	Visit Preview	Oct 17, 2023 10:11am

github-actions · 2023-10-16T15:03:23Z

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-16T15:03:57Z

apps/web/test/utils/bookingScenario/expects.ts

  if (parsedBody.payload.metadata?.videoCallUrl) {
    parsedBody.payload.metadata.videoCallUrl = parsedBody.payload.metadata.videoCallUrl
-      ? parsedBody.payload.metadata.videoCallUrl.replace(/\/video\/[a-zA-Z0-9]{22}/, "/video/DYNAMIC_UID")


Instead of considering every UID as DYNAMIC_UID, actually test the value as there was a bug that could have found if we were checking that.

github-actions · 2023-10-16T15:19:21Z

📦 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-16T15:19:59Z

Current Playwright Test Results Summary

✅ 162 Passing - ⚠️ 8 Flaky

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

(Last updated on 10/17/2023 10:14:04am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 1a0367b

Started: 10/17/2023 10:10:21am 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.75% (5) 5 / 286 runs failed over last 7 days	30.77% (88) 88 / 286 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Stripe integration Paid booking should be able to be rescheduled Retry 1 • Initial Attempt	3.32% (10) 10 / 301 runs failed over last 7 days	6.31% (19) 19 / 301 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 2 • Retry 1 • Initial Attempt	9.21% (28) 28 / 304 runs failed over last 7 days	89.14% (271) 271 / 304 runs flaked over last 7 days
Popup Tests should open embed iframe on click - Configured with light theme Retry 1 • Initial Attempt	3.61% (11) 11 / 305 runs failed over last 7 days	35.74% (109) 109 / 305 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Onboarding Onboarding v2 Onboarding Flow Retry 1 • Initial Attempt	0% (0) 0 / 300 runs failed over last 7 days	1% (3) 3 / 300 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/preview.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 302 runs failed over last 7 days	5.30% (16) 16 / 302 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 Non admin team members cannot create team in org Retry 1 • Initial Attempt	0% (0) 0 / 41 runs failed over last 7 days	26.83% (11) 11 / 41 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/inline.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Inline Iframe Inline Iframe - Configured with Dark Theme Retry 1 • Initial Attempt	3.64% (11) 11 / 302 runs failed over last 7 days	12.25% (37) 37 / 302 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-10-16T15:46:00Z

packages/features/bookings/lib/handleNewBooking.ts

@@ -2134,7 +2133,8 @@ async function handler(
      }
      return prev;
    }, {} as { [key: string]: AppsStatus });
-    evt.appsStatus = Object.values(calcAppsStatus);
+    resultStatus = Object.values(calcAppsStatus);
+    return resultStatus;


Return resultStatus instead of setting it directly on evt in the function. evt isn't an argument passed to the function.

It makes it more clear to understand what handleAppStatus is doing

hariombalhara · 2023-10-16T15:46:58Z

packages/features/bookings/lib/handleNewBooking.ts

-          cancellationReason: `$RCH$${rescheduleReason ? rescheduleReason : ""}`, // Removable code prefix to differentiate cancellation from rescheduling for email
-        });
-      }
+    const { metadata, videoCallUrl: _videoCallUrl } = getVideoCallDetails({


It's possible that only Calendar Integration may have failed, so we still have a new video URL.

hariombalhara · 2023-10-16T15:47:22Z

packages/features/bookings/lib/handleNewBooking.ts

+      results,
+    });
+
+    videoCallUrl = _videoCallUrl;


Update the out of block scope variable videoCallUrl

hariombalhara · 2023-10-16T15:48:02Z

packages/features/bookings/lib/handleNewBooking.ts

+    });
+
+    videoCallUrl = _videoCallUrl;
+    evt.appsStatus = handleAppsStatus(results, booking);


We should be able to call handleAppsStatus regardless of updateEvent presence. The function itself checks for results.

…tion failure

hariombalhara · 2023-10-17T08:48:04Z

packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts

        });

        expectBookingRescheduledWebhookToHaveBeenFired({
          booker,
          organizer,
          location: BookingLocations.CalVideo,
          subscriberUrl: "http://my-webhook.example.com",
-          videoCallUrl: `${WEBAPP_URL}/video/DYNAMIC_UID`,
+          videoCallUrl: `${WEBAPP_URL}/video/${createdBooking.uid}`,


Test the CalVideo URL completely.

hariombalhara · 2023-10-17T08:48:26Z

packages/features/bookings/lib/handleNewBooking/test/reschedule.test.ts

@@ -577,16 +592,27 @@ describe("handleNewBooking", () => {
          },
          to: {
            description: "",
-            location: "New York",
+            location: "integrations:daily",


Updated the test to use DailyVideo has location during reschedule

Udit-takkar

@hariombalhara so i got the correct meeting link on the booking page but i didn't got any email about rescheduling of meeting or that my integration in broken

hariombalhara · 2023-10-17T09:49:50Z

Yeah that is a known issue @Udit-takkar. It needs to be tackled separately.
#8197

In such case a broken integration email should be sent ideally. Also, we have considered even disabling the booking page itself if Google Calendar isn't connected correctly.
https://threads.com/34541026838?s=dAytZR5kvGHFyWgPAQ9Jv3

hariombalhara · 2023-10-17T10:06:30Z

packages/features/bookings/lib/handleNewBooking.ts

-          metadata.conferenceData = updatedEvent.conferenceData;
-          metadata.entryPoints = updatedEvent.entryPoints;
-          handleAppsStatus(results, booking);
-          videoCallUrl = metadata.hangoutLink || videoCallUrl || updatedEvent?.url;


At this moment videoCallUrl is undefined. So, we could just remove the middle videoCallUrl in ORing

Udit-takkar

LGTM

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

hariombalhara commented Oct 16, 2023

View reviewed changes

vercel bot deployed to Preview – ai October 16, 2023 15:05 View deployment

vercel bot deployed to Preview – ui October 16, 2023 15:06 View deployment

vercel bot deployed to Preview – api October 16, 2023 15:08 View deployment

hariombalhara force-pushed the fix/videoCallUrl-not-updating-in-reschedule branch from 8809eb3 to 37f5d42 Compare October 16, 2023 15:08

vercel bot deployed to Preview – ai October 16, 2023 15:12 View deployment

vercel bot deployed to Preview – ui October 16, 2023 15:12 View deployment

vercel bot deployed to Preview – api October 16, 2023 15:14 View deployment

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

vercel bot deployed to Preview – dev October 16, 2023 15:21 View deployment

hariombalhara force-pushed the fix/videoCallUrl-not-updating-in-reschedule branch from 37f5d42 to 7152d54 Compare October 16, 2023 15:35

vercel bot deployed to Preview – ai October 16, 2023 15:39 View deployment

vercel bot had a problem deploying to Preview – api October 16, 2023 15:39 Failure

vercel bot deployed to Preview – ui October 16, 2023 15:40 View deployment

hariombalhara force-pushed the fix/videoCallUrl-not-updating-in-reschedule branch 2 times, most recently from adc8fbc to 867e916 Compare October 16, 2023 15:44

hariombalhara commented Oct 16, 2023

View reviewed changes

hariombalhara changed the title ~~Fix videoCallUrl not updating when rescheduling with Calendar integra…~~ fix: videoCallUrl not updating when rescheduling with a broken Calendar integration Oct 16, 2023

vercel bot deployed to Preview – ai October 16, 2023 15:49 View deployment

vercel bot deployed to Preview – ui October 16, 2023 15:50 View deployment

Fix videoCallUrl not updating when rescheduling with Calendar integra…

8215312

…tion failure

hariombalhara force-pushed the fix/videoCallUrl-not-updating-in-reschedule branch from 867e916 to 8215312 Compare October 16, 2023 15:51

vercel bot deployed to Preview – ai October 17, 2023 07:26 View deployment

vercel bot deployed to Preview – ui October 17, 2023 07:26 View deployment

vercel bot deployed to Preview – api October 17, 2023 07:28 View deployment

vercel bot deployed to Preview – dev October 17, 2023 07:29 View deployment

vercel bot deployed to Preview – cal-demo October 17, 2023 07:30 View deployment

hariombalhara commented Oct 17, 2023

View reviewed changes

vercel bot deployed to Preview – ai October 17, 2023 08:50 View deployment

Add appStatus test and add node-html-parser for easy html email testing

b44ac00

hariombalhara force-pushed the fix/videoCallUrl-not-updating-in-reschedule branch from e1927ed to b44ac00 Compare October 17, 2023 08:52

hariombalhara requested review from emrysal, zomars and Udit-takkar October 17, 2023 08:53

vercel bot deployed to Preview – ai October 17, 2023 08:56 View deployment

vercel bot deployed to Preview – api October 17, 2023 08:59 View deployment

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

vercel bot deployed to Preview – dev October 17, 2023 09:04 View deployment

Udit-takkar reviewed Oct 17, 2023

View reviewed changes

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

Fix TS error in tests

1a0367b

hariombalhara commented Oct 17, 2023

View reviewed changes

vercel bot deployed to Preview – ai October 17, 2023 10:06 View deployment

Udit-takkar approved these changes Oct 17, 2023

View reviewed changes

vercel bot deployed to Preview – api October 17, 2023 10:08 View deployment

vercel bot deployed to Preview – dev October 17, 2023 10:09 View deployment

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

hariombalhara merged commit d12a5c5 into main Oct 17, 2023

hariombalhara deleted the fix/videoCallUrl-not-updating-in-reschedule branch October 17, 2023 11:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: `videoCallUrl` not updating when rescheduling with a broken Calendar integration #11923

fix: `videoCallUrl` not updating when rescheduling with a broken Calendar integration #11923

hariombalhara commented Oct 16, 2023 •

edited

Loading

vercel bot commented Oct 16, 2023 •

edited

Loading

github-actions bot commented Oct 16, 2023 •

edited

Loading

hariombalhara Oct 16, 2023

github-actions bot commented Oct 16, 2023 •

edited

Loading

deploysentinel bot commented Oct 16, 2023 •

edited

Loading

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

hariombalhara Oct 16, 2023 •

edited

Loading

hariombalhara Oct 16, 2023

hariombalhara Oct 16, 2023

hariombalhara Oct 16, 2023

hariombalhara Oct 17, 2023

hariombalhara Oct 17, 2023

Udit-takkar left a comment •

edited

Loading

hariombalhara commented Oct 17, 2023

hariombalhara Oct 17, 2023

Udit-takkar left a comment

fix: videoCallUrl not updating when rescheduling with a broken Calendar integration #11923

fix: videoCallUrl not updating when rescheduling with a broken Calendar integration #11923

Conversation

hariombalhara commented Oct 16, 2023 • edited Loading

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

vercel bot commented Oct 16, 2023 • edited Loading

github-actions bot commented Oct 16, 2023 • edited Loading

hariombalhara Oct 16, 2023

Choose a reason for hiding this comment

github-actions bot commented Oct 16, 2023 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Oct 16, 2023 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

hariombalhara Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

hariombalhara Oct 16, 2023

Choose a reason for hiding this comment

hariombalhara Oct 16, 2023

Choose a reason for hiding this comment

hariombalhara Oct 16, 2023

Choose a reason for hiding this comment

hariombalhara Oct 17, 2023

Choose a reason for hiding this comment

hariombalhara Oct 17, 2023

Choose a reason for hiding this comment

Udit-takkar left a comment • edited Loading

Choose a reason for hiding this comment

hariombalhara commented Oct 17, 2023

hariombalhara Oct 17, 2023

Choose a reason for hiding this comment

Udit-takkar left a comment

Choose a reason for hiding this comment

fix: `videoCallUrl` not updating when rescheduling with a broken Calendar integration #11923

fix: `videoCallUrl` not updating when rescheduling with a broken Calendar integration #11923

hariombalhara commented Oct 16, 2023 •

edited

Loading

vercel bot commented Oct 16, 2023 •

edited

Loading

github-actions bot commented Oct 16, 2023 •

edited

Loading

github-actions bot commented Oct 16, 2023 •

edited

Loading

deploysentinel bot commented Oct 16, 2023 •

edited

Loading

hariombalhara Oct 16, 2023 •

edited

Loading

Udit-takkar left a comment •

edited

Loading