From 0d3cb0c0180d672869175a9255b2c1b582febe13 Mon Sep 17 00:00:00 2001
From: Piyush Gupta <piyushguptaa2z123@gmail.com>
Date: Mon, 3 Nov 2025 23:46:08 +0530
Subject: [PATCH] refactor: enhance folder retrieval with dynamic sorting
 options

---
 .../secret-folder/secret-folder-dal.ts        | 37 +++++++++++++------
 .../secret-folder/secret-folder-service.ts    | 29 ++++++++-------
 .../secret-folder/secret-folder-types.ts      |  2 +
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/backend/src/services/secret-folder/secret-folder-dal.ts b/backend/src/services/secret-folder/secret-folder-dal.ts
index c999b69d2..356de3099 100644
--- a/backend/src/services/secret-folder/secret-folder-dal.ts
+++ b/backend/src/services/secret-folder/secret-folder-dal.ts
@@ -426,11 +426,13 @@ export const secretFolderDALFactory = (db: TDbClient) => {
           ),
           db.ref("slug").withSchema(TableName.Environment).as("environment")
         )
-        .orderByRaw(
-          `CASE WHEN ${TableName.SecretFolder}.${orderBy} LIKE '\\_%' THEN ${orderDirection === OrderByDirection.ASC ? "0" : "1"} ELSE ${orderDirection === OrderByDirection.ASC ? "1" : "0"} END`
-        )
-        .orderByRaw(`LOWER(${TableName.SecretFolder}.${orderBy}) ${orderDirection}`)
-        .orderByRaw(`${TableName.SecretFolder}.${orderBy} ${orderDirection}`);
+        .orderByRaw(`CASE WHEN ${TableName.SecretFolder}.?? LIKE '\\_%' THEN ? ELSE ? END`, [
+          orderBy,
+          orderDirection === OrderByDirection.ASC ? 0 : 1,
+          orderDirection === OrderByDirection.ASC ? 1 : 0
+        ])
+        .orderByRaw(`LOWER(${TableName.SecretFolder}.??) ${orderDirection}`, [orderBy])
+        .orderByRaw(`${TableName.SecretFolder}.?? ${orderDirection}`, [orderBy]);
 
       if (limit) {
         const rankOffset = offset + 1; // ranks start from 1
@@ -440,11 +442,13 @@ export const secretFolderDALFactory = (db: TDbClient) => {
           .from<Awaited<typeof query>[number]>("w")
           .where("w.rank", ">=", rankOffset)
           .andWhere("w.rank", "<", rankOffset + limit)
-          .orderByRaw(
-            `CASE WHEN "w"."${orderBy}" LIKE '\\_%' THEN ${orderDirection === OrderByDirection.ASC ? "0" : "1"} ELSE ${orderDirection === OrderByDirection.ASC ? "1" : "0"} END`
-          )
-          .orderByRaw(`LOWER("w"."${orderBy}") ${orderDirection}`)
-          .orderByRaw(`"w"."${orderBy}" ${orderDirection}`);
+          .orderByRaw(`CASE WHEN "w".?? LIKE '\\_%' THEN ? ELSE ? END`, [
+            orderBy,
+            orderDirection === OrderByDirection.ASC ? 0 : 1,
+            orderDirection === OrderByDirection.ASC ? 1 : 0
+          ])
+          .orderByRaw(`LOWER("w".??) ${orderDirection}`, [orderBy])
+          .orderByRaw(`"w".?? ${orderDirection}`, [orderBy]);
       }
 
       const folders = await query;
@@ -455,7 +459,10 @@ export const secretFolderDALFactory = (db: TDbClient) => {
     }
   };
 
