fix: reschedule with google meet

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

@@ -202,10 +202,10 @@
   });
   const allEventTypes = await prismock.eventType.findMany({
     include: {
       users: true,
       workflows: true,
       destinationCalendar: true,
       schedule: true,
     },
   });
 
@@ -344,8 +344,8 @@
     JSON.stringify({
       bookings: await prismock.booking.findMany({
         include: {
           references: true,
           attendees: true,
         },
       }),
     })
@@ -476,15 +476,15 @@
     safeStringify({
       allUsers: await prismock.user.findMany({
         include: {
           credentials: true,
           teams: true,
           profiles: true,
           schedules: {
             include: {
               availability: true,
             },
           },
           destinationCalendar: true,
         },
       }),
     })
@@ -763,6 +763,15 @@
   });
 }
 
+export function getGoogleMeetCredential() {
+  return getMockedCredential({
+    metadataLookupKey: "googlevideo",
+    key: {
+      scope: "",
+    },
+  });
+}
+
 export function getAppleCalendarCredential() {
   return getMockedCredential({
     metadataLookupKey: "applecalendar",
@@ -890,6 +899,17 @@
         redirect_uris: ["http://localhost:3000/auth/callback"],
       },
     },
+    "google-meet": {
+      ...appStoreMetadata.googlevideo,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      //@ts-ignore
+      keys: {
+        expiry_date: Infinity,
+        client_id: "client_id",
+        client_secret: "client_secret",
+        redirect_uris: ["http://localhost:3000/auth/callback"],
+      },
+    },
     "daily-video": {
       ...appStoreMetadata.dailyvideo,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -1084,6 +1104,12 @@
   });
 }
 
