test(projects): align transfer mocks with workspace membership

Author: mzxchandra

apps/sim/lib/billing/organizations/lock-order.test.ts

@@ -181,11 +181,13 @@ describe('workspace payer-change transaction lock ordering', () => {
   it('locks nonzero workspaces before join billing or aggregate payer changes', async () => {
     const ops: Array<{ op: 'lock' | 'payer-transfer' | 'update'; table: unknown }> = []
     let memberSelectCount = 0
-    const rowsForTable = (table: unknown): unknown[] => {
+    const rowsForTable = (table: unknown, fields?: Record<string, unknown>): unknown[] => {
       if (table === workspace) {
+        if (fields?.id === workspace.projectId) return [{ id: null }]
         return [
           {
             id: 'workspace-1',
+            projectId: null,
             billedAccountUserId: 'user-1',
             organizationId: null,
             storageUsedBytes: 128,
@@ -203,7 +205,7 @@ describe('workspace payer-change transaction lock ordering', () => {
       if (table === userStats) return [{ currentPeriodCost: '5' }]
       return []
     }
-    const select = () => {
+    const select = (fields?: Record<string, unknown>) => {
       let table: unknown
       const chain = {
         from(source: unknown) {
@@ -220,9 +222,9 @@ describe('workspace payer-change transaction lock ordering', () => {
           ops.push({ op: 'lock', table })
           return chain
         },
-        limit: async () => rowsForTable(table),
+        limit: async () => rowsForTable(table, fields),
         then(resolve: (rows: unknown[]) => unknown, reject: (error: unknown) => unknown) {
-          return Promise.resolve(rowsForTable(table)).then(resolve, reject)
+          return Promise.resolve(rowsForTable(table, fields)).then(resolve, reject)
         },
       }
       return chain

apps/sim/lib/workspaces/admin-move.test.ts

@@ -191,20 +191,13 @@ const destination = {
 }
 
 /**
- * The move flow reads the workspace three times in order: the optimistic
- * pre-transaction organization read that decides which organizations to lock,
- * the locked classification row, and the final summary reload. The workspace
- * queue therefore gets one set per read, in that order.
- *
- * Keep this comment in step with the reads — a stale count silently shifts
- * every later queue entry onto the wrong statement, which surfaces as an
- * unrelated "could not be reloaded" failure rather than a queueing error.
- *
- * All invitation/grant/permission selects resolve the queue-less empty default.
+ * Queues the optimistic scope, locked workspace, optional unassigned Project projection,
+ * and summary reads. An already completed move skips the Project transfer.
  */
 function queueMoveSelects(workspaceRow: Record<string, unknown>) {
   queueTableRows(workspace, [workspaceRow])
   queueTableRows(workspace, [workspaceRow])
+  if (workspaceRow.organizationId !== destination.id) queueTableRows(workspace, [{ id: null }])
   queueTableRows(workspace, [workspaceRow])
   queueTableRows(organization, [destination])
 }
@@ -670,6 +663,7 @@ describe('moveWorkspaceToOrganization retries', () => {
     queueTableRows(workspace, [organizationWorkspace])
     queueTableRows(workspace, [{ ...organizationWorkspace, organizationId: 'org-moved' }])
     queueTableRows(workspace, [{ ...organizationWorkspace, organizationId: 'org-moved' }])
+    queueTableRows(workspace, [{ id: null }])
     queueTableRows(workspace, [{ ...organizationWorkspace, organizationId: 'org-moved' }])
     queueTableRows(organization, [destination])
 

apps/sim/lib/workspaces/organization-workspaces.test.ts

@@ -191,6 +191,7 @@ describe('organization workspace helpers', () => {
         { id: 'ws-1', ownerId: 'creator-1', billedAccountUserId: 'old-owner' },
       ])
       queueTableRows(schemaMock.invitation, [{ id: 'invite-pending' }, { id: 'invite-terminal' }])
+      queueTableRows(schemaMock.workspace, [{ id: null }])
       queueTableRows(schemaMock.workspace, [{ id: 'ws-1' }])
 
       const result =
@@ -328,6 +329,7 @@ describe('organization workspace helpers', () => {
       { id: 'ws-2', ownerId: 'creator-2', billedAccountUserId: 'old-owner' },
     ])
     queueTableRows(schemaMock.invitation, [{ id: 'invite-2' }])
+    queueTableRows(schemaMock.workspace, [{ id: null }])
     queueTableRows(schemaMock.workspace, [{ id: 'ws-2' }])
 
     const result = await detachOrganizationWorkspaces('org-1')