fix(projects): align integration fixtures with membership constraints

Author: mzxchandra

apps/sim/app/api/knowledge/connectors/member-sync/route.integration.ts

@@ -1,3 +1,4 @@
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 /**
  * The member sync scheduler's reclaim against real PostgreSQL: a members-mode connector whose
  * member lease went stale is put back on the failure ladder, and a connector in any other access
@@ -51,7 +52,7 @@ describe('member sync reclaim in PostgreSQL', () => {
   })
 
   afterAll(async () => {
-    await db.delete(workspace).where(eq(workspace.id, ids.workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, ids.workspaceId))
     await db.delete(organization).where(eq(organization.id, ids.organizationId))
     await db.delete(user).where(inArray(user.id, [ids.aliceId, ids.bobId]))
     await db.$client.end()

apps/sim/app/api/v1/knowledge/route.integration.ts

@@ -7,6 +7,7 @@
 import type { Principal } from '@sim/auth/principal'
 import { db } from '@sim/db'
 import { document, organization, user, workspace } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { authMock, authMockFns, createMockRequest } from '@sim/testing'
 import { generateId } from '@sim/utils/id'
 import { eq, inArray } from 'drizzle-orm'
@@ -85,7 +86,7 @@ describe('knowledge-base document totals in PostgreSQL', () => {
   })
 
   afterAll(async () => {
-    await db.delete(workspace).where(eq(workspace.id, ids.workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, ids.workspaceId))
     await db.delete(organization).where(eq(organization.id, ids.organizationId))
     await db.delete(user).where(inArray(user.id, [ids.aliceId, ids.bobId]))
     vi.unstubAllGlobals()

apps/sim/background/cleanup-table-row-ttl.integration.ts

@@ -110,8 +110,12 @@ describe.skipIf(!migrated)('Expiration with real PostgreSQL transactions', () =>
   beforeAll(async () => {
     await control`INSERT INTO "user" (id, name, email, email_verified, created_at, updated_at)
       VALUES (${userId}, 'Expiration integration fixture', ${`${userId}@example.test`}, true, now(), now())`
-    await control`INSERT INTO workspace (id, name, owner_id, billed_account_user_id)
+    await control.begin(async (tx) => {
+      await tx`INSERT INTO workspace (id, name, owner_id, billed_account_user_id)
       VALUES (${workspaceId}, 'Expiration integration fixtures', ${userId}, ${userId})`
+      await tx`INSERT INTO project (id, name, owner_id) VALUES (${workspaceId}, 'Fixture project', ${userId})`
+      await tx`INSERT INTO project_workspace (project_id, workspace_id) VALUES (${workspaceId}, ${workspaceId})`
+    })
   })
 
   beforeEach(async () => {
@@ -126,7 +130,10 @@ describe.skipIf(!migrated)('Expiration with real PostgreSQL transactions', () =>
   })
 
   afterAll(async () => {
-    await control`DELETE FROM workspace WHERE id = ${workspaceId}`
+    await control.begin(async (tx) => {
+      await tx`DELETE FROM workspace WHERE id = ${workspaceId}`
+      await tx`DELETE FROM project WHERE id = ${workspaceId}`
+    })
     await control`DELETE FROM "user" WHERE id = ${userId}`
     writeFileSync(
       join(tmpdir(), 'expiration-qa-measurements.json'),

apps/sim/lib/credentials/__integration__/organization-personal-tokens.integration.ts

@@ -11,6 +11,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { sha256Hex } from '@sim/security/hash'
 import { generateId } from '@sim/utils/id'
 import { and, eq, inArray } from 'drizzle-orm'
@@ -106,7 +107,8 @@ describe('organization personal tokens', () => {
       { id: generateId(), organizationId: ids.org, userId: ids.owner, role: 'member' },
       { id: generateId(), organizationId: ids.org, userId: ids.other, role: 'admin' },
     ])
-    await db.insert(workspace).values(
+    await insertWorkspaceFixture(
+      db,
       [ids.first, ids.second, ids.foreign].map((id) => ({
         id,
         name: 'Token fixture workspace',
@@ -187,7 +189,7 @@ describe('organization personal tokens', () => {
     await db
       .delete(credentialGroup)
       .where(inArray(credentialGroup.id, [ids.group, ids.legacyGroup]))
-    await db.delete(workspace).where(inArray(workspace.id, [ids.first, ids.second, ids.foreign]))
+    await deleteWorkspaceFixture(db, inArray(workspace.id, [ids.first, ids.second, ids.foreign]))
     await db.delete(organization).where(inArray(organization.id, [ids.org, ids.foreignOrg]))
     await db.delete(user).where(inArray(user.id, [ids.owner, ids.other]))
   })
@@ -287,7 +289,7 @@ describe('organization personal tokens', () => {
         expect.objectContaining({ id: ids.token, workspaceId: null, organizationId: ids.org }),
       ])
     }
-    await db.delete(workspace).where(eq(workspace.id, ids.first))
+    await deleteWorkspaceFixture(db, eq(workspace.id, ids.first))
     await expect(resolve()).resolves.toMatchObject({ accessToken: tokenSecret })
   })
 

apps/sim/lib/environment/execution-environment.integration.ts

@@ -5,6 +5,7 @@
  */
 import { db } from '@sim/db'
 import { environment, permissions, user, workspace, workspaceEnvironment } from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { eq, inArray } from 'drizzle-orm'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
