fix: Add new route to create team routing-form response by hariombalhara · Pull Request #22347 · calcom/cal.com

hariombalhara · 2025-07-09T11:39:57Z

What does this PR do?

Follow up to #22239

Organization Teams Routing Forms Response Endpoint

This PR adds a new teams routing forms endpoint that reuses existing routing form response logic by creating a shared service. The changes extract common functionality into a SharedRoutingFormResponseService and add a new teams-specific route while maintaining the existing organization-level endpoint.

Key Changes

Architecture

Created SharedRoutingFormResponseService to centralize routing form response logic
Implements shared service pattern for code reusability
Added a new Or composite guard to allow using multiple guards as OR

API Endpoints

Added new teams routing forms endpoint that reuses existing response creation logic
Maintained backward compatibility with existing organization endpoints
Updated API documentation to include the new teams endpoint

Security & Validation

Added IsUserRoutingForm guard for proper form ownership validation
Reuses existing routing form response logic for teams endpoint
Adds proper form ownership validation with organization guard

The implementation follows established patterns while extending functionality to support team-level routing forms without duplicating core logic.

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

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. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

vercel · 2025-07-09T11:40:02Z

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

2 Skipped Deployments

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

hariombalhara · 2025-07-09T11:40:14Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

delve-auditor · 2025-07-09T11:42:18Z

✅ No security or compliance issues detected. Reviewed everything up to a20e98b.

Security Overview

🔎 Scanned files: 15 changed file(s)

Detected Code Changes

The diff is too large to display a summary of code changes.

Reply to this PR with @delve-auditor followed by a description of what change you want and we'll auto-submit a change to this PR to implement it.

…ownership_with_org_guard

hariombalhara · 2025-07-09T13:28:04Z

.../organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.ts

    const result = await this.organizationsRoutingFormsResponsesService.createRoutingFormResponseWithSlots(
-      orgId,
      routingFormId,


hariombalhara · 2025-07-09T13:28:31Z

...odules/organizations/routing-forms/services/organizations-routing-forms-responses.service.ts

-    }
-
-    // Extract event type information from the routed URL
-    const { eventTypeId, crmParams } = await this.extractEventTypeAndCrmParams(redirectUrl);
-
-    const paramsForGetAvailableSlots = {
-      type: ById_2024_09_04_type,
-      eventTypeId,
-      ...slotsQuery,
-      ...crmParams,
-    } as const;
-
-    // Get available slots using the slots service with CRM parameters
-    const slots = await this.slotsService.getAvailableSlots(paramsForGetAvailableSlots);
-    const teamMemberIds = crmParams.routedTeamMemberIds ?? [];
-    const teamMemberEmail = crmParams.teamMemberEmail ?? undefined;
-    const skipContactOwner = crmParams.skipContactOwner ?? undefined;
-    const queuedResponseId = crmParams.queuedFormResponseId ?? null;
-    const responseId = crmParams.routingFormResponseId ?? null;
-    const crmAppSlug = crmParams.crmAppSlug ?? undefined;
-    const crmOwnerRecordType = crmParams.crmOwnerRecordType ?? undefined;
-
-    if (responseId) {
-      return {
-        routing: {
-          responseId,
-          teamMemberEmail,
-          teamMemberIds,
-          skipContactOwner,
-          crmAppSlug,
-          crmOwnerRecordType,
-        },
-        eventTypeId,
-        slots,


Moved all this to shared service

hariombalhara · 2025-07-09T13:29:31Z

.../organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.ts

    @Req() request: Request
  ): Promise<CreateRoutingFormResponseOutput> {
    const result = await this.organizationsRoutingFormsResponsesService.createRoutingFormResponseWithSlots(
-      orgId,


graphite-app · 2025-07-09T13:35:11Z

Graphite Automations

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

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

cubic-dev-ai

cubic found 2 issues across 12 files. Review them in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

...tions/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts

apps/api/v2/src/modules/auth/guards/organizations/is-user-routing-form.guard.ts

cubic-dev-ai

cubic found 4 issues across 15 files. Review them in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

.../v2/src/modules/organizations/routing-forms/services/shared-routing-form-response.service.ts

apps/api/v2/src/modules/auth/guards/or-auth/or-auth.guard.ts

github-actions · 2025-07-10T10:06:05Z

E2E results are ready!

Workflow #66804.1 latest results

supalarry

Love the new shared service and tests, but have some comments below:

apps/api/v2/src/modules/auth/guards/or-auth/or-auth.guard.ts

.../organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.ts

…ownership_with_org_guard

)" This reverts commit 89e7fca.

)" (#22399) This reverts commit 89e7fca.

* fix: Add formId ownership with org guard * Don't allow user routing form endpoint to create response for team routing form * rename to or guard

…com#22347)" (calcom#22399) This reverts commit 89e7fca.

…nse (#22347)" (#22399)" This reverts commit e6c36af.

…evert earlier) (#22407) * Revert "revert: "fix: Add new route to create team routing-form response (#22347)" (#22399)" This reverts commit e6c36af. * Update the documentation * Remove versioning

vercel bot temporarily deployed to Preview – api July 9, 2025 11:40 Inactive

vercel bot temporarily deployed to Preview – cal July 9, 2025 11:40 Inactive

keithwillcode added core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO labels Jul 9, 2025

hariombalhara mentioned this pull request Jul 9, 2025

fix: Code Quality improvements to response record endpoint and added unit tests #22264

Merged

3 tasks

vercel bot deployed to Preview – dev July 9, 2025 12:01 View deployment

hariombalhara changed the base branch from response-record-fixes-quick-followup to graphite-base/22347 July 9, 2025 13:15

hariombalhara changed the title ~~fix: Add formId ownership with org guard~~ fix: Add new route to create team routing-form responses Jul 9, 2025

hariombalhara force-pushed the graphite-base/22347 branch from 48759fa to 6410687 Compare July 9, 2025 13:15

hariombalhara force-pushed the 07-09-fix_add_formid_ownership_with_org_guard branch from 76e905f to 4718b8b Compare July 9, 2025 13:15

hariombalhara changed the title ~~fix: Add new route to create team routing-form responses~~ fix: Add new route to create team routing-form response Jul 9, 2025

hariombalhara changed the base branch from graphite-base/22347 to main July 9, 2025 13:15

fix: Add formId ownership with org guard

505d6e4

hariombalhara force-pushed the 07-09-fix_add_formid_ownership_with_org_guard branch from 4718b8b to 505d6e4 Compare July 9, 2025 13:19

Merge remote-tracking branch 'origin/main' into 07-09-fix_add_formid_…

03f2402

…ownership_with_org_guard

hariombalhara commented Jul 9, 2025

View reviewed changes

hariombalhara marked this pull request as ready for review July 9, 2025 13:29

hariombalhara requested a review from a team July 9, 2025 13:29

hariombalhara requested a review from a team as a code owner July 9, 2025 13:29

graphite-app bot requested a review from a team July 9, 2025 13:30

dosubot bot added api area: API, enterprise API, access token, OAuth routing-forms area: routing forms, routing, forms labels Jul 9, 2025

cubic-dev-ai bot reviewed Jul 9, 2025

View reviewed changes

...tions/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts Outdated Show resolved Hide resolved

apps/api/v2/src/modules/auth/guards/organizations/is-user-routing-form.guard.ts Outdated Show resolved Hide resolved

vercel bot deployed to Preview – dev July 9, 2025 14:00 View deployment

vercel bot temporarily deployed to Preview – api July 10, 2025 09:25 Inactive

dosubot bot added teams area: teams, round robin, collective, managed event-types ✨ feature New feature or request labels Jul 10, 2025

cubic-dev-ai bot reviewed Jul 10, 2025

View reviewed changes

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

supalarry reviewed Jul 10, 2025

View reviewed changes

apps/api/v2/src/modules/auth/guards/or-auth/or-auth.guard.ts Outdated Show resolved Hide resolved

.../organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.ts Outdated Show resolved Hide resolved

hariombalhara added 2 commits July 10, 2025 16:39

Merge remote-tracking branch 'origin/main' into 07-09-fix_add_formid_…

a6ae3a7

…ownership_with_org_guard

rename to or guard

a20e98b

hariombalhara force-pushed the 07-09-fix_add_formid_ownership_with_org_guard branch from 9ac891f to a20e98b Compare July 10, 2025 11:13

supalarry requested a review from ThyMinimalDev July 10, 2025 11:21

supalarry approved these changes Jul 10, 2025

View reviewed changes

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

hariombalhara enabled auto-merge (squash) July 10, 2025 11:36

hariombalhara merged commit 89e7fca into main Jul 10, 2025
90 of 95 checks passed

hariombalhara deleted the 07-09-fix_add_formid_ownership_with_org_guard branch July 10, 2025 11:56

keithwillcode added a commit that referenced this pull request Jul 10, 2025

revert: "fix: Add new route to create team routing-form response (#22347

1ef29b6

)" This reverts commit 89e7fca.

keithwillcode added a commit that referenced this pull request Jul 11, 2025

revert: "fix: Add new route to create team routing-form response (#22347

e6c36af

)" (#22399) This reverts commit 89e7fca.

