feat: No-show bookings - do not count towards a member's round robin assignment #15323

Amit91848 · 2024-06-04T17:40:47Z

What does this PR do?

Fixes [CAL-3858] No-show bookings - do not count towards a member's round robin assignment. #15309
Fixes CAL-3858

Although teampro2 had 6 bookings and teampro had only 2, teampro2 was assigned since noShows bookings were not included

Recording.2024-06-04.230413.mp4

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected)
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)

…assignment

vercel · 2024-06-04T17:40:53Z

@Amit91848 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2024-06-04T17:40:58Z

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

graphite-app · 2024-06-04T17:45:11Z

Graphite Automations

"Add community label" took an action on this PR • (06/04/24)

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

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

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

joeauyeung

Thanks for your contribution @Amit91848. we're talking with the team and are you able to also filter out if the organizer is also a no-show?

joeauyeung

Good find so far @Amit91848. One thing I noticed is that on 53 we're also querying for bookings where the round robin host is listed as an attendee. We should also not count bookings where the host attendee is listed as a no-show.

Amit91848 · 2024-07-17T09:23:27Z

let @calcom/platform team know when this is ready we will need to update our libraries to reflect this on api v2

Will do 👍 @ThyMinimalDev

Updated to use db, please review again @hariombalhara

packages/lib/server/getLuckyUser.integration-test.ts

hariombalhara

The test is failing locally for me. I suspect some bug in test, please verify @Amit91848

Amit91848 · 2024-07-22T13:38:19Z

@hariombalhara I just tried it locally multiple times and it did not fail for me once. Weirdly enough bookings is showing empty array for passing tests as well but if you comment out noShow or noShowHost, then the test fails suggesting bookings are being queried properly.

getLuckyUser function defaults to firstUser passed in availableUsers, so if there are no bookings for both users it would return the first user, that's why in all tests it is expecting users other than first ones to be correct to avoid false positives.

For some reason a single log inside getLuckyUser is being printed twice, but tests are working just fine for me, I rechecked the code and couldn't find any bugs

hariombalhara · 2024-07-23T09:17:07Z

Okay I debugged and found the reason. This is a bug(that I discovered accidentally) in the query ({not:true}) specific to null.

Leaving the comment inline in the code view.

hariombalhara

Shared the reason for the bug and we will need more tests for that scenario.

packages/lib/server/getLuckyUser.ts

hariombalhara · 2024-07-24T09:18:42Z

packages/lib/server/getLuckyUser.integration-test.ts

