fix: prevent auto-migration of new teams with matching org slug

[hariombalhara]

What does this PR do?

Fixes a critical bug in the organization onboarding flow where new teams (id === -1) with slugs matching the organization slug were being incorrectly marked for migration instead of being created as new teams.

The Problem:
When a user adds a new team during organization onboarding with a slug that matches the organization slug, the backend was auto-enabling migration for that team. Since new teams have id === -1, this caused them to be treated as existing teams to migrate, resulting in the team not being created at all.

The Solution:

1. Scope auto-migration logic to only apply to existing teams (id !== -1) with matching org slug
2. Add safety check in createOrMoveTeamsToOrganization to prevent moving teams with id === -1
3. Preserve teams without names if they are being migrated (id !== -1), as the name is not required for migration

Changes:

• Modified filterTeamsAndInvites to accept optional orgSlug parameter
• Updated auto-migration logic: slugConflictsWithOrg && team.id !== -1
• Added guard in createOrMoveTeamsToOrganization: team.isBeingMigrated && team.id !== -1
• Updated all callers to pass organization slug
• Added comprehensive test coverage for edge cases

Mandatory Tasks

• I have self-reviewed the code
• I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - Internal logic change, no API changes
• I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Test Scenario 1: New team with matching org slug

1. Create organization with slug "acme"
2. Add a new team (id === -1) with slug "acme" during onboarding
3. Expected: Team should be created as a new team, NOT migrated
4. Verify: Team exists in database with correct slug

Test Scenario 2: Existing team with matching org slug

1. User has existing team with slug "acme"
2. Create organization with slug "acme"
3. Add the existing team (id !== -1, slug "acme") during onboarding
4. Expected: Team should be auto-marked for migration
5. Verify: Team is moved to organization, not duplicated

Test Scenario 3: Teams without names being migrated

1. Add existing team (id !== -1) with empty name and isBeingMigrated = true
2. Expected: Team should be kept (not filtered out)
3. Verify: Team is successfully migrated despite empty name

Environment:

• No special environment variables required
• Standard Cal.com database setup

Human Review Checklist

Critical Items to Verify:

• Auto-migration logic: Confirm that slugConflictsWithOrg && team.id !== -1 correctly identifies only existing teams for auto-migration
• New team handling: Verify new teams (id === -1) with matching org slug are never auto-migrated
• Safety check: Review the guard in createOrMoveTeamsToOrganization prevents invalid team moves
• Empty name handling: Confirm teams without names are only filtered if id === -1 (new teams)
• Test coverage: Validate that test cases cover all critical edge cases, especially the combination of:
  • New team + matching slug (should NOT migrate)
  • Existing team + matching slug (should migrate)
  • Existing team + empty name + being migrated (should keep)

Session Info:

• Requested by: [email protected] (@hariombalhara)
• Devin session: https://app.devin.ai/sessions/992b787d7bc340729644fdb1478ca953

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

[devin-ai-integration]

🤖 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' or '@devin'.
• 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

[vercel]

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

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	Ignored			Nov 20, 2025 7:13am
cal-eu	Ignored			Nov 20, 2025 7:13am