chore: Chore team metadata table + isOrganization migration from metadata by sean-brydon · Pull Request #12828 · calcom/cal.diy

sean-brydon · 2023-12-16T09:30:34Z

What does this PR do?

Type of change

Bug fix (non-breaking change which fixes an issue)
Chore (refactoring code, technical debt, workflow improvements)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Tests (Unit/Integration/E2E or any other test)
This change requires a documentation update

How should this be tested?

Seed the database
Connect to DB
UPDATE "Team" SET "metadata" = '{"isOrganization": "true", "isOrganizationConfigured": "true", "orgAutoAcceptEmail": "example@example.com", "isOrganizationVerified": "false"}'
WHERE "id" in (1,2,3);
UPDATE "Team" SET "isOrganization" = true WHERE "id" in (1,2,3);
Run SQL above to set metadata
Run migrations - ensure migrations have ran successfully and each team in the above query has a OrganizationSettings table associated with it

Mandatory Tasks

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

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my PR needs changes to the documentation
I haven't checked if my changes generate no new warnings
I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

vercel · 2023-12-16T09:30:43Z

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

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 16, 2024 10:08am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 16, 2024 10:08am

5 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Jan 16, 2024 10:08am
cal	⬜️ Ignored (Inspect)	Visit Preview	Jan 16, 2024 10:08am
cal-demo	⬜️ Ignored (Inspect)	Visit Preview	Jan 16, 2024 10:08am
qa	⬜️ Ignored (Inspect)	Visit Preview	Jan 16, 2024 10:08am
ui	⬜️ Ignored (Inspect)	Visit Preview	Jan 16, 2024 10:08am

github-actions · 2023-12-16T09:30:48Z

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

sean-brydon · 2023-12-16T09:32:43Z

+-- Set team field to notify if it is an organization -> Easier than metadata.parse(X).isOrganization
+UPDATE "Team"
+    SET "isOrganization" = (metadata ->> 'isOrganization')::BOOLEAN
+WHERE
+    metadata ->> 'isOrganization' = 'true';
+
+-- Insert data into org settings
+INSERT INTO "OrganizationSettings" ("teamId", "isOrganizationConfigured", "orgAutoAcceptEmail", "isOrganizationVerified")
+SELECT
+	t.id,
+	(t.metadata ->> 'isOrganizationConfigured')::BOOLEAN AS "isOrganizationConfigured",
+	t.metadata ->> 'orgAutoAcceptEmail' AS "orgAutoAcceptEmail",
+	(t.metadata ->> 'isOrganizationVerified')::BOOLEAN AS "isOrganizationVerified"
+FROM (
+	SELECT
+		id,
+		metadata
+	FROM
+		"Team"
+	WHERE
+		metadata ->> 'isOrganization' = 'true'
+) AS t;


important:

Here we are just updating a table - we are not removing or deleting this data from metadata FOR NOW.

Once we have ran this custom migration we can consider removing the existing fields in prod db to ensure we dont have duplicated data.

github-actions · 2023-12-16T09:37:46Z

📦 Next.js Bundle Analysis for @calcom/web

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

