fix: feedback for crm RR skip #15160

CarinaWolli · 2024-05-22T15:49:45Z

What does this PR do?

Feedback from: #14556 (review)

Cleans up code and adds unit test for the round robin skip

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected)
N/A - I have added a Docs issue here if this PR makes changes that would require a documentation change
I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

How should this be tested?

Run yarn test getSchedule.test.ts
Run yarn test collective-scheduling.test.ts

github-actions · 2024-05-22T15:50:01Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

vercel · 2024-05-22T17:49:25Z

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

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	May 24, 2024 2:49pm
cal	⬜️ Ignored (Inspect)	Visit Preview	May 24, 2024 2:49pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview	May 24, 2024 2:49pm

CarinaWolli · 2024-05-22T22:10:54Z

packages/trpc/server/routers/viewer/slots/util.ts

-        isFixed: !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE,
-        ...user,
-      }));
+      usersWithCredentials = usersWithCredentials.filter(


remove contact owner, because it will be added later as a fixed host

if contact owner is a RR host remove all RR hosts

CarinaWolli · 2024-05-22T22:11:55Z

packages/trpc/server/routers/viewer/slots/util.ts

@@ -318,6 +320,56 @@ export interface IGetAvailableSlots {
  teamMember?: string | undefined;
 }

+async function getCRMContactOwnerForRRLeadSkip(


helper function to make code in getAvailableSlots more readable

CarinaWolli · 2024-05-22T22:12:00Z

packages/trpc/server/routers/viewer/slots/util.ts

+  }
+}
+
+async function getCRMManagerWithRRLeadSkip(apps: z.infer<typeof EventTypeAppMetadataSchema>) {


helper function to make code in getAvailableSlots more readable

CarinaWolli · 2024-05-22T22:18:21Z

packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx

+              onCheckedChange={(checked) => {
+                setAppData("roundRobinLeadSkip", checked);
+                if (checked) {
+                  // temporary solution, enabled should always be already set


There is an issue with the event metadata: #15169

This at least makes sure that when roundRobinLeadSkip is turned on, the enabled key will be added in case it is missing

CarinaWolli · 2024-05-22T22:24:26Z

...ages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-scheduling.test.ts

+
+        const bookingData = {
+          eventTypeId: 1,
+          teamMemberEmail: otherTeamMembers[0].email,


It's not ideal that we pass the contact owner here to handleNewBooking. This means that the RR skip won't work when the booking is done via API. Also, sometimes when confirming the booking too fast after providing the booker's email, teamMemberEmail wasn't set yet and the RR skip was ignored

created an issue: #15170
we can discuss it there

apps/web/test/lib/getSchedule.test.ts

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

@zomars

* fix timezone display on booking page to reflect event availability timezone * migrate fetching event owner's schedule to server side * migrate fetching event owner's schedule to server side * fix e2e test errors * Add WEBAPP_URL_FOR_OAUTH to salesforce auth * In event manager constructor include "_crm" credentials as calendar creds * Change crm apps to type to end with `_crm` * Move sendgrid out of CRM * Add zoho bigin to CRM apps * When getting apps, use slug * Add `crm` variants * Hubspot Oauth use `WEBAPP_URL_FOR_OAUTH` * Refactor creating credentials * Fix empty CRM page * Use credentials with `_crm` * Abstract getAppCategoryTitle * Add integration.handler changes * Init crmManager * Change salesforce to CrmService * Create crmManager * Create contact on new event * Create event * Create new CRM reference * - Fix create new contact for salesforce - Add reschedule to crmManager * Create deleteAllCRMEvents * When searching for credential, look for current credentials in class * On cancel, delete 3rd party events * Add delete method * Type fix * Type fix * Convert Close.com to CrmService * Convert Close.com to CrmService * Move hubspot to CrmService * Convert Pipedrive to CrmService * Rename classes to CrmService * Move ZohoCrm to CrmService * Move Bigin to CrmService * Type return for CrmServices * Fix type errors * Close.com create leads and contacts * Fix tests * Type fix * Zoho bug fixes * Clean up * Type fixes * Remove apiDeletes * Type fixes * Specific typing * Type fix * Type fix * Type fix * Type fix * Type fix * feat: Enable CRM apps on a per event type basis (#14450) * Add Salesforce to be an event type app * Handle new booking, only get enabled CRM credentials * Abstract generating search params * Add close.com to event type * Clean up * Move hubspot to event type * Add pipedrive to event type * Add zoho bigin to event type * Add zoho crm to event type * Remove console.log * Add deleting CRM apps from event type * Delete event type apps * Fix deleting credentials * Add CRM app data to event type metadata * Backwards compatibility: add CRM credential if doesn't exist on event type * Don't include user CRM credentials for backwards comp * Backwards compatibility show CRM app is enabled and dirty field * Clean up * Type fixes * Type fixes * Type fix * Type fix * Remove console.log * Test fix * Upgrade embed-react vite version - dev * Change build can't find error message * Add back omni install prop * Clean up * Refactor `writeAppDataToEventType` * Use eventType repository in writeAppDataToEventType * Clean up old comments * Add error logging * createCRMEvents pass event uid as created event uid * Use `getUid` * Clean up props in create crm event * Small changes to `crmManager` * Fix zoho CRM * refactor crmManager * Undo vite config change * Fix teamId query * Fix bigin error * Remove need for `writeAppDataToEventType` * Add `getAllCredentials` test * Add crmManager tests * Type fixes * Fix type errors * Fix getAllCredentials test * Fix tests * Skip CRM manager tests for now * feat: Skip RR Assignment if Contact Exists In Salesforce (#14556) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Update yarn.lock * @zomars feedback - use new URL for state params * fix: update hook to not produce enabled === undefined * fix: update app card interfaces to use the new enabled from useIsAppEnabled * fix: feedback for crm RR skip (#15160) * code clean up * fix type any * test setup for RR lead skip * code clean up * simplify code * type error * finshed first test for RR lead skip * add seconds test * add test for handleNewBooking * test if teamMember is set * fix missing enabled key * fix tests * fix type error * use setSystemTime instead of getDate * remove nested if --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> * fix type error * fix: remove app metadata from all eventTypes on deleting the app * fix: update hook to not produce enabled === undefined (default to false) --------- Co-authored-by: Shaik-Sirajuddin <sirajuddinshaik30gmail.com> Co-authored-by: Shaik-Sirajuddin <sirajudddinshaik30@gmail.com> Co-authored-by: Shaik-Sirajuddin <89742297+Shaik-Sirajuddin@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>

@zomars

* fix timezone display on booking page to reflect event availability timezone * migrate fetching event owner's schedule to server side * migrate fetching event owner's schedule to server side * fix e2e test errors * Add WEBAPP_URL_FOR_OAUTH to salesforce auth * In event manager constructor include "_crm" credentials as calendar creds * Change crm apps to type to end with `_crm` * Move sendgrid out of CRM * Add zoho bigin to CRM apps * When getting apps, use slug * Add `crm` variants * Hubspot Oauth use `WEBAPP_URL_FOR_OAUTH` * Refactor creating credentials * Fix empty CRM page * Use credentials with `_crm` * Abstract getAppCategoryTitle * Add integration.handler changes * Init crmManager * Change salesforce to CrmService * Create crmManager * Create contact on new event * Create event * Create new CRM reference * - Fix create new contact for salesforce - Add reschedule to crmManager * Create deleteAllCRMEvents * When searching for credential, look for current credentials in class * On cancel, delete 3rd party events * Add delete method * Type fix * Type fix * Convert Close.com to CrmService * Convert Close.com to CrmService * Move hubspot to CrmService * Convert Pipedrive to CrmService * Rename classes to CrmService * Move ZohoCrm to CrmService * Move Bigin to CrmService * Type return for CrmServices * Fix type errors * Close.com create leads and contacts * Fix tests * Type fix * Zoho bug fixes * Clean up * Type fixes * Remove apiDeletes * Type fixes * Specific typing * Type fix * Type fix * Type fix * Type fix * Type fix * feat: Enable CRM apps on a per event type basis (calcom#14450) * Add Salesforce to be an event type app * Handle new booking, only get enabled CRM credentials * Abstract generating search params * Add close.com to event type * Clean up * Move hubspot to event type * Add pipedrive to event type * Add zoho bigin to event type * Add zoho crm to event type * Remove console.log * Add deleting CRM apps from event type * Delete event type apps * Fix deleting credentials * Add CRM app data to event type metadata * Backwards compatibility: add CRM credential if doesn't exist on event type * Don't include user CRM credentials for backwards comp * Backwards compatibility show CRM app is enabled and dirty field * Clean up * Type fixes * Type fixes * Type fix * Type fix * Remove console.log * Test fix * Upgrade embed-react vite version - dev * Change build can't find error message * Add back omni install prop * Clean up * Refactor `writeAppDataToEventType` * Use eventType repository in writeAppDataToEventType * Clean up old comments * Add error logging * createCRMEvents pass event uid as created event uid * Use `getUid` * Clean up props in create crm event * Small changes to `crmManager` * Fix zoho CRM * refactor crmManager * Undo vite config change * Fix teamId query * Fix bigin error * Remove need for `writeAppDataToEventType` * Add `getAllCredentials` test * Add crmManager tests * Type fixes * Fix type errors * Fix getAllCredentials test * Fix tests * Skip CRM manager tests for now * feat: Skip RR Assignment if Contact Exists In Salesforce (calcom#14556) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Update yarn.lock * @zomars feedback - use new URL for state params * fix: update hook to not produce enabled === undefined * fix: update app card interfaces to use the new enabled from useIsAppEnabled * fix: feedback for crm RR skip (calcom#15160) * code clean up * fix type any * test setup for RR lead skip * code clean up * simplify code * type error * finshed first test for RR lead skip * add seconds test * add test for handleNewBooking * test if teamMember is set * fix missing enabled key * fix tests * fix type error * use setSystemTime instead of getDate * remove nested if --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> * fix type error * fix: remove app metadata from all eventTypes on deleting the app * fix: update hook to not produce enabled === undefined (default to false) --------- Co-authored-by: Shaik-Sirajuddin <sirajuddinshaik30gmail.com> Co-authored-by: Shaik-Sirajuddin <sirajudddinshaik30@gmail.com> Co-authored-by: Shaik-Sirajuddin <89742297+Shaik-Sirajuddin@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>

CarinaWolli added 6 commits May 21, 2024 12:16

code clean up

6d5f7d6

fix type any

d24593e

test setup for RR lead skip

b532a8d

code clean up

07bd0aa

simplify code

a2c3a61

type error

04da68a

keithwillcode added consumer core area: core, team members only labels May 22, 2024

vercel bot deployed to Preview – api May 22, 2024 15:52 View deployment

vercel bot deployed to Preview – dev May 22, 2024 15:57 View deployment

finshed first test for RR lead skip

1b94160

vercel bot temporarily deployed to Preview – api May 22, 2024 17:52 Inactive

vercel bot deployed to Preview – dev May 22, 2024 18:01 View deployment

add seconds test

e138ed3

vercel bot deployed to Preview – api May 22, 2024 18:53 View deployment

vercel bot deployed to Preview – dev May 22, 2024 18:59 View deployment

CarinaWolli added 2 commits May 22, 2024 19:59

add test for handleNewBooking

6ba1a77

test if teamMember is set

03d6e66

vercel bot deployed to Preview – api May 22, 2024 20:15 View deployment

vercel bot deployed to Preview – dev May 22, 2024 20:21 View deployment

CarinaWolli added 2 commits May 22, 2024 22:00

fix missing enabled key

43ac2b2

fix tests

de45b5a

vercel bot deployed to Preview – ai May 22, 2024 22:05 View deployment

vercel bot deployed to Preview – api May 22, 2024 22:09 View deployment

vercel bot deployed to Preview – dev May 22, 2024 22:14 View deployment

CarinaWolli commented May 22, 2024

View reviewed changes

CarinaWolli mentioned this pull request May 22, 2024

[CAL-3787] RR lead skip is not working when booking is made with API #15170

Open

CarinaWolli requested a review from a team May 22, 2024 22:32

CarinaWolli requested a review from zomars May 22, 2024 22:32

CarinaWolli marked this pull request as ready for review May 22, 2024 22:32

dosubot bot added automated-tests area: unit tests, e2e tests, playwright crm-apps area: crm apps, salesforce, hubspot, close.com, sendgrid teams area: teams, round robin, collective, managed event-types labels May 22, 2024

zomars reviewed May 22, 2024

View reviewed changes

apps/web/test/lib/getSchedule.test.ts Outdated Show resolved Hide resolved

zomars reviewed May 22, 2024

View reviewed changes

apps/web/test/utils/bookingScenario/bookingScenario.ts Outdated Show resolved Hide resolved

CarinaWolli added 3 commits May 24, 2024 10:36

fix type error

53347d1

use setSystemTime instead of getDate

6683e58

remove nested if

b7cb74f

CarinaWolli requested a review from zomars May 24, 2024 14:54

vercel bot deployed to Preview – api May 24, 2024 14:55 View deployment

vercel bot deployed to Preview – dev May 24, 2024 15:01 View deployment

keithwillcode approved these changes May 27, 2024

View reviewed changes

keithwillcode merged commit 62b3332 into crm-manager May 27, 2024
17 checks passed

keithwillcode deleted the fix/feedback-rr-skip branch May 27, 2024 22:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: feedback for crm RR skip #15160

fix: feedback for crm RR skip #15160

CarinaWolli commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

vercel bot commented May 22, 2024 •

edited

Loading

CarinaWolli May 22, 2024

CarinaWolli May 22, 2024

CarinaWolli May 22, 2024

CarinaWolli May 22, 2024

CarinaWolli May 22, 2024 •

edited

Loading

fix: feedback for crm RR skip #15160

fix: feedback for crm RR skip #15160

Conversation

CarinaWolli commented May 22, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

github-actions bot commented May 22, 2024 • edited Loading

vercel bot commented May 22, 2024 • edited Loading

CarinaWolli May 22, 2024

Choose a reason for hiding this comment

CarinaWolli May 22, 2024

Choose a reason for hiding this comment

CarinaWolli May 22, 2024

Choose a reason for hiding this comment

CarinaWolli May 22, 2024

Choose a reason for hiding this comment

CarinaWolli May 22, 2024 • edited Loading

Choose a reason for hiding this comment

CarinaWolli commented May 22, 2024 •

edited

Loading

github-actions bot commented May 22, 2024 •

edited

Loading

vercel bot commented May 22, 2024 •

edited

Loading

CarinaWolli May 22, 2024 •

edited

Loading