feat: api v2 `getSchedules` that are applied to team event type #25912

Ryukemeister · 2025-12-16T09:28:52Z

What does this PR do?

Added an eventTypeId filter to the team and user schedules APIs to return schedules applied to a specific event type. Computes the effective schedule per host or user and returns paginated results.

Fixes feat: api v2 get schedules that are applied to team event type #24901
Fixes CAL-6688

New Features

eventTypeId query parameter on GET /v2/organizations/:orgId/teams/:teamId/schedules and GET /v2/organizations/:orgId/teams/:teamId/users/:userId/schedules
Team call falls back to all member schedules when eventTypeId is omitted
User call returns the user's effective schedule for the event type (team or user-owned)
Effective schedule resolution: host schedule > user default schedule > event type schedule
Returns NotFound when the event type is not found in the team or the user isn't associated
Results include availability and support skip/take pagination

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - API behavior documented in code.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Create a team with members who have different schedules
Create a team event type with hosts assigned
Call GET /v2/organizations/:orgId/teams/:teamId/schedules?eventTypeId=<id> and verify it returns the effective schedules for hosts
Call GET /v2/organizations/:orgId/teams/:teamId/users/:userId/schedules?eventTypeId=<id> and verify it returns the user's effective schedule
Verify the precedence order: host's assigned schedule takes priority over user's default schedule, which takes priority over event type's schedule

Human Review Checklist

Verify schedule precedence logic is correct: host.scheduleId ?? user.defaultScheduleId ?? eventType.scheduleId
Check the type casting in teams-schedules.service.ts line 70: schedules as (Schedule & { availability: Availability[] })[]
Verify E2E tests adequately cover the schedule precedence scenarios

Checklist

I have read the contributing guide
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have checked if my changes generate no new warnings

Link to Devin run: https://app.devin.ai/sessions/5a243aa3c5014c2f87aaeddfd0c81981
Requested by: unknown ()

linear · 2025-12-16T09:28:55Z

CAL-6688 feat: api v2 get schedules that are applied to team event type

vercel · 2025-12-16T09:33:27Z

The latest updates on your projects. Learn more about Vercel for GitHub.

4 Skipped Deployments

Project	Deployment	Review	Updated (UTC)
api-v2	Ignored	Preview	Jan 7, 2026 9:17pm
cal	Ignored		Jan 7, 2026 9:17pm
cal-companion	Ignored	Preview	Jan 7, 2026 9:17pm
cal-eu	Ignored		Jan 7, 2026 9:17pm

…ype id

…t-are-applied-to-team-event

Ryukemeister · 2025-12-16T10:44:43Z

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

