Cleanup Data Access Pattern

Author: ThomasCode92

src/app/f/[folderId]/page.tsx

@@ -1,32 +1,13 @@
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 
-import { db } from "~/server/db";
 import {
-  files_table as fileSchema,
-  folders_table as folderSchema,
-} from "~/server/db/schema";
+  getAllFiles,
+  getAllFolders,
+  getAllParentsForFolder,
+} from "~/server/db/queries";
 
 import DriveContents from "../../drive-contents";
 
-async function getAllParents(folderId: number) {
-  const parents = [];
-  let currentId: number | null = folderId;
-  while (currentId != null) {
-    const folders = await db
-      .selectDistinct()
-      .from(folderSchema)
-      .where(eq(folderSchema.id, currentId));
-
-    if (!folders[0]) throw new Error("parent folder not found");
-
-    parents.unshift(folders[0]);
-    currentId = folders[0]?.parent; // parent can be null
-  }
-
-  return parents;
-}
-
 export default async function GoogleDriveClone(props: {
   params: Promise<{ folderId: number }>;
 }) {
@@ -38,21 +19,11 @@ export default async function GoogleDriveClone(props: {
   if (!success) return <div>Invalid Folder ID</div>;
 
   const folderId = data.folderId;
-  const parentsPromise = getAllParents(folderId);
-
-  const foldersPromise = db
-    .select()
-    .from(folderSchema)
-    .where(eq(folderSchema.parent, folderId));
-  const filesPromise = db
-    .select()
-    .from(fileSchema)
-    .where(eq(fileSchema.parent, folderId));
 
   const [folders, files, parents] = await Promise.all([
-    foldersPromise,
-    filesPromise,
-    parentsPromise,
+    getAllFolders(folderId),
+    getAllFiles(folderId),
+    getAllParentsForFolder(folderId),
   ]);
 
   return <DriveContents folders={folders} files={files} parents={parents} />;

src/server/db/queries.ts

@@ -0,0 +1,36 @@
+import { eq } from "drizzle-orm";
+
+import { db } from "~/server/db";
+import {
+  files_table as fileSchema,
+  folders_table as folderSchema,
+} from "~/server/db/schema";
+
+export async function getAllParentsForFolder(folderId: number) {
+  const parents = [];
+  let currentId: number | null = folderId;
+  while (currentId != null) {
+    const folders = await db
+      .selectDistinct()
+      .from(folderSchema)
+      .where(eq(folderSchema.id, currentId));
+
+    if (!folders[0]) throw new Error("parent folder not found");
+
+    parents.unshift(folders[0]);
+    currentId = folders[0]?.parent; // parent can be null
+  }
+
+  return parents;
+}
+
+export function getAllFolders(folderId: number) {
+  return db
+    .select()
+    .from(folderSchema)
+    .where(eq(folderSchema.parent, folderId));
+}
+
+export function getAllFiles(folderId: number) {
+  return db.select().from(fileSchema).where(eq(fileSchema.parent, folderId));
+}