feat: remove availability relation from User model #22812

emrysal · 2025-07-30T10:29:43Z

feat: remove availability relation from User model

Summary

This PR removes the availability Availability[] relation from the User model in the Prisma schema, along with the corresponding user and userId fields from the Availability model. This change simplifies the data model by eliminating a legacy fallback mechanism that was rarely used in favor of the more robust schedule-based availability system.

Key Changes:

Removed availability Availability[] field from User model in schema.prisma
Removed user and userId fields from Availability model in schema.prisma
Created database migration to handle schema changes
Updated getUserAvailability function to remove user.availability fallback logic
Fixed all TypeScript type errors in affected files
Updated test files to remove availability field references

⚠️ Behavioral Change: The getUserAvailability function previously fell back to user.availability when neither schedule nor eventType availability was present. This fallback has been removed - the function will now throw an error if schedule.availability is not available.

Review & Testing Checklist for Human

End-to-end booking flow testing - Verify that booking creation, rescheduling, and availability checking work correctly across different event types and user configurations
Verify behavioral change alignment - Confirm that removing the user.availability fallback aligns with the intended requirements and won't break existing user workflows
Database migration safety - Review the migration file to ensure it won't cause data loss or integrity issues in production
Search for missed references - Perform additional searches for any remaining references to user.availability in the codebase that might have been missed
Edge case testing - Test scenarios where schedule.availability might be null/undefined to ensure proper error handling

Recommended Test Plan:

Test booking creation for individual users with different schedule configurations
Test team event bookings with various availability setups
Test rescheduling flows to ensure availability validation works
Test edge cases with users who have no schedules or incomplete schedule data

Diagram

%%{ init : { "theme" : "default" }}%%
graph TD
    schema["packages/prisma/schema.prisma<br/>User & Availability models"]:::major-edit
    migration["packages/prisma/migrations/.../migration.sql<br/>Database migration"]:::major-edit
    getUserAvail["packages/lib/getUserAvailability.ts<br/>Core availability logic"]:::major-edit
    userSelect["packages/prisma/selects/user.ts<br/>User query selections"]:::minor-edit
    getEventTypes["packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts<br/>Event type queries"]:::minor-edit
    defaultEvents["packages/lib/defaultEvents.ts<br/>Test data"]:::minor-edit
    builder["packages/lib/test/builder.ts<br/>Test utilities"]:::minor-edit
    
    schema --> migration
    schema --> getUserAvail
    schema --> userSelect
    getUserAvail --> getEventTypes
    schema --> defaultEvents
    schema --> builder
    
    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

All TypeScript type checking and tests are passing
The migration was successfully created and applied locally
This change removes a legacy fallback mechanism in favor of the more robust schedule-based availability system
Session requested by alex@cal.com (@emrysal)
Link to Devin run: https://app.devin.ai/sessions/90757d549f99406d8f020abbc2b8763e

Co-Authored-By: alex@cal.com <me@alexvanandel.com>

devin-ai-integration · 2025-07-30T10:29:47Z

🤖 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-30T10:29:52Z

Walkthrough

This change set removes the direct relationship between users and availability data throughout the codebase and database schema. The availability property is eliminated from user-related objects, queries, and type definitions. Database migration scripts drop the userId column and its associated foreign key and index from the Availability table. The Prisma schema is updated to remove the relation between User and Availability, and all code that previously selected or relied on user.availability is refactored to use only schedule-based availability. Error handling related to missing availability in user or event type is removed. Additionally, references to userId in availability and override creation within schedule repositories are deleted. No new entities or interfaces are introduced.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~15–20 minutes

Complexity label: Moderate
Rationale: The changes span database migrations, schema updates, and refactoring of related backend logic and tests. While conceptually straightforward, the removal of a core relation requires careful review to ensure consistency, data integrity, and that no code paths still expect user-based availability. The review involves cross-verifying schema, migration, selection logic, repository updates, and downstream usage.

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 4ecaae8 and 4701035.

⛔ Files ignored due to path filters (1)

