chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,239 @@
|
||||
/**
|
||||
* @vitest-environment node
|
||||
*/
|
||||
import { schemaMock } from '@sim/testing'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const {
|
||||
mockDbResults,
|
||||
mockUpdateWhere,
|
||||
mockUpdateSet,
|
||||
mockDbUpdate,
|
||||
mockOnConflictDoUpdate,
|
||||
mockInsertValues,
|
||||
mockDbInsert,
|
||||
mockEnsureUserInOrganization,
|
||||
mockSyncUsageLimitsFromSubscription,
|
||||
mockReapplyPaidOrgJoinBillingForExistingMember,
|
||||
} = vi.hoisted(() => {
|
||||
const mockDbResults: { value: any[] } = { value: [] }
|
||||
const mockUpdateWhere = vi.fn().mockResolvedValue(undefined)
|
||||
const mockUpdateSet = vi.fn().mockReturnValue({ where: mockUpdateWhere })
|
||||
const mockDbUpdate = vi.fn().mockReturnValue({ set: mockUpdateSet })
|
||||
const mockOnConflictDoUpdate = vi.fn().mockResolvedValue(undefined)
|
||||
const mockInsertValues = vi.fn().mockReturnValue({
|
||||
onConflictDoUpdate: mockOnConflictDoUpdate,
|
||||
})
|
||||
const mockDbInsert = vi.fn().mockReturnValue({ values: mockInsertValues })
|
||||
const mockEnsureUserInOrganization = vi.fn()
|
||||
const mockSyncUsageLimitsFromSubscription = vi.fn().mockResolvedValue(undefined)
|
||||
const mockReapplyPaidOrgJoinBillingForExistingMember = vi.fn().mockResolvedValue({
|
||||
proUsageSnapshotted: false,
|
||||
proCancelledAtPeriodEnd: false,
|
||||
})
|
||||
|
||||
return {
|
||||
mockDbResults,
|
||||
mockUpdateWhere,
|
||||
mockUpdateSet,
|
||||
mockDbUpdate,
|
||||
mockOnConflictDoUpdate,
|
||||
mockInsertValues,
|
||||
mockDbInsert,
|
||||
mockEnsureUserInOrganization,
|
||||
mockSyncUsageLimitsFromSubscription,
|
||||
mockReapplyPaidOrgJoinBillingForExistingMember,
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('@sim/db', () => {
|
||||
const selectImpl = vi.fn().mockImplementation(() => {
|
||||
const chain: any = {}
|
||||
chain.from = vi.fn().mockReturnValue(chain)
|
||||
chain.where = vi.fn().mockReturnValue(chain)
|
||||
chain.limit = vi
|
||||
.fn()
|
||||
.mockImplementation(() => Promise.resolve(mockDbResults.value.shift() || []))
|
||||
chain.then = vi.fn().mockImplementation((callback: (rows: any[]) => unknown) => {
|
||||
const result = mockDbResults.value.shift() || []
|
||||
return Promise.resolve(callback ? callback(result) : result)
|
||||
})
|
||||
return chain
|
||||
})
|
||||
const txObject = {
|
||||
select: selectImpl,
|
||||
update: mockDbUpdate,
|
||||
insert: mockDbInsert,
|
||||
}
|
||||
return {
|
||||
db: {
|
||||
select: selectImpl,
|
||||
update: mockDbUpdate,
|
||||
insert: mockDbInsert,
|
||||
transaction: vi.fn(async (fn: (tx: typeof txObject) => unknown) => fn(txObject)),
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('@sim/db/schema', () => schemaMock)
|
||||
|
||||
vi.mock('@/lib/billing/organizations/membership', () => ({
|
||||
ensureUserInOrganization: mockEnsureUserInOrganization,
|
||||
reapplyPaidOrgJoinBillingForExistingMember: mockReapplyPaidOrgJoinBillingForExistingMember,
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/billing/core/usage', () => ({
|
||||
syncUsageLimitsFromSubscription: mockSyncUsageLimitsFromSubscription,
|
||||
}))
|
||||
|
||||
vi.mock('@sim/utils/id', () => ({
|
||||
generateId: vi.fn().mockReturnValue('generated-id'),
|
||||
generateShortId: vi.fn().mockReturnValue('short-id'),
|
||||
}))
|
||||
|
||||
import {
|
||||
attachOwnedWorkspacesToOrganization,
|
||||
detachOrganizationWorkspaces,
|
||||
WorkspaceOrganizationMembershipConflictError,
|
||||
} from '@/lib/workspaces/organization-workspaces'
|
||||
|
||||
describe('organization workspace helpers', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockDbResults.value = []
|
||||
mockEnsureUserInOrganization.mockReset()
|
||||
mockSyncUsageLimitsFromSubscription.mockResolvedValue(undefined)
|
||||
})
|
||||
|
||||
it('attaches owned workspaces to an organization and syncs existing members', async () => {
|
||||
mockDbResults.value = [
|
||||
[{ id: 'ws-1' }, { id: 'ws-2' }],
|
||||
[{ userId: 'owner-1' }],
|
||||
[{ userId: 'owner-1' }, { userId: 'member-1' }],
|
||||
[{ userId: 'owner-1', organizationId: 'org-1' }],
|
||||
]
|
||||
mockEnsureUserInOrganization
|
||||
.mockResolvedValueOnce({
|
||||
success: true,
|
||||
alreadyMember: true,
|
||||
billingActions: {
|
||||
proUsageSnapshotted: false,
|
||||
proCancelledAtPeriodEnd: false,
|
||||
},
|
||||
})
|
||||
.mockResolvedValueOnce({
|
||||
success: true,
|
||||
alreadyMember: false,
|
||||
memberId: 'member-1',
|
||||
billingActions: {
|
||||
proUsageSnapshotted: false,
|
||||
proCancelledAtPeriodEnd: false,
|
||||
},
|
||||
})
|
||||
|
||||
const result = await attachOwnedWorkspacesToOrganization({
|
||||
ownerUserId: 'user-1',
|
||||
organizationId: 'org-1',
|
||||
})
|
||||
|
||||
expect(result.attachedWorkspaceIds).toEqual(['ws-1', 'ws-2'])
|
||||
expect(result.addedMemberIds).toEqual(['member-1'])
|
||||
expect(result.skippedMembers).toEqual([])
|
||||
expect(mockEnsureUserInOrganization).toHaveBeenCalledWith({
|
||||
userId: 'owner-1',
|
||||
organizationId: 'org-1',
|
||||
role: 'owner',
|
||||
skipSeatValidation: true,
|
||||
})
|
||||
expect(mockEnsureUserInOrganization).toHaveBeenCalledWith({
|
||||
userId: 'member-1',
|
||||
organizationId: 'org-1',
|
||||
role: 'member',
|
||||
skipSeatValidation: true,
|
||||
})
|
||||
expect(mockSyncUsageLimitsFromSubscription).toHaveBeenCalledWith('member-1')
|
||||
expect(mockReapplyPaidOrgJoinBillingForExistingMember).toHaveBeenCalledWith('owner-1', 'org-1')
|
||||
expect(mockReapplyPaidOrgJoinBillingForExistingMember).not.toHaveBeenCalledWith(
|
||||
'member-1',
|
||||
'org-1'
|
||||
)
|
||||
})
|
||||
|
||||
it('fails before attaching workspaces when an existing member belongs to another organization', async () => {
|
||||
mockDbResults.value = [
|
||||
[{ id: 'ws-1' }],
|
||||
[{ userId: 'owner-1' }],
|
||||
[{ userId: 'owner-1' }, { userId: 'member-2' }],
|
||||
[{ userId: 'member-2', organizationId: 'org-2' }],
|
||||
]
|
||||
|
||||
await expect(
|
||||
attachOwnedWorkspacesToOrganization({
|
||||
ownerUserId: 'user-1',
|
||||
organizationId: 'org-1',
|
||||
})
|
||||
).rejects.toBeInstanceOf(WorkspaceOrganizationMembershipConflictError)
|
||||
|
||||
expect(mockEnsureUserInOrganization).not.toHaveBeenCalled()
|
||||
expect(mockDbUpdate).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('keeps cross-org members external and still attaches when policy is keep-external', async () => {
|
||||
mockDbResults.value = [
|
||||
[{ id: 'ws-1' }],
|
||||
[{ userId: 'owner-1' }],
|
||||
[{ userId: 'owner-1' }, { userId: 'member-2' }],
|
||||
[{ userId: 'member-2', organizationId: 'org-2' }],
|
||||
]
|
||||
mockEnsureUserInOrganization.mockResolvedValueOnce({
|
||||
success: true,
|
||||
alreadyMember: true,
|
||||
billingActions: {
|
||||
proUsageSnapshotted: false,
|
||||
proCancelledAtPeriodEnd: false,
|
||||
},
|
||||
})
|
||||
|
||||
const result = await attachOwnedWorkspacesToOrganization({
|
||||
ownerUserId: 'user-1',
|
||||
organizationId: 'org-1',
|
||||
externalMemberPolicy: 'keep-external',
|
||||
})
|
||||
|
||||
expect(result.attachedWorkspaceIds).toEqual(['ws-1'])
|
||||
expect(result.skippedMembers).toEqual([
|
||||
{
|
||||
userId: 'member-2',
|
||||
reason: 'Already a member of another organization; kept as external workspace member',
|
||||
},
|
||||
])
|
||||
expect(mockEnsureUserInOrganization).toHaveBeenCalledTimes(1)
|
||||
expect(mockEnsureUserInOrganization).toHaveBeenCalledWith({
|
||||
userId: 'owner-1',
|
||||
organizationId: 'org-1',
|
||||
role: 'owner',
|
||||
skipSeatValidation: true,
|
||||
})
|
||||
expect(mockEnsureUserInOrganization).not.toHaveBeenCalledWith(
|
||||
expect.objectContaining({ userId: 'member-2' })
|
||||
)
|
||||
expect(mockDbUpdate).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('detaches organization workspaces into grandfathered shared mode', async () => {
|
||||
mockDbResults.value = [[{ userId: 'owner-1' }], [{ id: 'ws-1', ownerId: 'creator-1' }]]
|
||||
|
||||
const result = await detachOrganizationWorkspaces('org-1')
|
||||
|
||||
expect(result.detachedWorkspaceIds).toEqual(['ws-1'])
|
||||
expect(result.billedAccountUserId).toBe('owner-1')
|
||||
expect(mockUpdateSet).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
organizationId: null,
|
||||
workspaceMode: 'grandfathered_shared',
|
||||
billedAccountUserId: 'owner-1',
|
||||
})
|
||||
)
|
||||
expect(mockOnConflictDoUpdate).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user