Apps Status + Updates to non-traditional calendars by leog · Pull Request #5034 · calcom/cal.diy

leog · 2022-10-16T01:33:33Z

What does this PR do?

Implements Apps Status on emails for organizers. It also fixes updating meetings when rescheduling for non-traditional calendars. Recurring events get a (xNumber) alongside the status for each app to let the user know if every booking was successfully created. If any of them fails, it shows a cross emoji.

Some screenshots:

Environment: Staging(main branch) / Production

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

How should this be tested?

Book a regular or recurring event and see as the organizer an email sent to you with the apps status.

vercel · 2022-10-16T01:39:57Z

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

Name	Status	Preview	Updated
cal	✅ Ready (Inspect)	Visit Preview	Oct 19, 2022 at 4:09PM (UTC)

leog

Self-review done

leog · 2022-10-18T14:48:30Z

+  const createdBookings: BookingResponse[] = [];
+  // Reversing to accumulate results for noEmail instances first, to then lastly, create the
+  // emailed booking taking into account accumulated results to send app status accurately
+  for (let key = 0; key < data.length; key++) {


As said in the comment, in order to have the apps status for every recurring event booking created to be included in the single email sent to attendee and organizer, we need to reverse the order to the booking creation. The last booking, the one that enables sending the email is the first recurring event instance, and will include its apps status to the rest of the results.

leog · 2022-10-18T14:50:13Z

+          // If multiple events are created, subsequent events may fail due to
+          // contact was created by previous event creation, so we introduce a
+          // fallback taking advantage of the error message providing the contact id
+          if (error.body.message.includes("Contact already exists. Existing ID:")) {


As said in the comment, recurring events will look to the same person which may not be created by the first booking creation but will be created by the second, so we just make sure we catch the proper error from HubSpot to take into account the returned user id to let the flow continue without failing.

leog · 2022-10-18T14:51:05Z


 type createdEventSchema = z.infer<typeof createdEventSchema>;

+export type ExtendedCredential = Credential & { appName: string };


We need the app name belonging to the credential to use it in the email, so an ExtendedCredential type was created.

leog · 2022-10-18T14:53:33Z

        }
      }

+      // Taking care of non-traditional calendar integrations


When a booking was rescheduled, the updated booking was just being updated in the designated calendar, skipping the non-traditional calendars such as HubSpot or Close.com. This takes care of that, making sure to pass down the BookingReference booking ID, not the Cal Booking ID, so the apps can find the booking on their system.

