fix: meeting url variable in workflow notifitcations #12308

CarinaWolli · 2023-11-09T21:36:19Z

What does this PR do?

Fixes that the {MEETING_URL} from custom workflow templates wasn't populated for event types that require confirmation or payment.

Also fixes that confirmation emails were still sent after they were confirmed even when the default confirmation emails were disabled.

Fixes #10758

Requirement/Documentation

Have Sendgrid set up to send workflow emails.

Type of change

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

How should this be tested?

Create a workflow that triggers when new event is booked & sends email to attendees
Add a custom emails template with {MEETING_URL} variable
Set active on an event type that requires confrimation
Book event type
Confirm booking
Check if email has meeting url

Mandatory Tasks

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

vercel · 2023-11-09T21:36:28Z

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	Nov 10, 2023 5:38pm
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 10, 2023 5:38pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 10, 2023 5:38pm

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview	Nov 10, 2023 5:38pm
cal-demo	⬜️ Ignored (Inspect)		Nov 10, 2023 5:38pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Nov 10, 2023 5:38pm
ui	⬜️ Ignored (Inspect)	Visit Preview	Nov 10, 2023 5:38pm

github-actions · 2023-11-09T21:36:34Z

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

github-actions · 2023-11-09T21:44:42Z

📦 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-11-09T21:44:51Z

No failed tests 🎉

CarinaWolli · 2023-11-10T17:25:46Z

packages/features/bookings/lib/handleConfirmation.ts

+        }
+      }
+
+      await sendScheduledEmails(


Make sure confirmation emails are not sent when disabled because of an existing workflow

CarinaWolli · 2023-11-10T17:26:48Z

packages/features/bookings/lib/handleConfirmation.ts

@@ -169,6 +213,7 @@ export async function handleConfirmation(args: {
        references: {
          create: scheduleResult.referencesToCreate,
        },
+        metadata: { ...(typeof booking.metadata === "object" ? booking.metadata : {}), videoCallUrl },


bookings that require confirmation never had the videoCallUrl added to metadata

CarinaWolli · 2023-11-10T17:28:08Z

packages/features/bookings/lib/handleConfirmation.ts

@@ -218,8 +263,6 @@ export async function handleConfirmation(args: {
        const eventTypeSlug = updatedBookings[index].eventType?.slug || "";

        const isFirstBooking = index === 0;
-        const videoCallUrl =


The original booking didn't have videoCallUrl in metadata, that's why it was missing in the workflow emails that trigger when a meeting was confirmed

CarinaWolli · 2023-11-10T17:30:02Z

packages/features/bookings/lib/handleNewBooking.ts

@@ -2524,7 +2524,7 @@ async function handler(
        ...evt,
        ...{ metadata: metadataFromEvent, eventType: { slug: eventType.slug } },
      },
-      isNotConfirmed: evt.requiresConfirmation || false,
+      isNotConfirmed: !isConfirmedByDefault,


also includes bookings with payments not just event types that require confirmation

emrysal

Looks good to me, but a add-on is needed soon to add tests to ensure emails aren't send when e.g. host confirmation emails are disabled.

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

CarinaWolli added 2 commits November 9, 2023 14:12

fix meeting url variable for requires confirmation

17a4efb

disable confirmation emails if workflow enabled

4915e41

github-actions bot added emails area: emails, cancellation email, reschedule email, inbox, spam folder, not getting email High priority Created by Linear-GitHub Sync 🐛 bug Something isn't working labels Nov 9, 2023

zomars added the core area: core, team members only label Nov 9, 2023

save videoCallUrl when confirming booking

57dd2c4

vercel bot deployed to Preview – ai November 9, 2023 22:18 View deployment

vercel bot had a problem deploying to Preview – api November 9, 2023 22:19 Failure

vercel bot deployed to Preview – dev November 9, 2023 22:21 View deployment

fix type errors

38c48dc

vercel bot had a problem deploying to Preview – api November 10, 2023 16:28 Failure

add missing event type metadata

f271a65

vercel bot deployed to Preview – dev November 10, 2023 16:37 View deployment

vercel bot deployed to Preview – api November 10, 2023 16:37 View deployment

CarinaWolli commented Nov 10, 2023

View reviewed changes

Merge branch 'main' into fix/meeting-url-worflow-variable

916a1a9

CarinaWolli marked this pull request as ready for review November 10, 2023 17:32

vercel bot deployed to Preview – ai November 10, 2023 17:34 View deployment

vercel bot deployed to Preview – api November 10, 2023 17:37 View deployment

vercel bot deployed to Preview – dev November 10, 2023 17:38 View deployment

emrysal approved these changes Nov 10, 2023

View reviewed changes

emrysal changed the title ~~Fix: meeting url variable in workflow notifitcations~~ fix: meeting url variable in workflow notifitcations Nov 10, 2023

kemilbeltre approved these changes Nov 12, 2023

View reviewed changes

CarinaWolli merged commit f29328e into main Nov 13, 2023
37 of 39 checks passed

CarinaWolli deleted the fix/meeting-url-worflow-variable branch November 13, 2023 14:28

CarinaWolli mentioned this pull request Nov 13, 2023

[CAL-2624] Confirmation email sending when disabled #11979

Closed

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

fix: meeting url variable in workflow notifitcations (calcom#12308)

6f7aa03

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

fix: meeting url variable in workflow notifitcations (calcom#12308)

334491f

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

zomars pushed a commit that referenced this pull request Jan 29, 2024

fix: meeting url variable in workflow notifitcations (#12308)

347d026

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: meeting url variable in workflow notifitcations #12308

fix: meeting url variable in workflow notifitcations #12308

CarinaWolli commented Nov 9, 2023 •

edited

vercel bot commented Nov 9, 2023 •

edited

github-actions bot commented Nov 9, 2023 •

edited

github-actions bot commented Nov 9, 2023 •

edited

deploysentinel bot commented Nov 9, 2023 •

edited

CarinaWolli Nov 10, 2023

CarinaWolli Nov 10, 2023

CarinaWolli Nov 10, 2023

CarinaWolli Nov 10, 2023

emrysal left a comment

fix: meeting url variable in workflow notifitcations #12308

fix: meeting url variable in workflow notifitcations #12308

Conversation

CarinaWolli commented Nov 9, 2023 • edited

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

vercel bot commented Nov 9, 2023 • edited

github-actions bot commented Nov 9, 2023 • edited

github-actions bot commented Nov 9, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Nov 9, 2023 • edited

CarinaWolli Nov 10, 2023

Choose a reason for hiding this comment

CarinaWolli Nov 10, 2023

Choose a reason for hiding this comment

CarinaWolli Nov 10, 2023

Choose a reason for hiding this comment

CarinaWolli Nov 10, 2023

Choose a reason for hiding this comment

emrysal left a comment

Choose a reason for hiding this comment

CarinaWolli commented Nov 9, 2023 •

edited

vercel bot commented Nov 9, 2023 •

edited

github-actions bot commented Nov 9, 2023 •

edited

github-actions bot commented Nov 9, 2023 •

edited

deploysentinel bot commented Nov 9, 2023 •

edited