Arephan pushed a commit to Arephan/cal.com that referenced this pull request Jul 11, 2025

revert: "fix: Add new route to create team routing-form response (cal…

b76b90e

…com#22347)" (calcom#22399) This reverts commit 89e7fca.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

2a2521a

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

6c8f6ea

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

5aaae1e

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara mentioned this pull request Jul 11, 2025

fix: Add new route to create team routing-form response again(after revert earlier) #22407

Merged

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

9f1d0ed

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

e3503f6

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

b462556

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

33fc158

…nse (#22347)" (#22399)" This reverts commit e6c36af.

hariombalhara added a commit that referenced this pull request Jul 11, 2025

Revert "revert: "fix: Add new route to create team routing-form respo…

5442b2a

…nse (#22347)" (#22399)" This reverts commit e6c36af.

Comments

Conversation

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

Uh oh!

What does this PR do?

Organization Teams Routing Forms Response Endpoint

Key Changes

Mandatory Tasks (DO NOT REMOVE)

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

delve-auditor bot commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hariombalhara Jul 9, 2025

Choose a reason for hiding this comment

Uh oh!

hariombalhara Jul 9, 2025

Choose a reason for hiding this comment

Uh oh!

hariombalhara Jul 9, 2025

Choose a reason for hiding this comment

Uh oh!

graphite-app bot commented Jul 9, 2025

Graphite Automations

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

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!

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

Uh oh!

E2E results are ready!

Uh oh!

supalarry left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hariombalhara commented Jul 9, 2025 •

edited

Loading

vercel bot commented Jul 9, 2025 •

edited

Loading

hariombalhara commented Jul 9, 2025 •

edited

Loading

delve-auditor bot commented Jul 9, 2025 •

edited

Loading

github-actions bot commented Jul 10, 2025 •

edited

Loading