leog · 2022-10-18T14:54:41Z

    new Promise((resolve, reject) => {
      try {
-        const requestRescheduleEmail = new AttendeeWasRequestedToRescheduleEmail(calEvent, metadata);
+        const requestRescheduleEmail = new AttendeeWasRequestedToRescheduleEmail(


Attendees shouldn't get organizers' apps status info in their email, removing it forcefully.

leog · 2022-10-18T14:54:45Z

      return new Promise((resolve, reject) => {
        try {
-          const scheduledEmail = new AttendeeLocationChangeEmail(calEvent, attendee);
+          const scheduledEmail = new AttendeeLocationChangeEmail(


Attendees shouldn't get organizers' apps status info in their email, removing it forcefully.

leog · 2022-10-18T14:56:53Z

+
+import { Info } from "./Info";
+
+export const AppsStatus = (props: { calEvent: CalendarEvent; t: TFunction }) => {


Component to be used in the email to include Apps Status.
It will show:

For single booking: ✅ or ❌ for each app

For recurring booking (for example 6): ✅ (x6) or ✅ (x5) ❌ (x1) or any other combination, for each app

leog · 2022-10-18T14:57:54Z

  const credentials = await refreshCredentials(organizerUser.credentials);
  const eventManager = new EventManager({ ...organizerUser, credentials });

+  function handleAppsStatus(


This function makes sure it accumulates the resulting apps status coming from the request with the one created last, all in case of a recurring event.

leog · 2022-10-18T15:11:58Z

  return customInputsString;
 };

+export const getAppsStatus = (calEvent: CalendarEvent) => {


Same thing as the HTML version but in plain text

zomars

Very nice addition @leog left some feedback to address first 🙏🏽

zomars · 2022-10-18T18:01:36Z

  "link_shared": "Link shared!",
  "title": "Title",
  "description": "Description",
+  "apps_status": "Apps Status",


Would "Apps results" make more sense in this context?

We need you @Jaibles!

zomars · 2022-10-18T18:09:10Z

          metadata.hangoutLink = updatedEvent.hangoutLink;
          metadata.conferenceData = updatedEvent.conferenceData;
          metadata.entryPoints = updatedEvent.entryPoints;
+          handleAppsStatus(results, booking);


Co-authored-by: Omar López <zomars@me.com>

zomars

* Apps Status + Updates to non-traditional calendars * Recurring booking tweaks * Last tweaks * Fixing checks * Fixing eslint * Reverting unneeded changes, using plain text email * More unneeded changes revert * Update packages/features/bookings/lib/handleNewBooking.ts Co-authored-by: Omar López <zomars@me.com> * Fixing lint * Refactored appsStatus in emails * Update packages/emails/src/templates/OrganizerScheduledEmail.tsx Co-authored-by: Omar López <zomars@me.com>

Apps Status + Updates to non-traditional calendars

7532daa

vercel Bot deployed to Preview October 16, 2022 01:39 View deployment

Merge branch 'main' into feat/apps-status

b3e3736

vercel Bot deployed to Preview October 16, 2022 14:29 View deployment

Recurring booking tweaks

00f4287

vercel Bot deployed to Preview October 16, 2022 14:54 View deployment

Merge branch 'main' into feat/apps-status

bad0e5d

vercel Bot deployed to Preview October 17, 2022 14:08 View deployment

Merge branch 'main' into feat/apps-status

b7f76f1

vercel Bot deployed to Preview October 17, 2022 18:18 View deployment

leog added 2 commits October 17, 2022 17:33

Last tweaks

a486d71

Merge branch 'main' into feat/apps-status

fe30e17

leog self-assigned this Oct 17, 2022

leog requested a review from a team October 17, 2022 20:40

leog marked this pull request as ready for review October 17, 2022 20:41

Fixing checks

292ec43

vercel Bot deployed to Preview October 17, 2022 20:58 View deployment

Merge branch 'main' into feat/apps-status

ea34247

vercel Bot deployed to Preview October 18, 2022 14:29 View deployment

leog added 3 commits October 18, 2022 11:36

Fixing eslint

a52bc0c

Reverting unneeded changes, using plain text email

5de35be

More unneeded changes revert

63a4169

vercel Bot deployed to Preview October 18, 2022 14:57 View deployment

leog commented Oct 18, 2022

View reviewed changes

Merge branch 'main' into feat/apps-status

f38f8c0

vercel Bot deployed to Preview October 18, 2022 15:40 View deployment

PeerRich approved these changes Oct 18, 2022

View reviewed changes

zomars reviewed Oct 18, 2022

View reviewed changes

Update packages/features/bookings/lib/handleNewBooking.ts

8c4bbd8

Co-authored-by: Omar López <zomars@me.com>

leog added 2 commits October 18, 2022 15:22

Merge branch 'main' into feat/apps-status

3f92a92

Fixing lint

6e94fed

vercel Bot deployed to Preview October 18, 2022 18:40 View deployment

Refactored appsStatus in emails

00a6fd9

leog commented Oct 18, 2022

View reviewed changes

Comment thread packages/emails/src/templates/BaseScheduledEmail.tsx

vercel Bot deployed to Preview October 18, 2022 21:11 View deployment

leog requested a review from zomars October 19, 2022 01:35

Merge branch 'main' into feat/apps-status

d9114bc

zomars reviewed Oct 19, 2022

View reviewed changes

Comment thread packages/emails/src/templates/OrganizerScheduledEmail.tsx Outdated

Update packages/emails/src/templates/OrganizerScheduledEmail.tsx

e97ade4

zomars approved these changes Oct 19, 2022

View reviewed changes

Merge branch 'main' into feat/apps-status

c872785

vercel Bot deployed to Preview October 19, 2022 16:09 View deployment

leog merged commit b6be94f into main Oct 19, 2022

leog deleted the feat/apps-status branch October 19, 2022 16:11


		type createdEventSchema = z.infer<typeof createdEventSchema>;

		export type ExtendedCredential = Credential & { appName: string };


		import { Info } from "./Info";

		export const AppsStatus = (props: { calEvent: CalendarEvent; t: TFunction }) => {

Conversation

leog commented Oct 16, 2022 • 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?

Uh oh!

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

Uh oh!

Uh oh!

leog left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

leog Oct 18, 2022 • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

leog commented Oct 16, 2022 •

edited

Loading

vercel Bot commented Oct 16, 2022 •

edited

Loading

leog Oct 18, 2022 •

edited

Loading