replace with recursive CTE

opengovsg · Dec 25, 2024 · 39d4cd6 · 39d4cd6
1 parent 93f0f75
commit 39d4cd6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/apps/studio/src/server/modules/resource/resource.router.ts b/apps/studio/src/server/modules/resource/resource.router.ts
@@ -36,7 +36,6 @@ import {
 import { validateUserPermissionsForSite } from "../site/site.service"
 import {
   getBatchAncestryWithSelfQuery,
-  getNestedFolderChildren,
   getSearchRecentlyEdited,
   getSearchResults,
   getSearchWithResourceIds,
@@ -250,10 +249,34 @@ export const resourceRouter = router({
       }
 
       return {
-        items: await getNestedFolderChildren({
-          siteId: Number(siteId),
-          resourceId: Number(resourceId),
-        }),
+        items: await db
+          .withRecursive("NestedResources", (eb) =>
+            eb
+              .selectFrom("Resource")
+              .select(["title", "permalink", "type", "id", "parentId"])
+              .where("Resource.type", "in", [ResourceType.Folder])
+              .where("Resource.siteId", "=", Number(siteId))
+              .where("Resource.parentId", "=", String(resourceId))
+              .unionAll((eb) =>
+                eb
+                  .selectFrom("Resource")
+                  .innerJoin(
+                    "NestedResources",
+                    "Resource.parentId",
+                    "NestedResources.id",
+                  )
+                  .select([
+                    "Resource.title",
+                    "Resource.permalink",
+                    "Resource.type",
+                    "Resource.id",
+                    "Resource.parentId",
+                  ]),
+              ),
+          )
+          .selectFrom("NestedResources")
+          .select(["title", "permalink", "type", "id", "parentId"])
+          .execute(),
       }
     }),
 

diff --git a/apps/studio/src/server/modules/resource/resource.service.ts b/apps/studio/src/server/modules/resource/resource.service.ts
@@ -691,34 +691,6 @@ export const getSearchRecentlyEdited = async ({
   })
 }
 
-export const getNestedFolderChildren = async ({
-  siteId,
-  resourceId,
-}: {
-  siteId: number
-  resourceId: number
-}): Promise<ResourceItemContent[]> => {
-  return (async function getNestedChildren(
-    parentId: number,
-  ): Promise<ResourceItemContent[]> {
-    const children = await db
-      .selectFrom("Resource")
-      .select(["title", "permalink", "type", "id", "parentId"])
-      .where("Resource.type", "in", [ResourceType.Folder])
-      .where("Resource.siteId", "=", Number(siteId))
-      .where("Resource.parentId", "=", String(parentId))
-      .execute()
-
-    const nestedChildren = await Promise.all(
-      children.map(async (child) => {
-        const childrenOfChild = await getNestedChildren(Number(child.id))
-        return [child, ...childrenOfChild]
-      }),
-    )
-    return nestedChildren.flat()
-  })(resourceId)
-}
-
 export const getSearchWithResourceIds = async ({
   siteId,
   resourceIds,