yarn.lock is excluded by !**/yarn.lock, !**/*.lock

📒 Files selected for processing (1)

apps/api/v2/package.json (1 hunks)

✅ Files skipped from review due to trivial changes (1)

apps/api/v2/package.json

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

GitHub Check: Socket Security: Pull Request Alerts

✨ Finishing Touches

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch devin/remove-user-availability-relation-1753870278

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 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? Create a ticket on our support page 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 docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai generate unit tests to generate unit tests for 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-30T12:31:57Z

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 31, 2025 6:24am
cal-eu	⬜️ Ignored (Inspect)			Jul 31, 2025 6:24am

emrysal · 2025-07-30T12:37:28Z

⚠️ Behavioral Change: The getUserAvailability function previously fell back to user.availability when neither schedule nor eventType availability was present. This fallback has been removed - the function will now throw an error if schedule.availability is not available.

Isn't actually a behavioural change, because the schedule availability should always be present (and if not, it's an empty array and no availability should be counted); and the schedule is always available now due to the fallback schedule which is there as a last resort.

github-actions · 2025-07-30T13:31:11Z

E2E results are ready!

Workflow #70083.1 latest results

…870278

socket-security · 2025-07-31T06:27:03Z

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

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	classnames@2.5.1

View full report

feat: remove availability relation from User model

dc6770b

Co-Authored-By: alex@cal.com <me@alexvanandel.com>

github-actions bot added the ❗️ migrations contains migration files label Jul 30, 2025

keithwillcode added core area: core, team members only foundation labels Jul 30, 2025

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

Added redundant check, this situation is impossible

4141501

emrysal marked this pull request as ready for review July 30, 2025 12:34

emrysal requested review from a team as code owners July 30, 2025 12:34

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

dosubot bot added the ✨ feature New feature or request label Jul 30, 2025

emrysal added ready-for-e2e and removed ready-for-e2e labels Jul 30, 2025

vercel bot deployed to Preview – dev July 30, 2025 12:50 View deployment

Removed the creates associating availability with the userId

d73a47b

emrysal requested a review from a team as a code owner July 30, 2025 13:08

vercel bot deployed to Preview – dev July 30, 2025 13:51 View deployment

Also remove userId key from earlier repository

631a333

vercel bot deployed to Preview – dev July 30, 2025 15:01 View deployment

ThyMinimalDev and others added 2 commits July 31, 2025 09:13

Merge branch 'main' into devin/remove-user-availability-relation-1753…

4ecaae8

…870278

chore: bump platform libs

4701035

ThyMinimalDev approved these changes Jul 31, 2025

View reviewed changes

vercel bot deployed to Preview – dev July 31, 2025 07:05 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: remove availability relation from User model #22812

feat: remove availability relation from User model #22812

emrysal commented Jul 30, 2025 •

edited

Loading

Uh oh!

devin-ai-integration bot commented Jul 30, 2025

Uh oh!

coderabbitai bot commented Jul 30, 2025 •

edited

Loading

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 30, 2025 •

edited

Loading

Uh oh!

emrysal commented Jul 30, 2025

Uh oh!

github-actions bot commented Jul 30, 2025 •

edited

Loading

Uh oh!

socket-security bot commented Jul 31, 2025

Uh oh!

Uh oh!

feat: remove availability relation from User model #22812

Are you sure you want to change the base?

feat: remove availability relation from User model #22812

Conversation

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

Uh oh!

feat: remove availability relation from User model

Summary

Review & Testing Checklist for Human

Diagram

Notes

Uh oh!

devin-ai-integration bot commented Jul 30, 2025

🤖 Devin AI Engineer

Uh oh!

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

Uh oh!

Walkthrough

Estimated code review effort

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 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emrysal commented Jul 30, 2025

Uh oh!

github-actions bot commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

socket-security bot commented Jul 31, 2025

Uh oh!

Uh oh!

emrysal commented Jul 30, 2025 •

edited

Loading

coderabbitai bot commented Jul 30, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

vercel bot commented Jul 30, 2025 •

edited

Loading

github-actions bot commented Jul 30, 2025 •

edited

Loading