카테고리 이름 변경 및 삭제, 카테고리에서 파일 삭제 구현

src/lib/server/db/category.ts

@@ -136,9 +136,12 @@ export const setCategoryEncName = async (
 };
 
 export const unregisterCategory = async (userId: number, categoryId: number) => {
-  await db
+  const res = await db
     .deleteFrom("category")
     .where("id", "=", categoryId)
     .where("user_id", "=", userId)
-    .execute();
+    .executeTakeFirst();
+  if (res.numDeletedRows === 0n) {
+    throw new IntegrityError("Category not found");
+  }
 };

src/lib/server/schemas/category.ts

@@ -27,6 +27,18 @@ export const categoryFileListResponse = z.object({
 });
 export type CategoryFileListResponse = z.infer<typeof categoryFileListResponse>;
 
+export const categoryFileRemoveRequest = z.object({
+  file: z.number().int().positive(),
+});
+export type CategoryFileRemoveRequest = z.infer<typeof categoryFileRemoveRequest>;
+
+export const categoryRenameRequest = z.object({
+  dekVersion: z.string().datetime(),
+  name: z.string().base64().nonempty(),
+  nameIv: z.string().base64().nonempty(),
+});
+export type CategoryRenameRequest = z.infer<typeof categoryRenameRequest>;
+
 export const categoryCreateRequest = z.object({
   parent: categoryIdSchema,
   mekVersion: z.number().int().positive(),

src/lib/server/services/category.ts

@@ -3,11 +3,19 @@ import {
   registerCategory,
   getAllCategoriesByParent,
   getCategory,
+  setCategoryEncName,
+  unregisterCategory,
   type CategoryId,
   type NewCategory,
 } from "$lib/server/db/category";
 import { IntegrityError } from "$lib/server/db/error";
-import { getAllFilesByCategory, getFile, addFileToCategory } from "$lib/server/db/file";
+import {
+  getAllFilesByCategory,
+  getFile,
+  addFileToCategory,
+  removeFileFromCategory,
+} from "$lib/server/db/file";
+import type { Ciphertext } from "$lib/server/db/schema";
 
 export const getCategoryInformation = async (userId: number, categoryId: CategoryId) => {
   const category = categoryId !== "root" ? await getCategory(userId, categoryId) : undefined;
@@ -28,6 +36,17 @@ export const getCategoryInformation = async (userId: number, categoryId: Categor
   };
 };
 
+export const deleteCategory = async (userId: number, categoryId: number) => {
+  try {
+    await unregisterCategory(userId, categoryId);
+  } catch (e) {
+    if (e instanceof IntegrityError && e.message === "Category not found") {
+      error(404, "Invalid category id");
+    }
+    throw e;
+  }
+};
+
 export const addCategoryFile = async (userId: number, categoryId: number, fileId: number) => {
   const category = await getCategory(userId, categoryId);
   const file = await getFile(userId, fileId);
@@ -57,6 +76,45 @@ export const getCategoryFiles = async (userId: number, categoryId: number) => {
   return { files: files.map(({ id }) => id) };
 };
 
+export const removeCategoryFile = async (userId: number, categoryId: number, fileId: number) => {
+  const category = await getCategory(userId, categoryId);
+  const file = await getFile(userId, fileId);
+  if (!category) {
+    error(404, "Invalid category id");
+  } else if (!file) {
+    error(404, "Invalid file id");
+  }
+
+  try {
+    await removeFileFromCategory(fileId, categoryId);
+  } catch (e) {
+    if (e instanceof IntegrityError && e.message === "File not found in category") {
+      error(400, "File not added");
+    }
+    throw e;
+  }
+};
+
+export const renameCategory = async (
+  userId: number,
+  categoryId: number,
+  dekVersion: Date,
+  newEncName: Ciphertext,
+) => {
+  try {
+    await setCategoryEncName(userId, categoryId, dekVersion, newEncName);
+  } catch (e) {
+    if (e instanceof IntegrityError) {
+      if (e.message === "Category not found") {
+        error(404, "Invalid category id");
+      } else if (e.message === "Invalid DEK version") {
+        error(400, "Invalid DEK version");
+      }
+    }
+    throw e;
+  }
+};
+
 export const createCategory = async (params: NewCategory) => {
   const oneMinuteAgo = new Date(Date.now() - 60 * 1000);
   const oneMinuteLater = new Date(Date.now() + 60 * 1000);