Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rr-host booked outside of availability #12704

Merged
merged 5 commits into from
Dec 8, 2023

Conversation

CarinaWolli
Copy link
Member

@CarinaWolli CarinaWolli commented Dec 7, 2023

What does this PR do?

Fixes the follow issue:

I have two rr-hosts (teampro, teamfree). Got these two personal bookings for teampro in the db (see screenshot, first two bookings). If teamfree doesn't have any availability, the 10AM slot on dez 12 (Melbourne) is not showing (that's correct). If teamfree is available the slot shows (as it should) BUT if it is teampro's round robin turn, it books teampro

Screenshot 2023-12-07 at 5 06 53 PM

The issue was the getBusyTimes didn't return the bookings because we were filtering the bookings like that:
{
"startTime":{"gte":"2023-12-11T23:00:00.000Z"},
"endTime":{"lte":"2023-12-11T23:15:00.000Z"},
}

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Copy link

vercel bot commented Dec 7, 2023

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

Name Status Preview Comments Updated (UTC)
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 8, 2023 1:55am
dev ❌ Failed (Inspect) Dec 8, 2023 1:55am
5 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ai ⬜️ Ignored (Inspect) Visit Preview Dec 8, 2023 1:55am
cal ⬜️ Ignored (Inspect) Visit Preview Dec 8, 2023 1:55am
cal-demo ⬜️ Ignored (Inspect) Visit Preview Dec 8, 2023 1:55am
qa ⬜️ Ignored (Inspect) Visit Preview Dec 8, 2023 1:55am
ui ⬜️ Ignored (Inspect) Visit Preview Dec 8, 2023 1:55am

Copy link
Contributor

github-actions bot commented Dec 7, 2023

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

Copy link
Contributor

github-actions bot commented Dec 7, 2023

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

Copy link

deploysentinel bot commented Dec 7, 2023

Current Playwright Test Results Summary

✅ 7 Passing - ⚠️ 1 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 12/08/2023 01:30:10am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 2cd281f

Started: 12/08/2023 01:29:31am UTC

⚠️ Flakes

📄   apps/web/playwright/organization/organization-creation.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Organization should be able to create an organization and complete onboarding
Retry 1Initial Attempt
33.61% (81) 81 / 241 runs
failed over last 7 days
50.21% (121) 121 / 241 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Member

@alishaz-polymath alishaz-polymath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, waiting on Alex to review before merging in. His context knowledge is essential here.

emrysal
emrysal previously approved these changes Dec 7, 2023
Copy link
Contributor

@emrysal emrysal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go 🔥

@emrysal emrysal merged commit f87eac1 into main Dec 8, 2023
41 of 42 checks passed
@emrysal emrysal deleted the fix/rr-booked-out-of-availability branch December 8, 2023 01:31
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023
* correctly query overlapping bookings

* remove console.log

* fix getting busy bookings for getAvailableSlots

---------

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
haranrk pushed a commit to haranrk/cal.com that referenced this pull request Jan 4, 2024
* correctly query overlapping bookings

* remove console.log

* fix getting busy bookings for getAvailableSlots

---------

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core area: core, team members only High priority Created by Linear-GitHub Sync
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants