feat: include record IDs in Salesforce assignment reason strings (#22561)

* feat: include record IDs in Salesforce assignment reason strings

- Add recordId parameter to assignmentReasonHandler function
- Include Contact ID, Lead ID, and Account ID in assignment reason strings
- Update entire call chain to pass record IDs from CRM service
- Maintain backward compatibility with optional recordId parameter

Co-Authored-By: [email protected] <[email protected]>

* fix: resolve lint warnings in assignment reason handler implementation

- Change Record<string, any> to Record<string, unknown> in BookingHandlerInput type
- Remove unused eventTypeId variable in getAttributeRoutingConfig function

Co-Authored-By: [email protected] <[email protected]>

* fix: revert to Record<string, any> with ESLint disable for BookingHandlerInput

- Revert from Record<string, unknown> to Record<string, any> to maintain type compatibility
- Add ESLint disable comment to suppress no-explicit-any warning
- Maintains consistency with handleNewRecurringBooking.ts pattern

Co-Authored-By: [email protected] <[email protected]>

* feat: pass CRM record ID from booker state to handleNewBooking

- Add crmRecordId field to booker store interface and initialization
- Update mapBookingToMutationInput to include record ID from booker state
- Modify handleNewBooking to extract record ID from bookingData parameter
- Add crmRecordId to BookingCreateBody schema in Prisma layer
- Follow existing pattern for CRM fields (teamMemberEmail, crmOwnerRecordType, crmAppSlug)
- Ensures record ID flows: booker store → booking form → mapBookingToMutationInput → handleNewBooking

This replaces the previous backend CRM service extraction approach with
frontend booker state approach as requested by the user.

Co-Authored-By: [email protected] <[email protected]>

* Pass crmRecordId as prop

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Alex van Andel <[email protected]>

Author: 3 people

apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts

@@ -122,12 +122,14 @@ export async function getCRMData(
   const crmContactOwnerEmail = query["cal.crmContactOwnerEmail"];
   const crmContactOwnerRecordType = query["cal.crmContactOwnerRecordType"];
   const crmAppSlugParam = query["cal.crmAppSlug"];
+  const crmRecordIdParam = query["cal.crmRecordId"];
 
   let teamMemberEmail = Array.isArray(crmContactOwnerEmail) ? crmContactOwnerEmail[0] : crmContactOwnerEmail;
   let crmOwnerRecordType = Array.isArray(crmContactOwnerRecordType)
     ? crmContactOwnerRecordType[0]
     : crmContactOwnerRecordType;
   let crmAppSlug = Array.isArray(crmAppSlugParam) ? crmAppSlugParam[0] : crmAppSlugParam;
+  let crmRecordId = Array.isArray(crmRecordIdParam) ? crmRecordIdParam[0] : crmRecordIdParam;
 
   if (!teamMemberEmail || !crmOwnerRecordType || !crmAppSlug) {
     const { getTeamMemberEmailForResponseOrContactUsingUrlQuery } = await import(
@@ -137,6 +139,7 @@ export async function getCRMData(
       email,
       recordType,
       crmAppSlug: crmAppSlugQuery,
+      recordId: crmRecordIdQuery,
     } = await getTeamMemberEmailForResponseOrContactUsingUrlQuery({
       query,
       eventData,
@@ -145,11 +148,13 @@ export async function getCRMData(
     teamMemberEmail = email ?? undefined;
     crmOwnerRecordType = recordType ?? undefined;
     crmAppSlug = crmAppSlugQuery ?? undefined;
+    crmRecordId = crmRecordIdQuery ?? undefined;
   }
 
   return {
     teamMemberEmail,
     crmOwnerRecordType,
     crmAppSlug,
+    crmRecordId,
   };
 }

apps/web/lib/__tests__/getTeamMemberEmailFromCrm.test.ts

@@ -29,9 +29,9 @@ function mockGetCRMContactOwnerForRRLeadSkip({
 }) {
   vi.mocked(getCRMContactOwnerForRRLeadSkip).mockImplementation((_bookerEmail, _eventMetadata) => {
     if (_bookerEmail === bookerEmail) {
-      return Promise.resolve({ email: teamMemberEmail, recordType: null, crmAppSlug: null });
+      return Promise.resolve({ email: teamMemberEmail, recordType: null, crmAppSlug: null, recordId: null });
     }
-    return Promise.resolve({ email: null, recordType: null, crmAppSlug: null });
+    return Promise.resolve({ email: null, recordType: null, crmAppSlug: null, recordId: null });
   });
 }
 
@@ -45,9 +45,9 @@ function mockBookingFormHandler({
   vi.mocked(bookingFormHandlers.salesforce).mockImplementation(
     (_bookerEmail, _attributeRoutingConfig, _eventTypeId) => {
       if (_bookerEmail === bookerEmail) {
-        return Promise.resolve({ email: teamMemberEmail, recordType: null });
+        return Promise.resolve({ email: teamMemberEmail, recordType: null, recordId: null });
       }
-      return Promise.resolve({ email: null, recordType: null });
+      return Promise.resolve({ email: null, recordType: null, recordId: null });
     }
   );
 }

apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx

@@ -92,6 +92,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   const crmContactOwnerEmail = query["cal.crmContactOwnerEmail"];
   const crmContactOwnerRecordType = query["cal.crmContactOwnerRecordType"];
   const crmAppSlugParam = query["cal.crmAppSlug"];
+  const crmRecordIdParam = query["cal.crmRecordId"];
 
   // Handle string[] type from query params
   let teamMemberEmail = Array.isArray(crmContactOwnerEmail) ? crmContactOwnerEmail[0] : crmContactOwnerEmail;
@@ -101,6 +102,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     : crmContactOwnerRecordType;
 
   let crmAppSlug = Array.isArray(crmAppSlugParam) ? crmAppSlugParam[0] : crmAppSlugParam;
+  let crmRecordId = Array.isArray(crmRecordIdParam) ? crmRecordIdParam[0] : crmRecordIdParam;
 
   if (!teamMemberEmail || !crmOwnerRecordType || !crmAppSlug) {
     const { getTeamMemberEmailForResponseOrContactUsingUrlQuery } = await import(
@@ -110,6 +112,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       email,
       recordType,
       crmAppSlug: crmAppSlugQuery,
+      recordId,
     } = await getTeamMemberEmailForResponseOrContactUsingUrlQuery({
       query,
       eventData,
@@ -118,6 +121,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     teamMemberEmail = email ?? undefined;
     crmOwnerRecordType = recordType ?? undefined;
     crmAppSlug = crmAppSlugQuery ?? undefined;
+    crmRecordId = recordId ?? undefined;
   }
 
   const organizationSettings = getOrganizationSEOSettings(team);
@@ -167,6 +171,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       teamMemberEmail,
       crmOwnerRecordType,
       crmAppSlug,
+      crmRecordId,
       isSEOIndexable: allowSEOIndexing,
     },
   };

apps/web/modules/team/type-view.tsx

@@ -34,6 +34,7 @@ function Type({
   teamMemberEmail,
   crmOwnerRecordType,
   crmAppSlug,
+  crmRecordId,
   isEmbed,
   useApiV2,
 }: PageProps) {
@@ -64,6 +65,7 @@ function Type({
           teamMemberEmail={teamMemberEmail}
           crmOwnerRecordType={crmOwnerRecordType}
           crmAppSlug={crmAppSlug}
+          crmRecordId={crmRecordId}
         />
       </main>
     </BookingPageErrorBoundary>

packages/app-store/_utils/CRMRoundRobinSkip.ts

@@ -10,8 +10,13 @@ import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 export async function getCRMContactOwnerForRRLeadSkip(
   bookerEmail: string,
   eventTypeMetadata: Prisma.JsonValue
-): Promise<{ email: string | null; recordType: string | null; crmAppSlug: string | null }> {
-  const nullReturnValue = { email: null, recordType: null, crmAppSlug: "" };
+): Promise<{
+  email: string | null;
+  recordType: string | null;
+  crmAppSlug: string | null;
+  recordId: string | null;
+}> {
+  const nullReturnValue = { email: null, recordType: null, crmAppSlug: "", recordId: null };
   const parsedEventTypeMetadata = EventTypeMetaDataSchema.safeParse(eventTypeMetadata);
   if (!parsedEventTypeMetadata.success || !parsedEventTypeMetadata.data?.apps) return nullReturnValue;
 
@@ -24,7 +29,12 @@ export async function getCRMContactOwnerForRRLeadSkip(
   const endTime = performance.now();
   logger.info(`Fetching from CRM took ${endTime - startTime}ms`);
   if (!contact?.length || !contact[0].ownerEmail) return nullReturnValue;
-  return { email: contact[0].ownerEmail ?? null, recordType: contact[0].recordType ?? null, crmAppSlug };
+  return {
+    email: contact[0].ownerEmail ?? null,
+    recordType: contact[0].recordType ?? null,
+    crmAppSlug,
+    recordId: contact[0].id ?? null,
+  };
 }
 
 async function getCRMManagerWithRRLeadSkip(apps: z.infer<typeof EventTypeAppMetadataSchema>) {

packages/app-store/routing-forms/appBookingFormHandler.ts

@@ -5,7 +5,7 @@ type AppBookingFormHandler = (
   attendeeEmail: string,
   attributeRoutingConfig: AttributeRoutingConfig,
   eventTypeId: number
-) => Promise<{ email: string | null; recordType: string | null }>;
+) => Promise<{ email: string | null; recordType: string | null; recordId: string | null }>;
 
 const appBookingFormHandler: Record<string, AppBookingFormHandler> = {
   salesforce: routingFormBookingFormHandler,

packages/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail.ts

@@ -40,10 +40,16 @@ export default async function routerGetCrmContactOwnerEmail({
   const eventTypeMetadata = eventType.metadata;
   if (!eventTypeMetadata) return null;
 
-  let contactOwner: { email: string | null; recordType: string | null; crmAppSlug: string | null } = {
+  let contactOwner: {
+    email: string | null;
+    recordType: string | null;
+    crmAppSlug: string | null;
+    recordId: string | null;
+  } = {
     email: null,
     recordType: null,
     crmAppSlug: null,
+    recordId: null,
   };
   //   Determine if there is a CRM option enabled in the chosen route
   for (const appSlug of enabledAppSlugs) {

packages/app-store/routing-forms/lib/handleResponse.test.ts

@@ -267,6 +267,7 @@ describe("handleResponse", () => {
       email: "[email protected]",
       recordType: "contact",
       crmAppSlug: "hubspot",
+      recordId: "123",
     });
     vi.mocked(findTeamMembersMatchingAttributeLogic).mockResolvedValue({
       teamMembersMatchingAttributeLogic: [{ userId: 123, result: "MATCH" as any }],

packages/app-store/routing-forms/lib/handleResponse.ts

@@ -96,6 +96,7 @@ const _handleResponse = async ({
     let crmContactOwnerEmail: string | null = null;
     let crmContactOwnerRecordType: string | null = null;
     let crmAppSlug: string | null = null;
+    let crmRecordId: string | null = null;
     let timeTaken: Record<string, number | null> = {};
     if (chosenRoute) {
       if (isRouter(chosenRoute)) {
@@ -119,6 +120,7 @@ const _handleResponse = async ({
             crmContactOwnerEmail = contactOwnerQuery?.email ?? null;
             crmContactOwnerRecordType = contactOwnerQuery?.recordType ?? null;
             crmAppSlug = contactOwnerQuery?.crmAppSlug ?? null;
+            crmRecordId = contactOwnerQuery?.recordId ?? null;
           })(),
           (async () => {
             const teamMembersMatchingAttributeLogicWithResult =
@@ -212,6 +214,7 @@ const _handleResponse = async ({
       crmContactOwnerEmail,
       crmContactOwnerRecordType,
       crmAppSlug,
+      crmRecordId,
       attributeRoutingConfig: chosenRoute
         ? "attributeRoutingConfig" in chosenRoute
           ? chosenRoute.attributeRoutingConfig

packages/app-store/salesforce/lib/assignmentReasonHandler.ts

@@ -8,27 +8,52 @@ export async function assignmentReasonHandler({
   recordType,
   teamMemberEmail,
   routingFormResponseId,
+  recordId,
 }: {
   recordType: string;
   teamMemberEmail: string;
   routingFormResponseId: number;
+  recordId?: string;
 }) {
   const returnObject = { reasonEnum: AssignmentReasonEnum.SALESFORCE_ASSIGNMENT };
 
   switch (recordType) {
     case SalesforceRecordEnum.CONTACT:
-      return { ...returnObject, assignmentReason: `Salesforce contact owner: ${teamMemberEmail}` };
+      return {
+        ...returnObject,
+        assignmentReason: `Salesforce contact owner: ${teamMemberEmail}${
+          recordId ? ` (Contact ID: ${recordId})` : ""
+        }`,
+      };
     case SalesforceRecordEnum.LEAD:
-      return { ...returnObject, assignmentReason: `Salesforce lead owner: ${teamMemberEmail}` };
+      return {
+        ...returnObject,
+        assignmentReason: `Salesforce lead owner: ${teamMemberEmail}${
+          recordId ? ` (Lead ID: ${recordId})` : ""
+        }`,
+      };
     case SalesforceRecordEnum.ACCOUNT:
-      return { ...returnObject, assignmentReason: `Salesforce account owner: ${teamMemberEmail}` };
+      return {
+        ...returnObject,
+        assignmentReason: `Salesforce account owner: ${teamMemberEmail}${
+          recordId ? ` (Account ID: ${recordId})` : ""
+        }`,
+      };
     case RoutingReasons.ACCOUNT_LOOKUP_FIELD:
-      const assignmentReason = await handleAccountLookupFieldReason(routingFormResponseId, teamMemberEmail);
+      const assignmentReason = await handleAccountLookupFieldReason(
+        routingFormResponseId,
+        teamMemberEmail,
+        recordId
+      );
       return { ...returnObject, assignmentReason };
   }
 }
 
-async function handleAccountLookupFieldReason(routingFormResponseId: number, teamMemberEmail: string) {
+async function handleAccountLookupFieldReason(
+  routingFormResponseId: number,
+  teamMemberEmail: string,
+  recordId?: string
+) {
   const routingFormResponse = await prisma.app_RoutingForms_FormResponse.findUnique({
     where: {
       id: routingFormResponseId,
@@ -67,6 +92,8 @@ async function handleAccountLookupFieldReason(routingFormResponseId: number, tea
   const accountLookupFieldName = salesforceConfig?.rrSKipToAccountLookupFieldName;
 
   return accountLookupFieldName
-    ? `Salesforce account lookup field: ${accountLookupFieldName} - ${teamMemberEmail}`
+    ? `Salesforce account lookup field: ${accountLookupFieldName} - ${teamMemberEmail}${
+        recordId ? ` (Account ID: ${recordId})` : ""
+      }`
     : undefined;
 }