Three Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/insights`	`465.62 KB`	630.43 KB	180.12% (🟢 -2.15%)
`/settings/teams/[id]/members`	`372.63 KB`	537.43 KB	153.55% (🟢 -1.96%)
`/workflows`	`278.42 KB`	443.22 KB	126.64% (🟢 -2.13%)

Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

sean-brydon · 2023-12-16T09:39:17Z

-      metadata: {
-        ...metaDataParsed,
-        isOrganizationVerified: true,
-        orgAutoAcceptEmail: acceptedEmailDomain,
-      },


We no longer need to update metadata for this as it is handled in organizationSettings

sean-brydon · 2023-12-16T09:40:31Z

+  const team = await getTeamOrThrow(input.teamId);
+
+  const isOrg = team.isOrganization;


Switched this order around so we can get if it is an organization based on teamId

@ThyMinimalDev can you confirm this is the correct logic here?

makes sense, probably better to check if the team is an org from database rathe than relying on input parameter

sean-brydon · 2023-12-16T09:41:16Z

@ThyMinimalDev given the changes in inviteHandler do these changes look fine to you?

…able

…chore-team-metadata-table

hariombalhara · 2024-01-16T09:35:58Z


  const nonOrgTeams = user.teams
-    .filter((membership) => !isOrganization({ team: membership.team }))
+    .filter((membership) => !membership.team.isOrganization)


I don't see a reason to switch away from isOrganization

Suggested change

.filter((membership) => !membership.team.isOrganization)

.filter((membership) => !isOrganization({team:membership.team})

…handler.ts Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

hariombalhara

Awesome work @sean-brydon 🙏 Thanks for the PR

…chore-team-metadata-table

…er.ts

zomars · 2024-01-16T19:02:05Z

Heads up. the migration in this PR is failing on prod. Blocking the latest release.

zomars · 2024-01-16T19:04:29Z

+CREATE UNIQUE INDEX "OrganizationSettings_organizationId_key" ON "OrganizationSettings"("organizationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Team_slug_isOrganization_key" ON "Team"("slug", "isOrganization");


ERROR: could not create unique index "Team_slug_isOrganization_key" DETAIL: Key (slug, "isOrganization")=(advisors, f) is duplicated.

zomars · 2024-01-16T19:23:09Z

@calcom/foundation @sean-brydon had to revert this PR due to migration not being compatible with actual prod data. Causing it to fail.

zomars · 2024-01-16T19:24:44Z

From internal chat:

... parentId isn't being taking into account for the new unique constrain
just slug and isOrganization
So one of those is a subteam and another one is a stantalone team (non-org) with slug "advisors". Both have metadata→isOrganization as null/false. The former because is a subteam in an org and the latter because is not on an org. Hence the conflict.

sean-brydon added 18 commits December 15, 2023 19:01

Migration+schema changes

6acadcd

Remove org utils from schema

16e6e9f

Users fixture

ea994a9

Auth signup handlers

b929f8d

checkIsOrg fn

100732c

use team.isOrganization > metadata

713e0af

Add isOrganization to getTeamWithMembers query

d0c3fce

list handler + optimise queries

e01cdad

Update trpc handlers to use team.isOrganization && orgSettings table

5bd789e

Update fixture

9198c3e

Fix typo in prisma.schema

94292fb

next auth options use organizationSettings instread of tema metadata

256e6a7

Admin tooling

a41a757

Updating components to use orgsettings over metadata

47430a5

Add unique index + fix org lib files

617fb15

validateUsername

34cd353

Add a seperate unique constraint between isOrg and slug

751ff37

Invite Member Logic

c1165aa

github-actions Bot added the ❗️ migrations contains migration files label Dec 16, 2023

zomars added the core area: core, team members only label Dec 16, 2023

vercel Bot deployed to Preview – ai December 16, 2023 09:32 View deployment

sean-brydon commented Dec 16, 2023

View reviewed changes

vercel Bot deployed to Preview – dev December 16, 2023 09:39 View deployment

sean-brydon commented Dec 16, 2023

View reviewed changes

fix resend file

b356b0a

sean-brydon requested review from emrysal and zomars January 8, 2024 11:26

Merge branch 'main' into chore-team-metadata-table

1f68582

vercel Bot deployed to Preview – ai January 8, 2024 23:11 View deployment

vercel Bot deployed to Preview – api January 8, 2024 23:12 View deployment

vercel Bot deployed to Preview – dev January 8, 2024 23:17 View deployment

keithwillcode modified the milestone: v3.7 Jan 10, 2024

hariombalhara added 6 commits January 16, 2024 13:56

Merge remote-tracking branch 'origin/main' into chore-team-metadata-t…

b66d6bb

…able

Merge remote-tracking branch 'origin/chore-team-metadata-table' into …

217c89a

…chore-team-metadata-table

variable rename

dfc1dad

Reuse isOrganization

30665a8

variable rename

4006dc9

Remove unnecessary optional chaining

1c1cda3

hariombalhara reviewed Jan 16, 2024

View reviewed changes

Comment thread packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts Outdated

hariombalhara reviewed Jan 16, 2024

View reviewed changes

Comment thread packages/trpc/server/routers/viewer/organizations/adminUpdate.handler.ts Outdated

sean-brydon and others added 2 commits January 16, 2024 22:39

Update packages/trpc/server/routers/viewer/organizations/adminUpdate.…

4c624b6

…handler.ts Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

Update packages/trpc/server/routers/viewer/organizations/adminUpdate.…

7b3d709

…handler.ts Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

hariombalhara reviewed Jan 16, 2024

View reviewed changes

Comment thread packages/trpc/server/routers/viewer/organizations/create.handler.ts Outdated

hariombalhara previously approved these changes Jan 16, 2024

View reviewed changes

hariombalhara added 2 commits January 16, 2024 15:21

Merge remote-tracking branch 'origin/chore-team-metadata-table' into …

bb6562c

…chore-team-metadata-table

Update packages/trpc/server/routers/viewer/organizations/create.handl…

202c733

…er.ts

hariombalhara approved these changes Jan 16, 2024

View reviewed changes

Merge branch 'main' into chore-team-metadata-table

905cffb

hariombalhara approved these changes Jan 16, 2024

View reviewed changes

zomars reviewed Jan 16, 2024

View reviewed changes

		const team = await getTeamOrThrow(input.teamId);

		const isOrg = team.isOrganization;

	.filter((membership) => !membership.team.isOrganization)
	.filter((membership) => !isOrganization({team:membership.team})

Conversation

sean-brydon commented Dec 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Checklist

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

sean-brydon Dec 16, 2023

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Three Pages Changed Size

Uh oh!

sean-brydon Dec 16, 2023

Choose a reason for hiding this comment

Uh oh!

sean-brydon Dec 16, 2023

Choose a reason for hiding this comment

Uh oh!

ThyMinimalDev Dec 19, 2023

Choose a reason for hiding this comment

Uh oh!

sean-brydon Dec 16, 2023

Choose a reason for hiding this comment

Uh oh!

hariombalhara Jan 16, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

zomars commented Jan 16, 2024

Uh oh!

zomars Jan 16, 2024

Choose a reason for hiding this comment

Uh oh!

zomars commented Jan 16, 2024

Uh oh!

zomars commented Jan 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

sean-brydon commented Dec 16, 2023 •

edited

Loading

vercel Bot commented Dec 16, 2023 •

edited

Loading

github-actions Bot commented Dec 16, 2023 •

edited

Loading

github-actions Bot commented Dec 16, 2023 •

edited

Loading