-      })
-    );
+  async getUserSchedules(userId: number, eventTypeId?: number): Promise<ScheduleOutput_2024_06_11[]> {
+    if (!eventTypeId) {


if there is no event type id param the implementation is exactly the same as before

Ryukemeister · 2025-12-16T10:46:56Z

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

+    return this.getUserSchedulesForEventType(userId, eventTypeId);
+  }
+
+  private async getUserSchedulesForEventType(


here's how thsi should work:

first we fetch the event type provided in query param

we then check if its user owned event type or a team event type where the user is one of the hosts

lastly we fetch the schedule from the schedule id we get from step 2, make sure the schedule belongs to the user and then send it bacl

Ryukemeister · 2025-12-16T10:48:25Z

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts

-    const userIds = await this.teamsRepository.getTeamUsersIds(teamId);
-    const schedules = await this.schedulesRepository.getSchedulesByUserIds(userIds, skip, take);
+  async getTeamSchedules(teamId: number, skip = 0, take = 250, eventTypeId?: number) {
+    if (!eventTypeId) {


if there is no event type id param provided the implementation is same as before

Ryukemeister · 2025-12-16T10:49:57Z

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts

+    return this.getTeamSchedulesForEventType(teamId, eventTypeId, skip, take);
+  }
+
+  private async getTeamSchedulesForEventType(


here's how this should work:

we first fetch the event type via the id provided in the param

we map through that event type hosts and add the schedule which is considered while scheduling any event

we send back the response

cubic-dev-ai

4 issues found across 8 files

Prompt for AI agents (all 4 issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.controller.ts">

<violation number="1" location="apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.controller.ts:74">
P3: Typo in comment: &#39;generacted&#39; should be &#39;generated&#39;.</violation>
</file>

<file name="apps/api/v2/src/ee/schedules/schedules_2024_06_11/schedules.repository.ts">

<violation number="1" location="apps/api/v2/src/ee/schedules/schedules_2024_06_11/schedules.repository.ts:255">
P2: Use `select` instead of `include` to fetch only the fields that are actually needed from both `schedule` and `availability`. This avoids unnecessary data transfer and potential exposure of sensitive fields.</violation>

<violation number="2" location="apps/api/v2/src/ee/schedules/schedules_2024_06_11/schedules.repository.ts:258">
P2: Add `orderBy: { id: &#39;asc&#39; }` (or another deterministic field) to ensure consistent pagination results. Without explicit ordering, paginated results may be non-deterministic.</violation>
</file>

<file name="apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts">

<violation number="1" location="apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts:394">
P2: Test cleanup uses `.then()` instead of `.finally()`, which will skip cleanup if the test assertion fails. This can leave orphaned test data in the database. Other tests in this file correctly use `.finally()` for cleanup.</violation>
</file>

_{Reply to cubic to teach it or ask questions. Re-run a review with @cubic-dev-ai review this PR}

...api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.controller.ts

apps/api/v2/src/ee/schedules/schedules_2024_06_11/schedules.repository.ts

apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts

Ryukemeister · 2025-12-16T10:50:50Z

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts

+    const effectiveScheduleIds = new Set<number>();
+
+    for (const host of eventType.hosts) {
+      const effectiveScheduleId = host.scheduleId ?? host.user.defaultScheduleId ?? eventType.scheduleId;


the order should be always be host schedule id --> user default schedule id --> event type schedule id

this is wrong, I need to fix this

Ryukemeister · 2025-12-16T10:51:58Z

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

+
+    if (userEventType) {
+      const user = await this.usersRepository.findById(userId);
+      effectiveScheduleId = userEventType.scheduleId ?? user?.defaultScheduleId ?? null;


the order should be always be event host users schedule id --> event host users default schedule id

…t-are-applied-to-team-event

Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com>

ThyMinimalDev · 2026-01-18T10:05:47Z

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

+      effectiveScheduleId = userHost.scheduleId ?? user?.defaultScheduleId ?? eventType.scheduleId ?? null;
+    }


are you sure about the order of this ? shouldn't eventType.scheduleId be the first one since it's the one applied to the event-type ??

actually yeah you're right, the order should be like this

eventType schedule id --> host schedule id --> host default schedule id

nice one, thanks Morgan!

I need to fix this for teams schedules service as well

cubic-dev-ai

2 issues found across 2 files (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts">

<violation number="1" location="apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts:112">
P2: This changes the effective schedule precedence so the event type schedule overrides a host’s schedule. The API description expects host schedule → user default → event type, so this will return the wrong schedule for team hosts.</violation>
</file>

<file name="apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts">

<violation number="1" location="apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts:52">
P2: The effective schedule precedence is reversed. This makes the event type schedule override host/user schedules, which contradicts the intended host > user default > event type resolution and will return the wrong schedule for team hosts.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts

github-actions · 2026-01-18T12:56:12Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

Fix the effective schedule resolution to follow the intended precedence: host schedule > user default schedule > event type schedule This addresses Cubic AI review feedback with confidence 9/10: - schedules.service.ts: Fix precedence in getUserSchedulesForEventType - teams-schedules.service.ts: Fix precedence in getTeamSchedulesForEventType Co-Authored-By: unknown <>

Ryukemeister · 2026-01-18T13:25:48Z

@cubic-dev-ai how I get you to not give any feedback?

Ryukemeister · 2026-01-18T13:26:18Z

@cubic-dev-ai I want you to ignore the changes that i'm gonna push since this commit

cubic-dev-ai · 2026-01-18T13:26:27Z

@cubic-dev-ai how I get you to not give any feedback?

@Ryukemeister I can't be silenced completely—I'm configured to review PRs automatically. However, if you want to reduce or skip my feedback on specific PRs, here are your options:

1. Use skip labels/keywords
Some repos configure bots to skip review based on labels like skip-bot-review or keywords in the PR title/description like [skip ci] or [no review]. Check if your repo has this configured.

2. Disable me for specific file patterns
If there are certain files or paths where my reviews aren't helpful (like config files, lockfiles, migrations), ask your repo admins to configure exclusion patterns.

3. Mark my comments as resolved
Once I've commented, you can mark them as resolved or dismiss them. On subsequent commits, I'll only comment on new issues rather than repeating myself.

4. Repository-level configuration
Your repo admins can adjust my review settings—making me less strict, limiting which files I review, or disabling me entirely for certain branches or authors.

5. Specific to this PR
I see you've already addressed my previous feedback (there's even a commit message "chore: implement cubic feedback"). If you're done with changes and don't want more reviews on new commits, you could ask maintainers to merge it as-is or temporarily disable automated reviews for this branch.

The most practical short-term solution: just ignore my comments if they're not useful. I won't be offended! 😄

Ryukemeister · 2026-01-18T13:28:44Z

@devin I want you to ignore the changes that i'm gonna push since this commit

…t-are-applied-to-team-event

cubic-dev-ai

2 issues found across 2 files (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts">

<violation number="1" location="apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts:52">
P1: The precedence order is inverted: event type schedule now overrides host/user schedules. This breaks the documented precedence (host > user default > event type) and will return incorrect effective schedules.</violation>
</file>

<file name="apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts">

<violation number="1" location="apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts:112">
P2: Schedule precedence is reversed here: event type schedule is now chosen before host/user defaults, which contradicts the intended order (host > user default > event type) and will return the wrong effective schedule when a host/user default is set.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts

github-actions · 2026-01-18T13:33:55Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

…t-are-applied-to-team-event

Ryukemeister added 4 commits December 16, 2025 14:47

chore: update teams schedules module

7341a32

chore: update schedules and team events repository

3af2de2

chore: input for teams schedules

53040b5

feat: add logic to filter schedules based on event type id

87ed6f7

pull-request-size bot added the size/L label Dec 16, 2025

fix: bad import

96aee0d

vercel bot deployed to Preview – cal-companion December 16, 2025 09:33 View deployment

vercel bot deployed to Preview – dev December 16, 2025 09:52 View deployment

Ryukemeister added 2 commits December 16, 2025 15:53

chore: add input for get user schedules

11918b6

feat: add logic in user schedule to filter schedules based on event t…

6593110

…ype id

vercel bot deployed to Preview – cal-companion December 16, 2025 10:25 View deployment

chore: update e2e tests

41458c6

vercel bot deployed to Preview – cal-companion December 16, 2025 10:42 View deployment

Ryukemeister marked this pull request as ready for review December 16, 2025 10:43

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

cc4108f

…t-are-applied-to-team-event

Ryukemeister requested a review from a team as a code owner December 16, 2025 10:43

graphite-app bot requested a review from a team December 16, 2025 10:43

vercel bot deployed to Preview – cal-companion December 16, 2025 10:43 View deployment

Ryukemeister commented Dec 16, 2025

View reviewed changes

cubic-dev-ai bot reviewed Dec 16, 2025

View reviewed changes

Ryukemeister commented Dec 16, 2025

View reviewed changes

vercel bot had a problem deploying to Preview – dev December 16, 2025 11:28 Failure

graphite-app bot added consumer core area: core, team members only labels Dec 18, 2025

github-actions bot added api area: API, enterprise API, access token, OAuth Low priority Created by Linear-GitHub Sync platform Anything related to our platform plan labels Jan 17, 2026

calcom-bot removed the devin-conflict-resolution label Jan 17, 2026

Ryukemeister mentioned this pull request Jan 17, 2026

feat(api-v2): add eventTypeId filter to team schedules endpoint #26207

Closed

3 tasks

Ryukemeister and others added 4 commits January 17, 2026 17:12

fix: import path

819df6b

chore: implement cubic feedback

74def64

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

368da4a

…t-are-applied-to-team-event

fix: replace .finally() with try/finally in E2E tests

b47b538

Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com>

ThyMinimalDev reviewed Jan 18, 2026

View reviewed changes

chore: implement PR feedback

f9d6eff

pull-request-size bot added size/XL and removed size/L labels Jan 18, 2026

cubic-dev-ai bot reviewed Jan 18, 2026

View reviewed changes

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts Show resolved Hide resolved

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts Show resolved Hide resolved

Ryukemeister and others added 2 commits January 18, 2026 19:00

fixup

fd5cdd4

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

6865e3e

…t-are-applied-to-team-event

cubic-dev-ai bot reviewed Jan 18, 2026

View reviewed changes

apps/api/v2/src/modules/teams/schedules/services/teams-schedules.service.ts Show resolved Hide resolved

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/schedules.service.ts Show resolved Hide resolved

Ryukemeister added 3 commits January 19, 2026 10:30

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

cb23130

…t-are-applied-to-team-event

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

d9bcd6a

…t-are-applied-to-team-event

Merge branch 'main' into rajiv/cal-6688-feat-api-v2-get-schedules-tha…

161d9d0

…t-are-applied-to-team-event

ThyMinimalDev approved these changes Jan 20, 2026

View reviewed changes

Ryukemeister merged commit 14e2fa6 into main Jan 20, 2026
50 checks passed

Ryukemeister deleted the rajiv/cal-6688-feat-api-v2-get-schedules-that-are-applied-to-team-event branch January 20, 2026 12:25

		effectiveScheduleId = userHost.scheduleId ?? user?.defaultScheduleId ?? eventType.scheduleId ?? null;
		}

feat: api v2 getSchedules that are applied to team event type #25912

feat: api v2 getSchedules that are applied to team event type #25912

Uh oh!

Conversation

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

Uh oh!

What does this PR do?

New Features

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Checklist

Uh oh!

linear bot commented Dec 16, 2025

Uh oh!

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

Uh oh!

Uh oh!

Ryukemeister Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Ryukemeister Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

ThyMinimalDev Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Jan 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ryukemeister Jan 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 18, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

Ryukemeister commented Jan 18, 2026

Uh oh!

Ryukemeister commented Jan 18, 2026

Uh oh!

cubic-dev-ai bot commented Jan 18, 2026

Uh oh!

Ryukemeister commented Jan 18, 2026

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 18, 2026

feat: api v2 `getSchedules` that are applied to team event type #25912

feat: api v2 `getSchedules` that are applied to team event type #25912

Ryukemeister commented Dec 16, 2025 •

edited by devin-ai-integration bot

Loading

vercel bot commented Dec 16, 2025 •

edited

Loading

Ryukemeister Dec 16, 2025 •

edited

Loading

Ryukemeister Jan 18, 2026 •

edited

Loading

Ryukemeister Jan 18, 2026 •

edited

Loading