fix: team booking page having same slug as the org by hariombalhara · Pull Request #12213 · calcom/cal.diy

hariombalhara · 2023-11-03T04:42:24Z

What does this PR do?

Fixes the bug where depending on which team would be fetched first by prisma(which is usually last-modified first), sometimes Org is served for a team page because of slug confusion

Also added a repository for team to kickoff moving to repository pattern for querying.

Motivation to move to the pattern along with this bug fix

The issue arose because we can't query the team and org by slug reliably because slugs aren't unique in table, so we need well tested code to handle that querying thing
Going forward we plan to move metadata.isOrganization to a column so that querying is faster and more reliable and then we would just need to modify the repository code.

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2023-11-03T04:42:25Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 14, 2023 10:38am
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 14, 2023 10:38am
cal-demo	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Nov 14, 2023 10:38am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 14, 2023 10:38am

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview	Nov 14, 2023 10:38am
qa	⬜️ Ignored (Inspect)	Visit Preview	Nov 14, 2023 10:38am
ui	⬜️ Ignored (Inspect)	Visit Preview	Nov 14, 2023 10:38am

hariombalhara · 2023-11-03T04:42:35Z

Current dependencies on/for this PR:

main
- PR fix: team booking page having same slug as the org #12213 👈
  - PR fix: Across Org Scenarios - Wrong links for event and team #12358

This stack of pull requests is managed by Graphite.

github-actions · 2023-11-03T04:42:38Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link to collect XP and win prizes!

github-actions · 2023-11-03T04:49:14Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2023-11-03T12:31:29Z

Current Playwright Test Results Summary

✅ 13 Passing - ⚠️ 1 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 11/14/2023 11:43:50am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 8754bee

Started: 11/14/2023 11:42:45am UTC

⚠️ Flakes

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 2 • Retry 1 • Initial Attempt	16.13% (45) 45 / 279 runs failed over last 7 days	79.57% (222) 222 / 279 runs flaked over last 7 days

View Detailed Build Results

hariombalhara · 2023-11-03T16:00:05Z

+  if (!team) return null;
+  // HACK: I am not sure how to make Prisma in peace with TypeScript with this repository pattern
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return team as any;


There is a return type on function already that should ensure that the function callers would get typesafey as long as this function is well tested.

hariombalhara · 2023-11-03T16:15:57Z