+export const enum BookingLocations {
+  CalVideo = "integrations:daily",
+  ZoomVideo = "integrations:zoom",
+  GoogleMeet = "integrations:google:meet",
+}
+
 /**
  * @param metadataLookupKey
  * @param calendarData Specify uids and other data to be faked to be returned by createEvent and updateEvent
@@ -1164,18 +1190,40 @@
               log.silly("mockCalendar.updateEvent", JSON.stringify({ uid, event, externalCalendarId }));
               // eslint-disable-next-line prefer-rest-params
               updateEventCalls.push(rest);
-              return Promise.resolve({
-                type: app.type,
-                additionalInfo: {},
-                uid: "PROBABLY_UNUSED_UID",
-                iCalUID: normalizedCalendarData.update?.iCalUID,
-
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                id: normalizedCalendarData.update?.uid || "FALLBACK_MOCK_ID",
-                // Password and URL seems useless for CalendarService, plan to remove them if that's the case
-                password: "MOCK_PASSWORD",
-                url: "https://UNUSED_URL",
-              });
+              if (event.location === BookingLocations.GoogleMeet) {
+                return Promise.resolve({
+                  type: app.type,
+                  additionalInfo: {},
+                  uid: "PROBABLY_UNUSED_UID",
+                  iCalUID: normalizedCalendarData.update?.iCalUID,
+
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  id: normalizedCalendarData.update?.uid || "FALLBACK_MOCK_ID",
+                  // Password and URL seems useless for CalendarService, plan to remove them if that's the case
+                  password: "MOCK_PASSWORD",
+                  url: "https://UNUSED_URL",
+                  location: "https://UNUSED_URL",
+                  hangoutLink: "https://UNUSED_URL",
+                  conferenceData: event.conferenceData,
+                  organizer: {
+                    email: event.organizer.email,
+                    self: true,
+                  },
+                });
+              } else {
+                return Promise.resolve({
+                  type: app.type,
+                  additionalInfo: {},
+                  uid: "PROBABLY_UNUSED_UID",
+                  iCalUID: normalizedCalendarData.update?.iCalUID,
+
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  id: normalizedCalendarData.update?.uid || "FALLBACK_MOCK_ID",
+                  // Password and URL seems useless for CalendarService, plan to remove them if that's the case
+                  password: "MOCK_PASSWORD",
+                  url: "https://UNUSED_URL",
+                });
+              }
             },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             deleteEvent: async (...rest: any[]) => {
@@ -1487,19 +1535,16 @@
   };
 }
 
-export const enum BookingLocations {
-  CalVideo = "integrations:daily",
-  ZoomVideo = "integrations:zoom",
-}
-
 const getMockAppStatus = ({
   slug,
   failures,
   success,
+  overrideName,
 }: {
   slug: string;
   failures: number;
   success: number;
+  overrideName?: string;
 }) => {
   const foundEntry = Object.entries(appStoreMetadata).find(([, app]) => {
     return app.slug === slug;
@@ -1509,7 +1554,7 @@
   }
   const foundApp = foundEntry[1];
   return {
-    appName: foundApp.slug,
+    appName: overrideName ?? foundApp.slug,
     type: foundApp.type,
     failures,
     success,
@@ -1520,6 +1565,6 @@
   return getMockAppStatus({ slug, failures: 1, success: 0 });
 };
 
-export const getMockPassingAppStatus = ({ slug }: { slug: string }) => {
-  return getMockAppStatus({ slug, failures: 0, success: 1 });
+export const getMockPassingAppStatus = ({ slug, overrideName }: { slug: string; overrideName?: string }) => {
+  return getMockAppStatus({ slug, overrideName, failures: 0, success: 1 });
 };

packages/features/bookings/lib/handleNewBooking.ts

@@ -1868,7 +1868,13 @@ async function handler(
             });
           }
 
-          if (googleCalResult?.createdEvent?.hangoutLink) {
+          const googleHangoutLink =
+            googleCalResult?.createdEvent?.hangoutLink ??
+            (Array.isArray(googleCalResult?.updatedEvent)
+              ? googleCalResult.updatedEvent[0]?.hangoutLink
+              : googleCalResult?.updatedEvent?.hangoutLink);
+
+          if (googleHangoutLink) {
             results.push({
               ...googleMeetResult,
               success: true,
@@ -1877,31 +1883,33 @@ async function handler(
             // Add google_meet to referencesToCreate in the same index as google_calendar
             updateManager.referencesToCreate[googleCalIndex] = {
               ...updateManager.referencesToCreate[googleCalIndex],
-              meetingUrl: googleCalResult.createdEvent.hangoutLink,
+              meetingUrl: googleHangoutLink,
             };
 
             // Also create a new referenceToCreate with type video for google_meet
             updateManager.referencesToCreate.push({
               type: "google_meet_video",
-              meetingUrl: googleCalResult.createdEvent.hangoutLink,
+              meetingUrl: googleHangoutLink,
               uid: googleCalResult.uid,
               credentialId: updateManager.referencesToCreate[googleCalIndex].credentialId,
             });
-          } else if (googleCalResult && !googleCalResult.createdEvent?.hangoutLink) {
+          } else if (googleCalResult && !googleHangoutLink) {
             results.push({
               ...googleMeetResult,
               success: false,
             });
           }
         }
-
-        metadata.hangoutLink = results[0].createdEvent?.hangoutLink;
-        metadata.conferenceData = results[0].createdEvent?.conferenceData;
-        metadata.entryPoints = results[0].createdEvent?.entryPoints;
+        const createdOrUpdatedEvent =
+          results[0]?.createdEvent ??
+          (Array.isArray(results[0]?.updatedEvent) ? results[0]?.updatedEvent[0] : results[0]?.updatedEvent);
+        metadata.hangoutLink = createdOrUpdatedEvent?.hangoutLink;
+        metadata.conferenceData = createdOrUpdatedEvent?.conferenceData;
+        metadata.entryPoints = createdOrUpdatedEvent?.entryPoints;
         evt.appsStatus = handleAppsStatus(results, booking, reqAppsStatus);
         videoCallUrl =
           metadata.hangoutLink ||
-          results[0].createdEvent?.url ||
+          createdOrUpdatedEvent?.url ||
           organizerOrFirstDynamicGroupMemberDefaultLocationUrl ||
           getVideoCallUrlFromCalEvent(evt) ||
           videoCallUrl;