feat: add check for existing organization members to prevent duplicates during member creation

packages/db/src/queries/organization/organization.ts

@@ -165,6 +165,31 @@ export const checkEmailExistsInOrg = async (orgId: string, email: string): Promi
   return result.length > 0;
 };
 
+/**
+ * Checks if an org has a member matching the given profileId or email.
+ * Used to avoid creating duplicate members (e.g. when user has a pending invite).
+ */
+export const hasOrgMemberByProfileIdOrEmail = async (
+  orgId: string,
+  profileId: string,
+  email: string | null | undefined
+): Promise<boolean> => {
+  const conditions = [eq(schema.organizationmember.organizationId, orgId)];
+
+  const profileOrEmailMatch = or(
+    eq(schema.organizationmember.profileId, profileId),
+    ...(email ? [eq(schema.organizationmember.email, email.toLowerCase().trim())] : [])
+  );
+
+  const result = await db
+    .select({ id: schema.organizationmember.id })
+    .from(schema.organizationmember)
+    .where(and(...conditions, profileOrEmailMatch))
+    .limit(1);
+
+  return result.length > 0;
+};
+
 /**
  * Checks which emails already exist as team members in an organization (bulk check)
  * Checks both organizationmember.email and profile.email (via organizationmember.profileId)

packages/db/src/schema.ts

@@ -14,6 +14,7 @@ import {
   text,
   timestamp,
   unique,
+  uniqueIndex,
   uuid,
   varchar
 } from 'drizzle-orm/pg-core';
@@ -1467,7 +1468,10 @@ export const organizationmember = pgTable(
     }),
     index('idx_organizationmember_profile_id').on(table.profileId),
     index('idx_organizationmember_organization_id').on(table.organizationId),
-    index('idx_organizationmember_profile_org').on(table.profileId, table.organizationId)
+    index('idx_organizationmember_profile_org').on(table.profileId, table.organizationId),
+    uniqueIndex('organizationmember_org_profile_unique')
+      .on(table.organizationId, table.profileId)
+      .where(sql`${table.profileId} IS NOT NULL`)
   ]
 );