ack comments

Author: waleedlatif1

apps/sim/app/api/folders/[id]/duplicate/route.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { workflow, workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, asc, eq, isNull } from 'drizzle-orm'
+import { and, eq, isNull, min } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
@@ -73,20 +73,16 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
 
       const [[folderResult], [workflowResult]] = await Promise.all([
         tx
-          .select({ sortOrder: workflowFolder.sortOrder })
+          .select({ minSortOrder: min(workflowFolder.sortOrder) })
           .from(workflowFolder)
-          .where(and(eq(workflowFolder.workspaceId, targetWorkspaceId), folderParentCondition))
-          .orderBy(asc(workflowFolder.sortOrder))
-          .limit(1),
+          .where(and(eq(workflowFolder.workspaceId, targetWorkspaceId), folderParentCondition)),
         tx
-          .select({ sortOrder: workflow.sortOrder })
+          .select({ minSortOrder: min(workflow.sortOrder) })
           .from(workflow)
-          .where(and(eq(workflow.workspaceId, targetWorkspaceId), workflowParentCondition))
-          .orderBy(asc(workflow.sortOrder))
-          .limit(1),
+          .where(and(eq(workflow.workspaceId, targetWorkspaceId), workflowParentCondition)),
       ])
 
-      const minSortOrder = [folderResult?.sortOrder, workflowResult?.sortOrder].reduce<
+      const minSortOrder = [folderResult?.minSortOrder, workflowResult?.minSortOrder].reduce<
         number | null
       >((currentMin, candidate) => {
         if (candidate == null) return currentMin

apps/sim/app/api/folders/route.test.ts

@@ -10,9 +10,14 @@ import {
   mockConsoleLogger,
   setupCommonApiMocks,
 } from '@sim/testing'
+import { drizzleOrmMock } from '@sim/testing/mocks'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('@/lib/audit/log', () => auditMock)
+vi.mock('drizzle-orm', () => ({
+  ...drizzleOrmMock,
+  min: vi.fn((field) => ({ type: 'min', field })),
+}))
 
 interface CapturedFolderValues {
   name?: string
@@ -30,14 +35,11 @@ function createMockTransaction(mockData: {
 }) {
   const { selectResults = [[], []], insertResult = [], onInsertValues } = mockData
   return async (callback: (tx: unknown) => Promise<unknown>) => {
-    const limit = vi.fn()
+    const where = vi.fn()
     for (const result of selectResults) {
-      limit.mockReturnValueOnce(result)
+      where.mockReturnValueOnce(result)
     }
-    limit.mockReturnValue([])
-
-    const orderBy = vi.fn().mockReturnValue({ limit })
-    const where = vi.fn().mockReturnValue({ orderBy })
+    where.mockReturnValue([])
 
     const tx = {
       select: vi.fn().mockReturnValue({
@@ -294,11 +296,15 @@ describe('Folders API Route', () => {
 
     it('should create folder with correct sort order', async () => {
       mockAuthenticatedUser()
+      let capturedValues: CapturedFolderValues | null = null
 
       mockTransaction.mockImplementationOnce(
         createMockTransaction({
           selectResults: [[{ minSortOrder: 5 }], [{ minSortOrder: 2 }]],
           insertResult: [{ ...mockFolders[0], sortOrder: 1 }],
+          onInsertValues: (values) => {
+            capturedValues = values
+          },
         })
       )
 
@@ -316,6 +322,8 @@ describe('Folders API Route', () => {
       expect(data.folder).toMatchObject({
         sortOrder: 1,
       })
+      expect(capturedValues).not.toBeNull()
+      expect(capturedValues!.sortOrder).toBe(1)
     })
 
     it('should create subfolder with parent reference', async () => {

apps/sim/app/api/folders/route.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { workflow, workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, asc, eq, isNull } from 'drizzle-orm'
+import { and, asc, eq, isNull, min } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
@@ -96,20 +96,16 @@ export async function POST(request: NextRequest) {
 
         const [[folderResult], [workflowResult]] = await Promise.all([
           tx
-            .select({ sortOrder: workflowFolder.sortOrder })
+            .select({ minSortOrder: min(workflowFolder.sortOrder) })
             .from(workflowFolder)
-            .where(and(eq(workflowFolder.workspaceId, workspaceId), folderParentCondition))
-            .orderBy(asc(workflowFolder.sortOrder))
-            .limit(1),
+            .where(and(eq(workflowFolder.workspaceId, workspaceId), folderParentCondition)),
           tx
-            .select({ sortOrder: workflow.sortOrder })
+            .select({ minSortOrder: min(workflow.sortOrder) })
             .from(workflow)
-            .where(and(eq(workflow.workspaceId, workspaceId), workflowParentCondition))
-            .orderBy(asc(workflow.sortOrder))
-            .limit(1),
+            .where(and(eq(workflow.workspaceId, workspaceId), workflowParentCondition)),
         ])
 
-        const minSortOrder = [folderResult?.sortOrder, workflowResult?.sortOrder].reduce<
+        const minSortOrder = [folderResult?.minSortOrder, workflowResult?.minSortOrder].reduce<
           number | null
         >((currentMin, candidate) => {
           if (candidate == null) return currentMin