refactor: convert checkBookingLimits to class service with dependency injection #22768

devin-ai-integration · 2025-07-28T09:21:35Z

Refactor checkBookingLimits and checkBookingAndDurationLimits to service classes with dependency injection

Summary

This PR refactors two key booking limit functions into service classes using dependency injection, following the established pattern of AvailableSlotsService. The changes include:

checkBookingLimits.ts → CheckBookingLimitsService class with proper DI
checkBookingAndDurationLimits.ts → CheckBookingAndDurationLimitsService class with proper DI
New DI infrastructure (tokens, modules, containers) to support both services
Updated all usage points to use services through dependency injection
Moved direct Prisma calls from checkBookingLimits into BookingRepository

The refactoring maintains all existing functionality while improving code organization, testability, and consistency with the established DI patterns in the codebase.

Review & Testing Checklist for Human

End-to-end booking limit testing: Create bookings with various limit configurations (daily, weekly, monthly) and verify limits are properly enforced
DI container verification: Confirm that getCheckBookingLimitsService() and getCheckBookingAndDurationLimitsService() return properly initialized services with correct dependencies
Service dependency validation: Verify that CheckBookingAndDurationLimitsService correctly uses injected checkBookingLimitsService instead of direct container calls
Error handling testing: Test that deprecated function calls throw appropriate error messages directing users to use DI services
Performance validation: Ensure the DI overhead doesn't significantly impact booking creation performance

Recommended test plan: Create test bookings with different event types that have booking limits configured, and verify that the limits are correctly enforced at the expected thresholds.

Diagram

%%{ init : { "theme" : "default" }}%%
graph TD
    handleNewBooking["packages/features/bookings/lib/<br/>handleNewBooking.ts"]:::major-edit
    checkBookingAndDurationLimits["packages/features/bookings/lib/handleNewBooking/<br/>checkBookingAndDurationLimits.ts"]:::major-edit
    checkBookingLimits["packages/lib/intervalLimits/server/<br/>checkBookingLimits.ts"]:::major-edit
    bookingLimitsContainer["packages/lib/di/containers/<br/>booking-limits.ts"]:::major-edit
    tokens["packages/lib/di/<br/>tokens.ts"]:::minor-edit
    newModule["packages/lib/di/modules/<br/>check-booking-and-duration-limits.ts"]:::major-edit
    bookingRepo["packages/lib/server/repository/<br/>booking.ts"]:::context
    
    handleNewBooking -->|"uses getCheckBookingAndDurationLimitsService()"| bookingLimitsContainer
    bookingLimitsContainer -->|"provides"| checkBookingAndDurationLimits
    checkBookingAndDurationLimits -->|"injects"| checkBookingLimits
    checkBookingLimits -->|"uses"| bookingRepo
    bookingLimitsContainer -->|"loads"| newModule
    newModule -->|"references"| tokens
    
    subgraph Legend
        L1[Major Edit]:::major-edit
        L2[Minor Edit]:::minor-edit
        L3[Context/No Edit]:::context
    end
    
    classDef major-edit fill:#90EE90
    classDef minor-edit fill:#87CEEB
    classDef context fill:#FFFFFF

Notes

Both service classes maintain backward compatibility by keeping the original function exports, but they now throw errors directing users to use DI
The checkDurationLimits function remains as a direct import (not converted to service) to maintain current behavior
All existing tests pass, indicating functional equivalence is maintained
The refactoring follows the exact same DI patterns established by AvailableSlotsService

Session requested by: morgan@cal.com
Devin session: https://app.devin.ai/sessions/e3d8bc3a731846c0884de66f5a43ef44

… injection - Create CheckBookingLimitsService class following AvailableSlotsService pattern - Add countBookingsByEventTypeAndDateRange method to BookingRepository - Move direct prisma calls from service to repository layer - Implement dependency injection with proper DI tokens and modules - Update all usage points to use the new service through DI - Maintain backward compatibility with error-throwing wrapper functions - Update tests to use the new service pattern - Resolve TODO comment in AvailableSlotsService for DI integration Co-Authored-By: morgan@cal.com <morgan@cal.com>

devin-ai-integration · 2025-07-28T09:21:38Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR that start with 'DevinAI'.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