-  const findByEnvsDeep = async ({ parentIds }: TFindFoldersDeepByParentIdsDTO, tx?: Knex) => {
+  const findByEnvsDeep = async (
+    { parentIds, orderBy = SecretsOrderBy.Name, orderDirection = OrderByDirection.ASC }: TFindFoldersDeepByParentIdsDTO,
+    tx?: Knex
+  ) => {
     try {
       const folders = await (tx || db.replicaNode())
         .withRecursive("parents", (qb) =>
@@ -490,7 +497,13 @@ export const secretFolderDALFactory = (db: TDbClient) => {
         .select<(TSecretFolders & { path: string; depth: number; environment: string })[]>("*")
         .from("parents")
         .orderBy("depth")
-        .orderBy(`name`);
+        .orderByRaw(`CASE WHEN "parents".?? LIKE '\\_%' THEN ? ELSE ? END`, [
+          orderBy,
+          orderDirection === OrderByDirection.ASC ? 0 : 1,
+          orderDirection === OrderByDirection.ASC ? 1 : 0
+        ])
+        .orderByRaw(`LOWER("parents".??) ${orderDirection}`, [orderBy])
+        .orderByRaw(`"parents".?? ${orderDirection}`, [orderBy]);
 
       return folders;
     } catch (error) {
diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.ts
index c216ea3a8..033efdb14 100644
--- a/backend/src/services/secret-folder/secret-folder-service.ts
+++ b/backend/src/services/secret-folder/secret-folder-service.ts
@@ -14,6 +14,7 @@ import { PgSqlLock } from "@app/keystore/keystore";
 import { BadRequestError, NotFoundError } from "@app/lib/errors";
 import { OrderByDirection, OrgServiceActor } from "@app/lib/types";
 import { ActorType } from "@app/services/auth/auth-type";
+import { SecretsOrderBy } from "@app/services/secret/secret-types";
 import { buildFolderPath } from "@app/services/secret-folder/secret-folder-fns";
 
 import {
@@ -781,7 +782,11 @@ export const secretFolderServiceFactory = ({
     if (!parentFolder) return [];
 
     if (recursive) {
-      const recursiveFolders = await folderDAL.findByEnvsDeep({ parentIds: [parentFolder.id] });
+      const recursiveFolders = await folderDAL.findByEnvsDeep({
+        parentIds: [parentFolder.id],
+        orderBy: orderBy || SecretsOrderBy.Name,
+        orderDirection: orderDirection || OrderByDirection.ASC
+      });
       // remove the parent folder
       return recursiveFolders
         .filter((folder) => {
@@ -800,19 +805,15 @@ export const secretFolderServiceFactory = ({
         }));
     }
 
-    const folders = await folderDAL.find(
-      {
-        envId: env.id,
-        parentId: parentFolder.id,
-        isReserved: false,
-        $search: search ? { name: `%${search}%` } : undefined
-      },
-      {
-        sort: orderBy ? [[orderBy, orderDirection ?? OrderByDirection.ASC]] : undefined,
-        limit,
-        offset
-      }
-    );
+    const folders = await folderDAL.findByMultiEnv({
+      environmentIds: [env.id],
+      parentIds: [parentFolder.id],
+      search,
+      orderBy: orderBy || SecretsOrderBy.Name,
+      orderDirection: orderDirection || OrderByDirection.ASC,
+      limit,
+      offset
+    });
     if (lastSecretModified) {
       return folders.filter((el) =>
         el.lastSecretModified ? el.lastSecretModified >= new Date(lastSecretModified) : false
diff --git a/backend/src/services/secret-folder/secret-folder-types.ts b/backend/src/services/secret-folder/secret-folder-types.ts
index da8be52a0..d220c29d2 100644
--- a/backend/src/services/secret-folder/secret-folder-types.ts
+++ b/backend/src/services/secret-folder/secret-folder-types.ts
@@ -64,6 +64,8 @@ export type TGetFoldersDeepByEnvsDTO = {
 
 export type TFindFoldersDeepByParentIdsDTO = {
   parentIds: string[];
+  orderBy?: SecretsOrderBy;
+  orderDirection?: OrderByDirection;
 };
 
 export type TCreateManyFoldersDTO = {