From a186b130cb9005a2fa11034591802881c01f82f5 Mon Sep 17 00:00:00 2001
From: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue, 3 Oct 2023 23:15:18 +0530
Subject: [PATCH] fix: Use only the first connected calendar as fallback to
 create event (#11668)

---
 packages/core/CalendarManager.ts | 15 ++++++++++++---
 packages/core/EventManager.ts    | 16 ++++++++++++----
 packages/lib/piiFreeData.ts      |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/core/CalendarManager.ts b/packages/core/CalendarManager.ts
index 4f35fb83f0..452ddd60d9 100644
--- a/packages/core/CalendarManager.ts
+++ b/packages/core/CalendarManager.ts
@@ -231,7 +231,7 @@ export const createEvent = async (
 
   log.debug(
     "Creating calendar event",
-    JSON.stringify({
+    safeStringify({
       calEvent: getPiiFreeCalendarEvent(calEvent),
     })
   );
@@ -267,11 +267,20 @@ export const createEvent = async (
         })
     : undefined;
   if (!creationResult) {
-    logger.silly("createEvent failed", { success, uid, creationResult, originalEvent: calEvent, calError });
+    logger.error(
+      "createEvent failed",
+      safeStringify({
+        success,
+        uid,
+        creationResult,
+        originalEvent: getPiiFreeCalendarEvent(calEvent),
+        calError,
+      })
+    );
   }
   log.debug(
     "Created calendar event",
-    JSON.stringify({
+    safeStringify({
       calEvent: getPiiFreeCalendarEvent(calEvent),
       creationResult,
     })
diff --git a/packages/core/EventManager.ts b/packages/core/EventManager.ts
index 57394dc024..4caabdfa58 100644
--- a/packages/core/EventManager.ts
+++ b/packages/core/EventManager.ts
@@ -10,7 +10,7 @@ import { appKeysSchema as calVideoKeysSchema } from "@calcom/app-store/dailyvide
 import { getEventLocationTypeFromApp, MeetLocationType } from "@calcom/app-store/locations";
 import getApps from "@calcom/app-store/utils";
 import logger from "@calcom/lib/logger";
-import { getPiiFreeUser } from "@calcom/lib/piiFreeData";
+import { getPiiFreeDestinationCalendar, getPiiFreeUser, getPiiFreeCredential } from "@calcom/lib/piiFreeData";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import prisma from "@calcom/prisma";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
@@ -399,13 +399,21 @@ export default class EventManager {
           const destinationCalendarCredentials = this.calendarCredentials.filter(
             (c) => c.type === destination.integration
           );
-          createdEvents = createdEvents.concat(
-            await Promise.all(destinationCalendarCredentials.map(async (c) => await createEvent(c, event)))
+          // It might not be the first connected calendar as it seems that the order is not guaranteed to be ascending of credentialId.
+          const firstCalendarCredential = destinationCalendarCredentials[0];
+          log.warn(
+            "No credentialId found for destination calendar, falling back to first found calendar",
+            safeStringify({
+              destination: getPiiFreeDestinationCalendar(destination),
+              firstConnectedCalendar: getPiiFreeCredential(firstCalendarCredential),
+            })
           );
+
+          createdEvents.push(await createEvent(firstCalendarCredential, event));
         }
       }
     } else {
-      log.silly(
+      log.warn(
         "No destination Calendar found, falling back to first connected calendar",
         safeStringify({
           calendarCredentials: this.calendarCredentials,
diff --git a/packages/lib/piiFreeData.ts b/packages/lib/piiFreeData.ts
index 088ab39ec5..7e8f838676 100644
--- a/packages/lib/piiFreeData.ts
+++ b/packages/lib/piiFreeData.ts
@@ -78,11 +78,11 @@ export function getPiiFreeDestinationCalendar(destinationCalendar: Partial<Desti
   return {
     integration: destinationCalendar.integration,
     userId: destinationCalendar.userId,
+    credentialId: destinationCalendar.credentialId,
     /**
      * Let's just get a boolean value for PII sensitive fields so that we atleast know if it's present or not
      */
     externalId: !!destinationCalendar.externalId,
-    credentialId: !!destinationCalendar.credentialId,
   };
 }