fix: Remove duplicate org users

packages/server/__tests__/autoJoin.test.ts

@@ -74,7 +74,7 @@ const signUpVerified = async (email: string) => {
   }
 }
 
-test.skip('autoJoin on multiple teams does not create duplicate `OrganizationUser`s', async () => {
+test('autoJoin on multiple teams does not create duplicate `OrganizationUser`s', async () => {
   const domain = `${faker.internet.domainWord()}.parabol.fun`
 
   const email = `${faker.internet.userName()}@${domain}`.toLowerCase()

packages/server/billing/helpers/adjustUserCount.ts

@@ -61,19 +61,13 @@ const changePause = (inactive: boolean) => async (_orgIds: string[], user: IUser
 
 const addUser = async (orgIds: string[], user: IUser, dataLoader: DataLoaderWorker) => {
   const {id: userId} = user
-  const [rawOrganizations, organizationUsers] = await Promise.all([
-    dataLoader.get('organizations').loadMany(orgIds),
-    dataLoader.get('organizationUsersByUserId').load(userId)
-  ])
+  const rawOrganizations = await dataLoader.get('organizations').loadMany(orgIds)
   const organizations = rawOrganizations.filter(isValid)
   const docs = orgIds.map((orgId) => {
-    const oldOrganizationUser = organizationUsers.find(
-      (organizationUser) => organizationUser.orgId === orgId
-    )
     const organization = organizations.find((organization) => organization.id === orgId)!
     // continue the grace period from before, if any OR set to the end of the invoice OR (if it is a free account) no grace period
     return {
-      id: oldOrganizationUser?.id || generateUID(),
+      id: generateUID(),
       orgId,
       userId,
       tier: organization.tier
@@ -83,7 +77,16 @@ const addUser = async (orgIds: string[], user: IUser, dataLoader: DataLoaderWork
   await getKysely()
     .insertInto('OrganizationUser')
     .values(docs)
-    .onConflict((oc) => oc.doNothing())
+    .onConflict((oc) =>
+      oc.constraint('unique_org_user').doUpdateSet({
+        joinedAt: sql`CURRENT_TIMESTAMP`,
+        removedAt: null,
+        inactive: false,
+        role: null,
+        suggestedTier: null,
+        tier: (eb) => eb.ref('excluded.tier')
+      })
+    )
     .execute()
   await Promise.all(
     orgIds.map((orgId) => {

packages/server/postgres/migrations/1725438336254_addOrganizationUserUniqueConstraint.ts

@@ -0,0 +1,45 @@
+import {Kysely, PostgresDialect, sql} from 'kysely'
+import getPg from '../getPg'
+
+export async function up() {
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+
+  // get rid of duplicates
+  // no kysely here, because I tested the SQL directly and don't want to touch it
+  await sql`
+    DELETE FROM "OrganizationUser" d USING "OrganizationUser" k
+    WHERE d."userId" = k."userId"
+      AND d."orgId" = k."orgId"
+      AND (
+        -- keep non-removed over removed
+        (k."removedAt" IS NULL AND d."removedAt" IS NOT NULL)
+        -- or removed later
+        OR (k."removedAt" IS NOT NULL
+           AND d."removedAt" IS NOT NULL
+           AND (k."removedAt" > d."removedAt"
+               OR ((k."removedAt" = d."removedAt") AND k.id > d.id)
+           )
+        )
+        -- or newer non-removed
+        OR (k."removedAt" IS NULL AND d."removedAt" IS NULL AND k.id > d.id)
+      );
+  `.execute(pg)
+
+  await pg.schema
+    .alterTable('OrganizationUser')
+    .addUniqueConstraint('unique_org_user', ['orgId', 'userId'])
+    .execute()
+}
+
+export async function down() {
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await pg.schema.alterTable('OrganizationUser').dropConstraint('unique_org_user').execute()
+}