feat: meeting started webhook (#12764)

Co-authored-by: Syed Ali Shahbaz <[email protected]>
calcom · Dec 19, 2023 · 2e0c9c7 · 2e0c9c7
1 parent 0380085
commit 2e0c9c7
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 11 deletions.
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
@@ -2168,5 +2168,6 @@
   "need_help": "Need help?",
   "troubleshooter": "Troubleshooter",
   "please_install_a_calendar": "Please install a calendar",
+  "meeting_started": "Meeting Started",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts
@@ -300,16 +300,27 @@ export async function handleConfirmation(args: {
       triggerEvent: WebhookTriggerEvents.BOOKING_CREATED,
       teamId,
     });
+    const subscribersMeetingStarted = await getWebhooks({
+      userId: triggerForUser ? booking.userId : null,
+      eventTypeId: booking.eventTypeId,
+      triggerEvent: WebhookTriggerEvents.MEETING_STARTED,
+      teamId: booking.eventType?.teamId,
+    });
     const subscribersMeetingEnded = await getWebhooks({
       userId: triggerForUser ? booking.userId : null,
       eventTypeId: booking.eventTypeId,
       triggerEvent: WebhookTriggerEvents.MEETING_ENDED,
       teamId: booking.eventType?.teamId,
     });
 
+    subscribersMeetingStarted.forEach((subscriber) => {
+      updatedBookings.forEach((booking) => {
+        scheduleTrigger(booking, subscriber.subscriberUrl, subscriber, WebhookTriggerEvents.MEETING_STARTED);
+      });
+    });
     subscribersMeetingEnded.forEach((subscriber) => {
       updatedBookings.forEach((booking) => {
-        scheduleTrigger(booking, subscriber.subscriberUrl, subscriber);
+        scheduleTrigger(booking, subscriber.subscriberUrl, subscriber, WebhookTriggerEvents.MEETING_ENDED);
       });
     });
 

diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
@@ -1416,6 +1416,12 @@ async function handler(
     teamId,
   };
 
+  const subscriberOptionsMeetingStarted = {
+    userId: triggerForUser ? organizerUser.id : null,
+    eventTypeId,
+    triggerEvent: WebhookTriggerEvents.MEETING_STARTED,
+    teamId,
+  };
   const handleSeats = async () => {
     let resultBooking:
       | (Partial<Booking> & {
@@ -2693,13 +2699,28 @@ async function handler(
   if (isConfirmedByDefault) {
     try {
       const subscribersMeetingEnded = await getWebhooks(subscriberOptionsMeetingEnded);
+      const subscribersMeetingStarted = await getWebhooks(subscriberOptionsMeetingStarted);
 
       subscribersMeetingEnded.forEach((subscriber) => {
         if (rescheduleUid && originalRescheduledBooking) {
           cancelScheduledJobs(originalRescheduledBooking, undefined, true);
         }
         if (booking && booking.status === BookingStatus.ACCEPTED) {
-          scheduleTrigger(booking, subscriber.subscriberUrl, subscriber);
+          scheduleTrigger(booking, subscriber.subscriberUrl, subscriber, WebhookTriggerEvents.MEETING_ENDED);
+        }
+      });
+
+      subscribersMeetingStarted.forEach((subscriber) => {
+        if (rescheduleUid && originalRescheduledBooking) {
+          cancelScheduledJobs(originalRescheduledBooking, undefined, true);
+        }
+        if (booking && booking.status === BookingStatus.ACCEPTED) {
+          scheduleTrigger(
+            booking,
+            subscriber.subscriberUrl,
+            subscriber,
+            WebhookTriggerEvents.MEETING_STARTED
+          );
         }
       });
     } catch (error) {

diff --git a/packages/features/webhooks/components/WebhookForm.tsx b/packages/features/webhooks/components/WebhookForm.tsx
@@ -39,6 +39,7 @@ const WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP_V2: Record<string, WebhookTriggerEve
     { value: WebhookTriggerEvents.BOOKING_RESCHEDULED, label: "booking_rescheduled" },
     { value: WebhookTriggerEvents.BOOKING_PAID, label: "booking_paid" },
     { value: WebhookTriggerEvents.MEETING_ENDED, label: "meeting_ended" },
+    { value: WebhookTriggerEvents.MEETING_STARTED, label: "meeting_started" },
     { value: WebhookTriggerEvents.RECORDING_READY, label: "recording_ready" },
   ],
   "routing-forms": [{ value: WebhookTriggerEvents.FORM_SUBMITTED, label: "form_submitted" }],

diff --git a/packages/features/webhooks/lib/constants.ts b/packages/features/webhooks/lib/constants.ts
@@ -10,6 +10,7 @@ export const WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP = {
     WebhookTriggerEvents.BOOKING_PAID,
     WebhookTriggerEvents.BOOKING_PAYMENT_INITIATED,
     WebhookTriggerEvents.MEETING_ENDED,
+    WebhookTriggerEvents.MEETING_STARTED,
     WebhookTriggerEvents.BOOKING_REQUESTED,
     WebhookTriggerEvents.BOOKING_REJECTED,
     WebhookTriggerEvents.RECORDING_READY,

diff --git a/packages/features/webhooks/lib/scheduleTrigger.ts b/packages/features/webhooks/lib/scheduleTrigger.ts
@@ -45,7 +45,10 @@ export async function addSubscription({
       },
     });
 
-    if (triggerEvent === WebhookTriggerEvents.MEETING_ENDED) {
+    if (
+      triggerEvent === WebhookTriggerEvents.MEETING_ENDED ||
+      triggerEvent === WebhookTriggerEvents.MEETING_STARTED
+    ) {
       //schedule job for already existing bookings
       const where: Prisma.BookingWhereInput = {};
       if (teamId) {
@@ -64,10 +67,15 @@ export async function addSubscription({
       });
 
       for (const booking of bookings) {
-        scheduleTrigger(booking, createSubscription.subscriberUrl, {
-          id: createSubscription.id,
-          appId: createSubscription.appId,
-        });
+        scheduleTrigger(
+          booking,
+          createSubscription.subscriberUrl,
+          {
+            id: createSubscription.id,
+            appId: createSubscription.appId,
+          },
+          triggerEvent
+        );
       }
     }
 
@@ -273,20 +281,21 @@ export async function listBookings(
 }
 
 export async function scheduleTrigger(
-  booking: { id: number; endTime: Date; scheduledJobs: string[] },
+  booking: { id: number; endTime: Date; startTime: Date; scheduledJobs: string[] },
   subscriberUrl: string,
-  subscriber: { id: string; appId: string | null }
+  subscriber: { id: string; appId: string | null },
+  triggerEvent: WebhookTriggerEvents
 ) {
   try {
-    const payload = JSON.stringify({ triggerEvent: WebhookTriggerEvents.MEETING_ENDED, ...booking });
+    const payload = JSON.stringify({ triggerEvent, ...booking });
     const jobName = `${subscriber.appId}_${subscriber.id}`;
 
     // add scheduled job to database
     const createTrigger = prisma.webhookScheduledTriggers.create({
       data: {
         jobName,
         payload,
-        startAfter: booking.endTime,
+        startAfter: triggerEvent === WebhookTriggerEvents.MEETING_ENDED ? booking.endTime : booking.startTime,
         subscriberUrl,
       },
     });

diff --git a/packages/prisma/migrations/20231213083720_add_meeting_started_webhook/migration.sql b/packages/prisma/migrations/20231213083720_add_meeting_started_webhook/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "WebhookTriggerEvents" ADD VALUE 'MEETING_STARTED';
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
@@ -570,6 +570,7 @@ enum WebhookTriggerEvents {
   BOOKING_REJECTED
   FORM_SUBMITTED
   MEETING_ENDED
+  MEETING_STARTED
   RECORDING_READY
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterEnum
		ALTER TYPE "WebhookTriggerEvents" ADD VALUE 'MEETING_STARTED';