coderabbitai · 2025-07-28T09:21:42Z

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Join our Discord community for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

vercel · 2025-07-28T12:03:54Z

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

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)			Jul 30, 2025 10:19am
cal-eu	⬜️ Ignored (Inspect)			Jul 30, 2025 10:19am

…ts-service

graphite-app · 2025-07-28T12:10:12Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/28/25)

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

- Create CheckBookingAndDurationLimitsService class following DI pattern - Add DI tokens and module for the new service - Update booking-limits container to provide the new service - Refactor handleNewBooking.ts to use service through DI - Maintain backward compatibility with deprecated function export - Preserve all existing functionality while improving code organization Co-Authored-By: morgan@cal.com <morgan@cal.com>

…ts-service

socket-security · 2025-07-29T11:11:46Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License

View full report

socket-security · 2025-07-29T11:11:48Z

All alerts resolved. Learn more about Socket for GitHub.

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report

…ts-service

github-actions · 2025-07-30T10:51:21Z

E2E results are ready!

Workflow #69918.1 latest results

emrysal

Happy with this; step by step..

… injection (#22768) * refactor: convert checkBookingLimits to class service with dependency injection - Create CheckBookingLimitsService class following AvailableSlotsService pattern - Add countBookingsByEventTypeAndDateRange method to BookingRepository - Move direct prisma calls from service to repository layer - Implement dependency injection with proper DI tokens and modules - Update all usage points to use the new service through DI - Maintain backward compatibility with error-throwing wrapper functions - Update tests to use the new service pattern - Resolve TODO comment in AvailableSlotsService for DI integration Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: DI CheckBookingLimitsService in v2 slots service * chore: bump libraries * chore: create getCheckBookingLimitsService * refactor: convert checkBookingAndDurationLimits to service class with DI - Create CheckBookingAndDurationLimitsService class following DI pattern - Add DI tokens and module for the new service - Update booking-limits container to provide the new service - Refactor handleNewBooking.ts to use service through DI - Maintain backward compatibility with deprecated function export - Preserve all existing functionality while improving code organization Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: CheckBookingAndDurationLimitsService * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

* fix: resolve username constraint violation in removeMember - Update username to - format when removing users from organizations - Fix unique constraint violation on (username, organizationId) when organizationId is null - Add test case to verify username format change and successful removal - Fix skipped test by adding proper imports and removing describe.skip Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * test: update removeMember test to verify constraint violation scenario - Create two users with same username (one with null orgId, one with orgId) - Verify removing org user updates username without unique constraint error - Test ensures username gets updated to - format Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * test: add comprehensive unit tests for handleInstantMeeting - Revert previous removeMember changes - Add full test coverage for instant meeting functionality - Test team validation, booking creation, token generation - Test webhook triggers and browser notifications - Mock external dependencies for isolated unit tests - Translation issue to be addressed in future iteration Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * update * Update handleInstantMeeting.test.ts * fix: redir parameter for connect atoms (#22815) * encode redirect url to make sure it has all parameters * add changesets * feat: Support an array response for a field when used as `Value of Field` (#22740) * Passing tests and fixed * self review addressed adn more tests * fix: flaky e2e (#22819) * fix: merge working hours when adjacent (#21912) * fix: Adjacency issue when working hours connect over multiple days * Add tests to validate the new merging of day end logic * Update to correct annotation. Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * Implement subsequent date ranges for date overrides also * The map needs to be updated on successful resolve. * test: add failing test for overlapping ranges with same end time Demonstrates bug where overlapping working hour ranges (6:00-10:00 and 8:00-10:00) lose the earlier portion (6:00-8:00), showing only 8:00 and 9:00 slots instead of all 4 slots (6:00, 7:00, 8:00, 9:00). Related to Carina's comment on PR #21912. Co-Authored-By: alex@cal.com <me@alexvanandel.com> * fix: properly merge overlapping ranges with same end time Fixes bug where overlapping working hour ranges with the same end time (e.g., 6:00-10:00 and 8:00-10:00) would lose the earlier portion of the first range. The merging logic now correctly preserves the earliest start time when ranges overlap and share the same end time. This ensures all expected time slots are available (6:00, 7:00, 8:00, 9:00) instead of losing the earlier slots (6:00, 7:00). Resolves the issue identified in Carina's comment on PR #21912. Co-Authored-By: alex@cal.com <me@alexvanandel.com> * perf: optimize overlapping range detection from O(n²) to O(n) Replaces Object.keys().find() with Map-based lookup for ranges with same end time. This optimization handles 2000+ date ranges efficiently, reducing complexity from 4M operations to linear time while maintaining the same merging behavior. Performance improvement for high-volume event types with many availability ranges. Co-Authored-By: alex@cal.com <me@alexvanandel.com> --------- Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: Improving Booking Visibility at Month-End (#22770) * remove first weeks and add last * fix added last week * prefetch availability of next month * don't switch month * On hover show month * only show new UI in monthly view * show month tooldtip only when needed * show month on first day of month * remove isFirstDayOfNextMonth * fix prefetching next month * fix datePicker tests * preventMonthSwitching in monthly view * add tests * code clean up * code clean up * code clena up for ooo days * push first day of month * remove bg color for the month badge * fix text colour * remove not needed * use object param * revert: use object param * use object param * fix DatePicker tests --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Sean Brydon <sean@cal.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> * chore: Refactor logs (#22824) * Refactor logs * Add specific info to log * fix: Errors in org onboarding in some edge cases (#22711) * Automatically enable migration of a team that conflicts with Orgs slug * Allow changing the orgs slug and name if user goes back and changes it * avoid crashing on some scenarios * Revert "Allow changing the orgs slug and name if user goes back and changes it" This reverts commit f8872b0. * fix: handle unpublished teams gracefully in org migration - Change 'No oldSlug for team' from error to warning for unpublished teams - Keep 'No slug for team' as error since org onboarding ensures teams have names - Add test for migrating unpublished teams without oldSlug - Add clarifying comments about when each condition can occur * feat: enable PBAC checking on organization settings page (#22467) * refactor: convert checkBookingLimits to class service with dependency injection (#22768) * refactor: convert checkBookingLimits to class service with dependency injection - Create CheckBookingLimitsService class following AvailableSlotsService pattern - Add countBookingsByEventTypeAndDateRange method to BookingRepository - Move direct prisma calls from service to repository layer - Implement dependency injection with proper DI tokens and modules - Update all usage points to use the new service through DI - Maintain backward compatibility with error-throwing wrapper functions - Update tests to use the new service pattern - Resolve TODO comment in AvailableSlotsService for DI integration Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: DI CheckBookingLimitsService in v2 slots service * chore: bump libraries * chore: create getCheckBookingLimitsService * refactor: convert checkBookingAndDurationLimits to service class with DI - Create CheckBookingAndDurationLimitsService class following DI pattern - Add DI tokens and module for the new service - Update booking-limits container to provide the new service - Refactor handleNewBooking.ts to use service through DI - Maintain backward compatibility with deprecated function export - Preserve all existing functionality while improving code organization Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: CheckBookingAndDurationLimitsService * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> * fix: Return empty available days if error querying calendar (#22828) * Return a busy block placeholder if calendar throws an error * Refactor `getCalendarsEvents` to return an object with a success prop * Throw error in `getBusyTimes` if failed to fetch calendar availability * Return empty available days if error getting busy times * yeet. * Type fix * Fix type error in getLuckyUsers * Type fixes * Type fix * Type fix * Fix test * Fix test mocks * Refactor calendars.service to use new calendarBusyTimesQuery --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v5.5.9 * include mobile layout (#22836) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * test: fix handleInstantMeeting test with setupAndTeardown and proper mocking - Add setupAndTeardown() for proper test environment setup - Use mockNoTranslations() to fix translation function mocking - Simplify NextApiRequest mock to resolve TypeScript errors - Both test cases now pass successfully Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * fix typo --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@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 <sean@cal.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>

vercel bot deployed to Preview – dev July 28, 2025 09:42 View deployment

chore: DI CheckBookingLimitsService in v2 slots service

01ded20

ThyMinimalDev added 2 commits July 28, 2025 15:05

Merge branch 'main' into devin/1753693627-refactor-check-booking-limi…

87358e9

…ts-service

chore: bump libraries

dd43f34

ThyMinimalDev marked this pull request as ready for review July 28, 2025 12:08

ThyMinimalDev requested review from a team as code owners July 28, 2025 12:08

graphite-app bot requested a review from a team July 28, 2025 12:08

dosubot bot added the 💻 refactor label Jul 28, 2025

ThyMinimalDev added ready-for-e2e and removed 💻 refactor labels Jul 28, 2025

ThyMinimalDev removed the ready-for-e2e label Jul 28, 2025

ThyMinimalDev marked this pull request as draft July 28, 2025 12:17

vercel bot deployed to Preview – dev July 28, 2025 12:53 View deployment

ThyMinimalDev and others added 2 commits July 28, 2025 15:57

chore: create getCheckBookingLimitsService

46a711a

vercel bot deployed to Preview – dev July 28, 2025 13:48 View deployment

ThyMinimalDev added 2 commits July 29, 2025 11:29

Merge branch 'main' into devin/1753693627-refactor-check-booking-limi…

36abd05

…ts-service

chore: CheckBookingAndDurationLimitsService

e326402

vercel bot deployed to Preview – dev July 29, 2025 11:28 View deployment

Merge branch 'main' into devin/1753693627-refactor-check-booking-limi…

6d6b46c

…ts-service

vercel bot deployed to Preview – dev July 30, 2025 08:11 View deployment

chore: bump platform libs

917c039

ThyMinimalDev marked this pull request as ready for review July 30, 2025 08:22

ThyMinimalDev added the ready-for-e2e label Jul 30, 2025

dosubot bot added the 💻 refactor label Jul 30, 2025

ThyMinimalDev added the api area: API, enterprise API, access token, OAuth label Jul 30, 2025

vercel bot deployed to Preview – dev July 30, 2025 08:39 View deployment

Merge branch 'main' into devin/1753693627-refactor-check-booking-limi…

7be4b2e

…ts-service

vercel bot deployed to Preview – dev July 30, 2025 10:40 View deployment

emrysal enabled auto-merge (squash) July 31, 2025 01:02

emrysal approved these changes Jul 31, 2025

View reviewed changes

emrysal merged commit 82063cc into main Jul 31, 2025
41 checks passed

emrysal deleted the devin/1753693627-refactor-check-booking-limits-service branch July 31, 2025 01:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: convert checkBookingLimits to class service with dependency injection #22768

refactor: convert checkBookingLimits to class service with dependency injection #22768

Uh oh!

devin-ai-integration bot commented Jul 28, 2025 •

edited

Loading

Uh oh!

devin-ai-integration bot commented Jul 28, 2025

Uh oh!

coderabbitai bot commented Jul 28, 2025 •

edited

Loading

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

vercel bot commented Jul 28, 2025 •

edited

Loading

Uh oh!

graphite-app bot commented Jul 28, 2025

Uh oh!

socket-security bot commented Jul 29, 2025 •

edited

Loading

Uh oh!

socket-security bot commented Jul 29, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jul 30, 2025

Uh oh!

emrysal left a comment

Uh oh!

Uh oh!

Uh oh!

refactor: convert checkBookingLimits to class service with dependency injection #22768

refactor: convert checkBookingLimits to class service with dependency injection #22768

Uh oh!

Conversation

devin-ai-integration bot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Refactor checkBookingLimits and checkBookingAndDurationLimits to service classes with dependency injection

Summary

Review & Testing Checklist for Human

Diagram

Notes

Uh oh!

devin-ai-integration bot commented Jul 28, 2025

🤖 Devin AI Engineer

Uh oh!

coderabbitai bot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

vercel bot commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Jul 28, 2025

Graphite Automations

Uh oh!

socket-security bot commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

socket-security bot commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 30, 2025

E2E results are ready!

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

devin-ai-integration bot commented Jul 28, 2025 •

edited

Loading

coderabbitai bot commented Jul 28, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

vercel bot commented Jul 28, 2025 •

edited

Loading

socket-security bot commented Jul 29, 2025 •

edited

Loading

socket-security bot commented Jul 29, 2025 •

edited

Loading