@@ -41,7 +42,7 @@ beforeAll(async () => {
       ...(id === suspended ? { banned: true } : {}),
     }))
   )
-  await db.insert(workspace).values({
+  await insertWorkspaceFixture(db, {
     id: workspaceId,
     name: 'Environment',
     ownerId: owner,
@@ -73,7 +74,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await db.delete(workspace).where(eq(workspace.id, workspaceId))
+  await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
   await db.delete(user).where(inArray(user.id, userIds))
 })
 

apps/sim/lib/knowledge/__integration__/application-acl.integration.ts

@@ -25,6 +25,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { and, eq } from 'drizzle-orm'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
@@ -278,7 +279,7 @@ describe('indexed source content through real application access', () => {
       CONFLUENCE_CLIENT_ID: previousConfluenceClient.id,
       CONFLUENCE_CLIENT_SECRET: previousConfluenceClient.secret,
     })
-    await db.delete(workspace).where(eq(workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
     await db.delete(user).where(eq(user.id, aliceId))
     await db.delete(user).where(eq(user.id, bobId))
     await rm(fixtures.storageRoot, { recursive: true, force: true })

apps/sim/lib/knowledge/__integration__/coda-live.integration.ts

@@ -17,6 +17,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { sleep } from '@sim/utils/helpers'
 import { generateId } from '@sim/utils/id'
 import { serializeSignedCookie } from 'better-call'
@@ -225,7 +226,7 @@ describe.skipIf(!tokenPath || !fixturePath || !secondEmail)(
             .where(eq(document.knowledgeBaseId, ids.knowledgeBaseId))
           for (const row of rows)
             if (row.storageKey) await deleteFile({ key: row.storageKey, context: 'knowledge-base' })
-          await db.delete(workspace).where(eq(workspace.id, ids.workspaceId))
+          await deleteWorkspaceFixture(db, eq(workspace.id, ids.workspaceId))
           await db.delete(organization).where(eq(organization.id, ids.organizationId))
           await db.delete(user).where(eq(user.id, ids.aliceId))
           await db.delete(user).where(eq(user.id, ids.bobId))

apps/sim/lib/knowledge/__integration__/confluence-enrollment.integration.ts

@@ -15,6 +15,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { and, eq } from 'drizzle-orm'
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
@@ -99,7 +100,7 @@ describe('Confluence mirrored-identity self-enrollment', () => {
       CONFLUENCE_CLIENT_SECRET: previousClient.secret,
     })
     for (const fixture of [ids, foreign]) {
-      await db.delete(workspace).where(eq(workspace.id, fixture.workspaceId))
+      await deleteWorkspaceFixture(db, eq(workspace.id, fixture.workspaceId))
       await db.delete(user).where(eq(user.id, fixture.aliceId))
       await db.delete(user).where(eq(user.id, fixture.bobId))
     }

apps/sim/lib/knowledge/__integration__/confluence-identity.integration.ts

@@ -9,6 +9,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { eq } from 'drizzle-orm'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
@@ -181,7 +182,7 @@ describe('Confluence identities with hidden directory email', () => {
   afterAll(async () => {
     vi.unstubAllGlobals()
     Object.assign(env, previousConfluenceClient)
-    await db.delete(workspace).where(eq(workspace.id, ids.workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, ids.workspaceId))
     await db.delete(user).where(eq(user.id, ids.aliceId))
     await db.delete(user).where(eq(user.id, ids.bobId))
     await db.$client.end()

apps/sim/lib/knowledge/__integration__/connector-deferral.integration.ts

@@ -8,6 +8,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { eq, inArray } from 'drizzle-orm'
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -88,7 +89,7 @@ describe('durable connector capacity deferrals', () => {
   })
   afterAll(async () => {
     await db.delete(knowledgeBase).where(eq(knowledgeBase.id, ids.knowledgeBaseId))
-    await db.delete(workspace).where(eq(workspace.id, ids.workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, ids.workspaceId))
     await db.delete(user).where(inArray(user.id, [ids.aliceId, ids.bobId]))
     vi.restoreAllMocks()
     vi.unstubAllGlobals()