FileRepo의 함수 중 디렉터리 관련된 함수들을 DirectoryRepo로 분리

src/trpc/routers/directory.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { DirectoryIdSchema } from "$lib/schemas";
-import { FileRepo, IntegrityError } from "$lib/server/db";
+import { DirectoryRepo, FileRepo, IntegrityError } from "$lib/server/db";
 import { safeUnlink } from "$lib/server/modules/filesystem";
 import { router, roleProcedure } from "../init.server";
 
@@ -14,13 +14,15 @@ const directoryRouter = router({
     )
     .query(async ({ ctx, input }) => {
       const directory =
-        input.id !== "root" ? await FileRepo.getDirectory(ctx.session.userId, input.id) : undefined;
+        input.id !== "root"
+          ? await DirectoryRepo.getDirectory(ctx.session.userId, input.id)
+          : undefined;
       if (directory === null) {
         throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
       }
 
       const [directories, files] = await Promise.all([
-        FileRepo.getAllDirectoriesByParent(ctx.session.userId, input.id),
+        DirectoryRepo.getAllDirectoriesByParent(ctx.session.userId, input.id),
         FileRepo.getAllFilesByParent(ctx.session.userId, input.id),
       ]);
       return {
@@ -78,7 +80,7 @@ const directoryRouter = router({
       }
 
       try {
-        await FileRepo.registerDirectory({
+        await DirectoryRepo.registerDirectory({
           parentId: input.parent,
           userId: ctx.session.userId,
           mekVersion: input.mekVersion,
@@ -105,7 +107,7 @@ const directoryRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       try {
-        await FileRepo.setDirectoryEncName(ctx.session.userId, input.id, input.dekVersion, {
+        await DirectoryRepo.setDirectoryEncName(ctx.session.userId, input.id, input.dekVersion, {
           ciphertext: input.name,
           iv: input.nameIv,
         });
@@ -129,7 +131,7 @@ const directoryRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       try {
-        const files = await FileRepo.unregisterDirectory(ctx.session.userId, input.id);
+        const files = await DirectoryRepo.unregisterDirectory(ctx.session.userId, input.id);
         return {
           deletedFiles: files.map((file) => {
             safeUnlink(file.path); // Intended

src/trpc/routers/favorites.ts

@@ -1,15 +1,24 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { FileRepo, IntegrityError } from "$lib/server/db";
+import { DirectoryRepo, FileRepo, IntegrityError } from "$lib/server/db";
 import { router, roleProcedure } from "../init.server";
 
 const favoritesRouter = router({
   get: roleProcedure["activeClient"].query(async ({ ctx }) => {
-    const [files, directories] = await Promise.all([
+    const [directories, files] = await Promise.all([
+      DirectoryRepo.getAllFavoriteDirectories(ctx.session.userId),
       FileRepo.getAllFavoriteFiles(ctx.session.userId),
-      FileRepo.getAllFavoriteDirectories(ctx.session.userId),
     ]);
     return {
+      directories: directories.map((directory) => ({
+        id: directory.id,
+        parent: directory.parentId,
+        mekVersion: directory.mekVersion,
+        dek: directory.encDek,
+        dekVersion: directory.dekVersion,
+        name: directory.encName.ciphertext,
+        nameIv: directory.encName.iv,
+      })),
       files: files.map((file) => ({
         id: file.id,
         parent: file.parentId,
@@ -24,18 +33,51 @@ const favoritesRouter = router({
         lastModifiedAt: file.encLastModifiedAt.ciphertext,
         lastModifiedAtIv: file.encLastModifiedAt.iv,
       })),
-      directories: directories.map((directory) => ({
-        id: directory.id,
-        parent: directory.parentId,
-        mekVersion: directory.mekVersion,
-        dek: directory.encDek,
-        dekVersion: directory.dekVersion,
-        name: directory.encName.ciphertext,
-        nameIv: directory.encName.iv,
-      })),
     };
   }),
 
+  addDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await DirectoryRepo.setDirectoryFavorite(ctx.session.userId, input.id, true);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory already favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
+  removeDirectory: roleProcedure["activeClient"]
+    .input(
+      z.object({
+        id: z.int().positive(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      try {
+        await DirectoryRepo.setDirectoryFavorite(ctx.session.userId, input.id, false);
+      } catch (e) {
+        if (e instanceof IntegrityError) {
+          if (e.message === "Directory not found") {
+            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
+          } else if (e.message === "Directory not favorited") {
+            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
+          }
+        }
+        throw e;
+      }
+    }),
+
   addFile: roleProcedure["activeClient"]
     .input(
       z.object({
@@ -77,48 +119,6 @@ const favoritesRouter = router({
         throw e;
       }
     }),
-
-  addDirectory: roleProcedure["activeClient"]
-    .input(
-      z.object({
-        id: z.int().positive(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      try {
-        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, true);
-      } catch (e) {
-        if (e instanceof IntegrityError) {
-          if (e.message === "Directory not found") {
-            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
-          } else if (e.message === "Directory already favorited") {
-            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
-          }
-        }
-        throw e;
-      }
-    }),
-
-  removeDirectory: roleProcedure["activeClient"]
-    .input(
-      z.object({
-        id: z.int().positive(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      try {
-        await FileRepo.setDirectoryFavorite(ctx.session.userId, input.id, false);
-      } catch (e) {
-        if (e instanceof IntegrityError) {
-          if (e.message === "Directory not found") {
-            throw new TRPCError({ code: "NOT_FOUND", message: "Invalid directory id" });
-          } else if (e.message === "Directory not favorited") {
-            throw new TRPCError({ code: "BAD_REQUEST", message: e.message });
-          }
-        }
-        throw e;
-      }
-    }),
 });
 
 export default favoritesRouter;

src/trpc/routers/search.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { DirectoryIdSchema } from "$lib/schemas";
-import { FileRepo } from "$lib/server/db";
+import { DirectoryRepo, FileRepo } from "$lib/server/db";
 import { router, roleProcedure } from "../init.server";
 
 const searchRouter = router({
@@ -15,7 +15,7 @@ const searchRouter = router({
     .query(async ({ ctx, input }) => {
       const [directories, files] = await Promise.all([
         input.includeCategories.length === 0 && input.excludeCategories.length === 0
-          ? FileRepo.getAllRecursiveDirectoriesByParent(ctx.session.userId, input.ancestor)
+          ? DirectoryRepo.getAllRecursiveDirectoriesByParent(ctx.session.userId, input.ancestor)
           : [],
         FileRepo.searchFiles(ctx.session.userId, {
           parentId: input.ancestor,