+    // In cases where there are many teams with the same slug, we need to find out the one and only one that matches our criteria
+    .filter((team) => {
+      // We need an org if isOrgView otherwise we need a team
+      return isOrg ? team.metadata?.isOrganization : !team.metadata?.isOrganization;


This is what fixes the bug. So, even if we get wrong result, we validate it here and then reject it.

Udit-takkar

Edit: can be fixed in another PR

Screen.Recording.2023-11-07.at.9.06.46.PM.mov

I tried creating a team with same slug as my org and it was successfull but on the next page (onboard-members) I get an error. teams.create route returned already existing org instead of creating a team

hariombalhara · 2023-11-08T13:35:57Z

Edit: can be fixed in another PR

Screen.Recording.2023-11-07.at.9.06.46.PM.mov
I tried creating a team with same slug as my org and it was successfull but on the next page (onboard-members) I get an error. teams.create route returned already existing org instead of creating a team

Thanks I will take it up later.

Udit-takkar

LGTM.
Great work again in using the repository pattern here!

…ame_name_as_slug_not_loading

zomars added the core area: core, team members only label Nov 3, 2023

vercel Bot deployed to Preview – ai November 3, 2023 04:46 View deployment

vercel Bot had a problem deploying to Preview – api November 3, 2023 04:46 Failure

vercel Bot deployed to Preview – dev November 3, 2023 04:52 View deployment

hariombalhara changed the title ~~Fix team with same name as slug not loading~~ fix: team booking page having same slug as the org Nov 3, 2023

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from 351535c to a83d319 Compare November 3, 2023 12:23

vercel Bot had a problem deploying to Preview – api November 3, 2023 12:30 Failure

vercel Bot deployed to Preview – dev November 3, 2023 12:33 View deployment

vercel Bot deployed to Preview – ai November 3, 2023 12:34 View deployment

vercel Bot deployed to Preview – ai November 3, 2023 15:27 View deployment

vercel Bot had a problem deploying to Preview – api November 3, 2023 15:27 Failure

vercel Bot deployed to Preview – dev November 3, 2023 15:30 View deployment

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from 56d3c7f to 59bc6d7 Compare November 3, 2023 15:49

hariombalhara requested a review from keithwillcode November 3, 2023 15:52

vercel Bot deployed to Preview – ai November 3, 2023 15:53 View deployment

vercel Bot deployed to Preview – dev November 3, 2023 15:55 View deployment

vercel Bot deployed to Preview – api November 3, 2023 15:55 View deployment

hariombalhara commented Nov 3, 2023

View reviewed changes

Comment thread packages/lib/server/repository/team.ts

keithwillcode requested a review from a team November 3, 2023 15:59

hariombalhara commented Nov 3, 2023

View reviewed changes

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from 59bc6d7 to 04164be Compare November 3, 2023 16:13

hariombalhara commented Nov 3, 2023

View reviewed changes

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from 04164be to e2fd525 Compare November 3, 2023 16:17

hariombalhara marked this pull request as ready for review November 3, 2023 16:17

vercel Bot deployed to Preview – ai November 3, 2023 16:21 View deployment

vercel Bot deployed to Preview – dev November 3, 2023 16:25 View deployment

Udit-takkar reviewed Nov 7, 2023

View reviewed changes

Comment thread packages/lib/server/queries/teams/index.ts

Udit-takkar reviewed Nov 7, 2023

View reviewed changes

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from e2fd525 to 7c93db8 Compare November 8, 2023 11:41

vercel Bot deployed to Preview – ai November 8, 2023 11:45 View deployment

vercel Bot deployed to Preview – api November 8, 2023 11:47 View deployment

vercel Bot deployed to Preview – dev November 8, 2023 11:49 View deployment

ThyMinimalDev self-requested a review November 8, 2023 13:24

hariombalhara mentioned this pull request Nov 8, 2023

[CAL-2684] Edit: can be fixed in another PR #12283

Closed

hariombalhara self-assigned this Nov 9, 2023

hariombalhara added the High priority Created by Linear-GitHub Sync label Nov 9, 2023

vercel Bot deployed to Preview – api November 9, 2023 17:08 View deployment

vercel Bot deployed to Preview – dev November 9, 2023 17:10 View deployment

vercel Bot deployed to Preview – ai November 9, 2023 17:11 View deployment

Udit-takkar previously approved these changes Nov 14, 2023

View reviewed changes

hariombalhara added 4 commits November 14, 2023 15:59

Fix team with same name as slug not loading

0f50294

Add team repository with tests

8a68213

Merge remote-tracking branch 'origin/main' into 11-02-Fix_team_with_s…

14cb7de

…ame_name_as_slug_not_loading

Fix ts error

8754bee

hariombalhara dismissed Udit-takkar’s stale review via 8754bee November 14, 2023 10:29

hariombalhara force-pushed the 11-02-Fix_team_with_same_name_as_slug_not_loading branch from 6e738ef to 8754bee Compare November 14, 2023 10:29

hariombalhara mentioned this pull request Nov 14, 2023

fix: Across Org Scenarios - Wrong links for event and team #12358

Merged

11 tasks

vercel Bot deployed to Preview – api November 14, 2023 10:34 View deployment

vercel Bot deployed to Preview – ai November 14, 2023 10:37 View deployment

vercel Bot deployed to Preview – dev November 14, 2023 10:38 View deployment

Udit-takkar approved these changes Nov 14, 2023

View reviewed changes

hariombalhara merged commit 8c2ce97 into main Nov 14, 2023

hariombalhara deleted the 11-02-Fix_team_with_same_name_as_slug_not_loading branch November 14, 2023 12:55

zomars pushed a commit that referenced this pull request Jan 29, 2024

fix: team booking page having same slug as the org (#12213)

898f3d9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: team booking page having same slug as the org#12213

fix: team booking page having same slug as the org#12213
hariombalhara merged 4 commits into
mainfrom
11-02-Fix_team_with_same_name_as_slug_not_loading

hariombalhara commented Nov 3, 2023 •

edited

Loading

Uh oh!

vercel Bot commented Nov 3, 2023 •

edited

Loading

Uh oh!

hariombalhara commented Nov 3, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Nov 3, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Nov 3, 2023 •

edited

Loading

Uh oh!

deploysentinel Bot commented Nov 3, 2023 •

edited

Loading

Test Case Results

Uh oh!

Uh oh!

hariombalhara Nov 3, 2023

Uh oh!

hariombalhara Nov 3, 2023

Uh oh!

Uh oh!

Udit-takkar left a comment •

edited

Loading

Uh oh!

hariombalhara commented Nov 8, 2023

Uh oh!

Udit-takkar left a comment •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

hariombalhara commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Motivation to move to the pattern along with this bug fix

Type of change

How should this be tested?

Mandatory Tasks

Uh oh!

vercel Bot commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hariombalhara commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

deploysentinel Bot commented Nov 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Uh oh!

Uh oh!

hariombalhara Nov 3, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Nov 3, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Udit-takkar left a comment • 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!

hariombalhara commented Nov 8, 2023

Uh oh!

Udit-takkar left a comment • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hariombalhara commented Nov 3, 2023 •

edited

Loading

vercel Bot commented Nov 3, 2023 •

edited

Loading

hariombalhara commented Nov 3, 2023 •

edited

Loading

github-actions Bot commented Nov 3, 2023 •

edited

Loading

github-actions Bot commented Nov 3, 2023 •

edited

Loading

deploysentinel Bot commented Nov 3, 2023 •

edited

Loading

Udit-takkar left a comment •

edited

Loading

Udit-takkar left a comment •

edited

Loading