+    });
+
+    it("Host is a no show", async () => {
+      const user1 = await prisma.user.create({


Suggested change

const user1 = await prisma.user.create({

const organizerThatShowedUp = await prisma.user.create({

packages/lib/server/getLuckyUser.integration-test.ts

hariombalhara · 2024-07-24T09:19:20Z

packages/lib/server/getLuckyUser.integration-test.ts

+          availableUsers: [user1, user2],
+          eventTypeId,
+        })
+      ).resolves.toStrictEqual(user2);


Suggested change

).resolves.toStrictEqual(user2);

).resolves.toStrictEqual(organizerThatDidntShowUp);

packages/lib/server/getLuckyUser.integration-test.ts

hariombalhara

LGTM now !!

Great work with the tests @Amit91848. I suggested some cosmetic changes in the tests that helps in understanding a test better. We should do similar changes in all tests.

It can be done in a followup.

Also, I noticed that it might be better for us to simply write a custom migration to update all noShowHost(where it is null) to false so that we don't need to do worry about NULL in our system. But it can be done in a followup as well.

hariombalhara · 2024-07-24T09:23:29Z

cc @Udit-takkar @joeauyeung for final review.

Amit91848 · 2024-07-24T11:42:41Z

LGTM now !!

Great work with the tests @Amit91848. I suggested some cosmetic changes in the tests that helps in understanding a test better. We should do similar changes in all tests.

Thanks @hariombalhara . Since it isn't much I have updated the test description in this pr itself.

Also, I noticed that it might be better for us to simply write a custom migration to update all noShowHost(where it is null) to false so that we don't need to do worry about NULL in our system. But it can be done in a followup as well.

Will open a follow up for the migration changes.

…assignment (#15323) * feat: No-show bookings - do not count towards a member's round robin assignment * filter no show organizer * remove logs * fix: filter bookings where host attendee is no show * fix: use not condition for noShow * chore: test * add default false for noShowHost * Revert "chore: test" This reverts commit c914a8f. * chore: integration test * fix: noShowHost not working for null * Update packages/lib/server/getLuckyUser.ts * chore: update test description --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: gh0st91848 <gh0st91848@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

* WIP: Billing service * WIP * Update __handler.ts * Update index.ts * WIP * WIP Signed-off-by: zomars <zomars@me.com> * WIP Signed-off-by: zomars <zomars@me.com> * Update delete.handler.ts * Update delete.handler.ts * Update internal-team-billing.ts * WIP * Type fixes Signed-off-by: zomars <zomars@me.com> * WIP Signed-off-by: zomars <zomars@me.com> * Discard changes to apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.ts * Discard changes to packages/app-store/skype/config.json * style: update text area (#15934) * chore: update text-editor input * chore: update text-editor input * final update * Update Editor.tsx --------- Co-authored-by: unknown <adhabal2002@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * fix: #15697 Assignment warning modal poping up ,even when hosts are added . (#15699) * removed reduntand check on assignedusers * update for managed eventtype * formatted * comments * Updated comments * extracted checkForEmptyAssignment and added tests * updated comments * updated to show dialog also when not yet saved * update translations * updated comments * updated translation * updated types * chore: update naming and comments * Delete apps/web/lib/checkForEmptyAssignment.ts deleted since file was renamed * Delete apps/web/test/lib/checkForEmptyAssignment.test.ts deleted as the file is renamed to be more descriptive * update to do teamcheck before * chore: revert name to CheckForEmptyAssignment * updated check conditions * updated useEffect dependencies --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * fix: getting an error when a team member tries to leave (#15925) a team Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> * feat: add transitions to more components (#15916) * add transitions to more components * chore: Remove duplicate class * fix: Change minimum number of teams required for org self-serve (#15955) * fix: Change minimum number of teams required for org self-serve Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com> * refactor: Use a new constant for displaying org helper text dialogue Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com> * Update packages/lib/constants.ts * Update turbo.json --------- Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * feat: pwa ready and add shortcut for quick access (#15957) * chore: Update site.webmanifest with additional display properties * chore: Update site.webmanifest with additional display properties * Update apps/web/public/site.webmanifest --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * i18n: update translations for "by proceeding, ..." (#15921) * feat: Add title attribute to iframe in embed.ts (#15944) * feat: Add title attribute to iframe in embed.ts * Update packages/embeds/embed-core/src/embed.ts --------- Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * fix: Assignment reminder modal appears when deleting a team event type (#15544) * fix: Assignment reminder modal appears when deleting a team event type * update * Update EventTypeSingleLayout.tsx * Update event-types-single-view.tsx * update * Early return https://handbook.cal.com/engineering/best-practices/prefer-early-returns --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Hariom <hariombalhara@gmail.com> * fix: Add CORP and COEP headers to embedded pages (#15275) * Add CORP headers * Improve test * Add unit tests as well --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * feat: No-show bookings - do not count towards a member's round robin assignment (#15323) * feat: No-show bookings - do not count towards a member's round robin assignment * filter no show organizer * remove logs * fix: filter bookings where host attendee is no show * fix: use not condition for noShow * chore: test * add default false for noShowHost * Revert "chore: test" This reverts commit c914a8f. * chore: integration test * fix: noShowHost not working for null * Update packages/lib/server/getLuckyUser.ts * chore: update test description --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: gh0st91848 <gh0st91848@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * refactor: v1 orgs unlimited teams (#15908) * refactor: v1 orgs unlimited teams * fix: response message ownerId --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: refresh connect atoms on token change (#15933) * added dropdown * change comment * fix: added types --------- Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: Next.js bundle analysis (#15903) * fix: Next.js bundle analysis * Added the main checkout back * fix: type in webhook payload (#15912) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * fix: auto accept (#15975) * fix: auto accept * Update packages/lib/server/repository/organization.ts Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> --------- Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * fix: Broken GitHub workflows (#15979) * test: Delete credential endpoint (#15322) * Init * Add mock trpc context * Intro mockDatabaseClient * Introduce mockDatabaseClient class * Add delete video app test * Add calendar test * Remove unused func from bookingScenario * Remove console.log * Add app repository * Add createMany method to event type repository * Remove instance of MockDatabaseClient from video test * Add destination calendar repository * Remove instances of MockDatabaseClient * abstract logic to own handler * Remove dev dependency * Clean up * Type fix * Pull yarn.lock from main --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * fix: #15967 Show better error when wrong variable is used in custom event name (#15974) * update to show exact err msg with custom event name * updated tests for validateCustomEventName --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * WIP Signed-off-by: zomars <zomars@me.com> * Update yarn.lock * Update publish.handler.ts * Update internal-team-billing.test.ts * rename create to init * remove sync services * wip tests for delete team * wip tets * wip tests * tests/internal-test * remove return that is inaccessable * remove team calls to use repository * remove redudant file * update team repo * add stripe mocks and test * fix constants * tests to main stripe handler * remove logs * fix constants * Update packages/features/ee/billing/api/webhook/_customer.subscription.deleted.team-plan.ts Co-authored-by: Omar López <zomars@me.com> * move workflow logic to a service * use static method > creating new class * fix: remove http code deep in repo + tests * Feedback * Update index.ts * Type fix * Lazy load fixes --------- Signed-off-by: zomars <zomars@me.com> Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com> Co-authored-by: Rohan Advani <122167726+RNAdvani@users.noreply.github.com> Co-authored-by: unknown <adhabal2002@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Vijay <vijayraghav22@gmail.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Hichem Fantar <hichemfantar2049@gmail.com> Co-authored-by: Souptik Datta <souptikdatta2001@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Johannes Maendle <141119154+jomaendle2@users.noreply.github.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: gh0st91848 <gh0st91848@gmail.com> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: sean <sean@brydon.io>

feat: No-show bookings - do not count towards a member's round robin …

6d21b02

…assignment

github-actions bot added teams area: teams, round robin, collective, managed event-types ✨ feature New feature or request labels Jun 4, 2024

graphite-app bot added the community Created by Linear-GitHub Sync label Jun 4, 2024

graphite-app bot requested a review from a team June 4, 2024 17:41

keithwillcode added this to the v4.2 milestone Jun 5, 2024

dosubot bot modified the milestones: v4.2, v4.3 Jun 5, 2024

joeauyeung added 2 commits June 5, 2024 16:30

Merge branch 'main' into feat/dont_count_no_show_round_robin

382f117

Merge branch 'main' into feat/dont_count_no_show_round_robin

ee4bd5d

ciaranha added the Medium priority Created by Linear-GitHub Sync label Jun 6, 2024

joeauyeung requested changes Jun 10, 2024

View reviewed changes

filter no show organizer

e99a340

Amit91848 requested a review from joeauyeung June 11, 2024 09:20

keithwillcode modified the milestones: v4.2, v4.3 Jun 17, 2024

dosubot bot modified the milestone: v4.3 Jun 17, 2024

remove logs

3f2829f

joeauyeung previously requested changes Jun 21, 2024

View reviewed changes

Merge branch 'main' into feat/dont_count_no_show_round_robin

90db611

chore: integration test

c4315a9

Amit91848 marked this pull request as ready for review July 17, 2024 09:12

dosubot bot added the bookings area: bookings, availability, timezones, double booking label Jul 17, 2024

hariombalhara reviewed Jul 19, 2024

View reviewed changes

packages/lib/server/getLuckyUser.integration-test.ts Outdated Show resolved Hide resolved

hariombalhara requested changes Jul 19, 2024

View reviewed changes

hariombalhara requested changes Jul 23, 2024

View reviewed changes

fix: noShowHost not working for null

720597d

Amit91848 requested a review from hariombalhara July 23, 2024 10:03

hariombalhara reviewed Jul 24, 2024

View reviewed changes

packages/lib/server/getLuckyUser.ts Outdated Show resolved Hide resolved

Update packages/lib/server/getLuckyUser.ts

ee9c73e

hariombalhara reviewed Jul 24, 2024

View reviewed changes

packages/lib/server/getLuckyUser.integration-test.ts Outdated Show resolved Hide resolved

hariombalhara reviewed Jul 24, 2024

View reviewed changes

packages/lib/server/getLuckyUser.integration-test.ts Outdated Show resolved Hide resolved

hariombalhara previously approved these changes Jul 24, 2024

View reviewed changes

hariombalhara requested a review from Udit-takkar July 24, 2024 09:23

hariombalhara and others added 2 commits July 24, 2024 14:56

Merge branch 'main' into feat/dont_count_no_show_round_robin

d84444d

chore: update test description

e310ad6

Amit91848 dismissed hariombalhara’s stale review via e310ad6 July 24, 2024 11:41

Amit91848 mentioned this pull request Jul 24, 2024

chore: update null noShowHost in Booking to false #15891

Merged

3 tasks

hariombalhara approved these changes Jul 25, 2024

View reviewed changes

anikdhabal added the ready-for-e2e label Jul 26, 2024

keithwillcode merged commit e3861ad into calcom:main Jul 29, 2024
43 of 54 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: No-show bookings - do not count towards a member's round robin assignment #15323

feat: No-show bookings - do not count towards a member's round robin assignment #15323

Amit91848 commented Jun 4, 2024 •

edited by keithwillcode

Loading

vercel bot commented Jun 4, 2024

github-actions bot commented Jun 4, 2024 •

edited

Loading

graphite-app bot commented Jun 4, 2024

joeauyeung left a comment

joeauyeung left a comment

Amit91848 commented Jul 17, 2024

hariombalhara left a comment

Amit91848 commented Jul 22, 2024 •

edited

Loading

hariombalhara commented Jul 23, 2024

hariombalhara left a comment

hariombalhara Jul 24, 2024

hariombalhara Jul 24, 2024

hariombalhara left a comment •

edited

Loading

hariombalhara commented Jul 24, 2024

Amit91848 commented Jul 24, 2024

	const user1 = await prisma.user.create({
	const organizerThatShowedUp = await prisma.user.create({

	).resolves.toStrictEqual(user2);
	).resolves.toStrictEqual(organizerThatDidntShowUp);

feat: No-show bookings - do not count towards a member's round robin assignment #15323

feat: No-show bookings - do not count towards a member's round robin assignment #15323

Conversation

Amit91848 commented Jun 4, 2024 • edited by keithwillcode Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

vercel bot commented Jun 4, 2024

github-actions bot commented Jun 4, 2024 • edited Loading

graphite-app bot commented Jun 4, 2024

Graphite Automations

joeauyeung left a comment

Choose a reason for hiding this comment

joeauyeung left a comment

Choose a reason for hiding this comment

Amit91848 commented Jul 17, 2024

hariombalhara left a comment

Choose a reason for hiding this comment

Amit91848 commented Jul 22, 2024 • edited Loading

hariombalhara commented Jul 23, 2024

hariombalhara left a comment

Choose a reason for hiding this comment

hariombalhara Jul 24, 2024

Choose a reason for hiding this comment

hariombalhara Jul 24, 2024

Choose a reason for hiding this comment

hariombalhara left a comment • edited Loading

Choose a reason for hiding this comment

hariombalhara commented Jul 24, 2024

Amit91848 commented Jul 24, 2024

Amit91848 commented Jun 4, 2024 •

edited by keithwillcode

Loading

github-actions bot commented Jun 4, 2024 •

edited

Loading

Amit91848 commented Jul 22, 2024 •

edited

Loading

hariombalhara left a comment •

edited

Loading