chore: Salesforce - optimize `getContact` method [CAL-4940] #18289

joeauyeung · 2024-12-20T06:45:55Z

What does this PR do?

Aims to reduce the number of calls we're making to Salesforce by nesting queries
- Removes the need to make a specific query for the record owner
- Optimizes queries involving contacts and accounts
Removes a DB query when checking if the record owner is a host in the event type

We're seeing an improvement of 2 - 2.4 seconds to 1.2 - 1.4 seconds

Fixes #XXXX (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my changes generate no new warnings

vercel · 2024-12-20T07:03:22Z

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

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Dec 21, 2024 6:28pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Dec 21, 2024 6:28pm

joeauyeung · 2024-12-20T07:10:47Z

apps/web/lib/getTeamMemberEmailFromCrm.ts

+  hosts: {
+    user: {
+      email: string;
+    };
+  }[];


Include hosts emails in the initial query here so we don't need to make a second DB query when checking if the CRM record owner is a host.

joeauyeung · 2024-12-20T07:11:17Z

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

@@ -92,6 +92,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
                select: {
                  name: true,
                  username: true,
+                  email: true,


Include email in the hosts query

joeauyeung · 2024-12-20T07:12:18Z

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

-          }
-        }
-        // If creating events on contacts or leads
+        soql = `SELECT Id, Email, OwnerId, AccountId, Account.Owner.Email, Account.Website FROM ${SalesforceRecordEnum.CONTACT} WHERE Email = '${attendeeEmail}' AND AccountId != null`;


Make use of SOQL nested queries to reduce the amount of calls we're making to Salesforce

joeauyeung · 2024-12-20T07:12:45Z

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

      if (!records.length) {
        log.info("No records found");
        return [];
      }

-      // Handle owner information


Huge win is removing the need to make a separate query for the owner information

joeauyeung · 2024-12-20T07:13:46Z

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


      let records: ContactRecord[] = [];

      // If falling back to contacts, check for the contact before returning the leads or empty array
      if (
        appOptions.createEventOn === SalesforceRecordEnum.LEAD &&
-        appOptions.createEventOnLeadCheckForContact
+        appOptions.createEventOnLeadCheckForContact &&
+        !forRoundRobinSkip


We only need this logic for event creation.

joeauyeung · 2024-12-20T07:14:42Z

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

@@ -915,6 +826,51 @@ export default class SalesforceCRMService implements CRM {
    return this.getDominantAccountId(response.records as { AccountId: string }[]);
  }

+  private async getAccountBasedOnEmailDomainOfContacts(email: string) {


Similar to getAccountIdBasedOnEmailDomainOfContacts but this returns the whole account object. I would like to migrate to this method but that'll involve refactoring in other places.

graphite-app · 2024-12-20T07:50:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (12/20/24)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2024-12-20T08:24:13Z

E2E results are ready!

Workflow #42143.1 latest results

linear · 2024-12-20T16:03:41Z

CAL-4940 Speed up Salesforce calls

joeauyeung added 7 commits December 20, 2024 00:57

include owner email in contact and lead query

5174ab5

Move handling if searching against account and prospect doesn't exist

5446d58

Change logic when creating an event on lead and falling back to contact

47c60b5

Refactor prio contacts when creating events on leads

8fff823

Handle getting account if prospect doesn't exist already

3cdad08

Refactor directly returning owner email

7945eef

Optimize searching if host exists in event type

52588dd

keithwillcode added consumer core area: core, team members only labels Dec 20, 2024

vercel bot had a problem deploying to Preview – api December 20, 2024 06:50 Failure

Type fix

86403ae

Merge branch 'main' into salesforce-optimize-get-contacts

b256c76

vercel bot had a problem deploying to Preview – api December 20, 2024 07:16 Failure

Type fix

ecdb32f

vercel bot deployed to Preview – api December 20, 2024 07:27 View deployment

Adjust tests

c4a2e60

vercel bot deployed to Preview – api December 20, 2024 07:41 View deployment

Clean up

ea99744

joeauyeung commented Dec 20, 2024

View reviewed changes

joeauyeung marked this pull request as ready for review December 20, 2024 07:48

graphite-app bot requested a review from a team December 20, 2024 07:48

joeauyeung added the ready-for-e2e label Dec 20, 2024

dosubot bot added crm-apps area: crm apps, salesforce, hubspot, close.com, sendgrid performance area: performance, page load, slow, slow endpoints, loading screen, unresponsive labels Dec 20, 2024

vercel bot deployed to Preview – api December 20, 2024 07:52 View deployment

joeauyeung marked this pull request as draft December 20, 2024 07:54

Type and test fix

fcbacdc

vercel bot deployed to Preview – api December 20, 2024 08:11 View deployment

joeauyeung marked this pull request as ready for review December 20, 2024 15:50

joeauyeung changed the title ~~chore: Salesforce - optimize getContact method~~ chore: Salesforce - optimize getContact method [CAL-4940] Dec 20, 2024

Udit-takkar mentioned this pull request Dec 20, 2024

refactor: Enhance SalesforceCRMService with improved contact querying… #18292

Closed

3 tasks

Merge branch 'main' into salesforce-optimize-get-contacts

5c039b9

vercel bot deployed to Preview – api December 21, 2024 18:36 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Salesforce - optimize `getContact` method [CAL-4940] #18289

chore: Salesforce - optimize `getContact` method [CAL-4940] #18289

joeauyeung commented Dec 20, 2024 •

edited

Loading

vercel bot commented Dec 20, 2024 •

edited

Loading

joeauyeung Dec 20, 2024

joeauyeung Dec 20, 2024

joeauyeung Dec 20, 2024

joeauyeung Dec 20, 2024

joeauyeung Dec 20, 2024

joeauyeung Dec 20, 2024

graphite-app bot commented Dec 20, 2024

github-actions bot commented Dec 20, 2024 •

edited

Loading

linear bot commented Dec 20, 2024

chore: Salesforce - optimize getContact method [CAL-4940] #18289

Are you sure you want to change the base?

chore: Salesforce - optimize getContact method [CAL-4940] #18289

Conversation

joeauyeung commented Dec 20, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

vercel bot commented Dec 20, 2024 • edited Loading

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

joeauyeung Dec 20, 2024

Choose a reason for hiding this comment

graphite-app bot commented Dec 20, 2024

Graphite Automations

github-actions bot commented Dec 20, 2024 • edited Loading

E2E results are ready!

linear bot commented Dec 20, 2024

chore: Salesforce - optimize `getContact` method [CAL-4940] #18289

chore: Salesforce - optimize `getContact` method [CAL-4940] #18289

joeauyeung commented Dec 20, 2024 •

edited

Loading

vercel bot commented Dec 20, 2024 •

edited

Loading

github-actions bot commented Dec 20, 2024 •

edited

Loading