fix(files): classify missing archive targets

TheodoreSpeaks · TheodoreSpeaks · commit 14b0a4895103 · 2026-08-11T14:18:28.000-07:00
diff --git a/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.test.ts b/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.test.ts
@@ -29,6 +29,7 @@ vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({
   },
 }))
 
+import { WorkspaceFileItemsNotFoundError } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager'
 import { POST as RESTORE } from '@/app/api/workspaces/[id]/files/folders/[folderId]/restore/route'
 import { DELETE, PATCH } from '@/app/api/workspaces/[id]/files/folders/[folderId]/route'
 
@@ -116,6 +117,19 @@ describe('/api/workspaces/[id]/files/folders/[folderId]', () => {
     })
   })
 
+  it('returns not found when deleting an already archived folder', async () => {
+    mocks.deleteFolder.mockRejectedValueOnce(new WorkspaceFileItemsNotFoundError([], [FOLDER_ID]))
+
+    const response = await DELETE(request('DELETE'), context)
+
+    expect(response.status).toBe(404)
+    expect(await response.json()).toEqual({
+      success: false,
+      error: `Workspace file items not found (folders: ${FOLDER_ID})`,
+    })
+    expect(mocks.captureServerEvent).not.toHaveBeenCalled()
+  })
+
   it('restores a folder through the shared use case', async () => {
     const response = await RESTORE(request('POST'), context)
 
diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts b/apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts
@@ -48,15 +48,14 @@ export class WorkspaceFileMoveConflictError extends Error {
   }
 }
 
-export class WorkspaceFileItemsNotFoundError extends Error {
-  readonly code = 'WORKSPACE_FILE_ITEMS_NOT_FOUND' as const
-
+export class WorkspaceFileItemsNotFoundError extends OrchestrationError {
   constructor(fileIds: string[], folderIds: string[]) {
     const parts = [
       fileIds.length > 0 ? `files: ${fileIds.join(', ')}` : null,
       folderIds.length > 0 ? `folders: ${folderIds.join(', ')}` : null,
     ].filter(Boolean)
-    super(`Workspace file items not found (${parts.join('; ')})`)
+    super('not_found', `Workspace file items not found (${parts.join('; ')})`)
+    this.name = 'WorkspaceFileItemsNotFoundError'
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,14 @@ export class WorkspaceFileMoveConflictError extends Error {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-export class WorkspaceFileItemsNotFoundError extends Error {`
`52`		`- readonly code = 'WORKSPACE_FILE_ITEMS_NOT_FOUND' as const`
`53`		`-`
	`51`	`+export class WorkspaceFileItemsNotFoundError extends OrchestrationError {`
`54`	`52`	`constructor(fileIds: string[], folderIds: string[]) {`
`55`	`53`	`const parts = [`
`56`	`54`	fileIds.length > 0 ? `files: ${fileIds.join(', ')}` : null,
`57`	`55`	folderIds.length > 0 ? `folders: ${folderIds.join(', ')}` : null,
`58`	`56`	`].filter(Boolean)`
`59`		- super(`Workspace file items not found (${parts.join('; ')})`)
	`57`	+ super('not_found', `Workspace file items not found (${parts.join('; ')})`)
	`58`	`+ this.name = 'WorkspaceFileItemsNotFoundError'`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`