Merge branch 'codex/project-files-storage' into codex/project-files-product-v2

Author: mzxchandra

apps/sim/lib/uploads/server/content-effects.test.ts

@@ -1,10 +1,9 @@
+import { getMockLogger } from '@sim/testing/mocks/logger.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   cleanup: vi.fn(),
   reconcile: vi.fn(),
-  error: vi.fn(),
-  warn: vi.fn(),
 }))
 vi.mock('@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox', () => ({
   processWorkspaceFileStorageCleanupsNow: mocks.cleanup,
@@ -13,14 +12,13 @@ vi.mock('@/lib/uploads/server/live-doc-outbox', () => ({
   processFileLiveDocReconciliationNow: mocks.reconcile,
 }))
 
-vi.mock('@sim/logger', () => ({ createLogger: () => ({ error: mocks.error, warn: mocks.warn }) }))
+const logger = getMockLogger('FileContentEffects')
 
 import { finishFileContentEffects } from '@/lib/uploads/server/content-effects'
 
 const effects = { cleanupIds: ['cleanup-1'], liveDocEventId: 'event-1' }
 describe('committed file reconciliation policy', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
     mocks.cleanup.mockResolvedValue(undefined)
   })
   it.each(['completed', 'pending', 'processing', 'lease_lost'])(
@@ -30,10 +28,10 @@ describe('committed file reconciliation policy', () => {
       await expect(finishFileContentEffects(effects, { fileId: 'file-1' })).resolves.toBeUndefined()
       expect(mocks.cleanup).toHaveBeenCalledExactlyOnceWith(['cleanup-1'], { fileId: 'file-1' })
       expect(mocks.reconcile).toHaveBeenCalledExactlyOnceWith('event-1')
-      expect(mocks.error).not.toHaveBeenCalled()
-      if (status === 'completed') expect(mocks.warn).not.toHaveBeenCalled()
+      expect(logger.error).not.toHaveBeenCalled()
+      if (status === 'completed') expect(logger.warn).not.toHaveBeenCalled()
       else
-        expect(mocks.warn).toHaveBeenCalledExactlyOnceWith(
+        expect(logger.warn).toHaveBeenCalledExactlyOnceWith(
           'Live document reconciliation remains pending',
           { fileId: 'file-1', eventId: 'event-1', result: status }
         )
@@ -46,7 +44,7 @@ describe('committed file reconciliation policy', () => {
       await expect(finishFileContentEffects(effects, { fileId: 'file-1' })).resolves.toBeUndefined()
       expect(mocks.cleanup).toHaveBeenCalledExactlyOnceWith(['cleanup-1'], { fileId: 'file-1' })
       expect(mocks.reconcile).toHaveBeenCalledExactlyOnceWith('event-1')
-      expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+      expect(logger.error).toHaveBeenCalledExactlyOnceWith(
         'Committed file live-document reconciliation requires intervention',
         { fileId: 'file-1', eventId: 'event-1', result: status }
       )
@@ -57,7 +55,7 @@ describe('committed file reconciliation policy', () => {
     await expect(finishFileContentEffects(effects, { fileId: 'file-1' })).resolves.toBeUndefined()
     expect(mocks.cleanup).toHaveBeenCalledExactlyOnceWith(['cleanup-1'], { fileId: 'file-1' })
     expect(mocks.reconcile).toHaveBeenCalledExactlyOnceWith('event-1')
-    expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+    expect(logger.error).toHaveBeenCalledExactlyOnceWith(
       'Committed file live-document reconciliation failed inline',
       expect.objectContaining({
         fileId: 'file-1',