なんかもうめっちゃ変えた

packages/backend/src/server/api/endpoints/drive/folders/update.ts

@@ -1,7 +1,10 @@
-import { publishDriveStream } from '@/services/stream.js';
-import define from '../../../define.js';
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DriveFoldersRepository } from '@/models/index.js';
+import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
-import { DriveFolders } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
@@ -48,71 +51,82 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
-	// Fetch folder
-	const folder = await DriveFolders.findOneBy({
-		id: ps.folderId,
-		userId: user.id,
-	});
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.driveFoldersRepository)
+		private driveFoldersRepository: DriveFoldersRepository,
 
-	if (folder == null) {
-		throw new ApiError(meta.errors.noSuchFolder);
-	}
-
-	if (ps.name) folder.name = ps.name;
-
-	if (ps.parentId !== undefined) {
-		if (ps.parentId === folder.id) {
-			throw new ApiError(meta.errors.recursiveNesting);
-		} else if (ps.parentId === null) {
-			folder.parentId = null;
-		} else {
-			// Get parent folder
-			const parent = await DriveFolders.findOneBy({
-				id: ps.parentId,
-				userId: user.id,
+		private driveFolderEntityService: DriveFolderEntityService,
+		private globalEventService: GlobalEventService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Fetch folder
+			const folder = await this.driveFoldersRepository.findOneBy({
+				id: ps.folderId,
+				userId: me.id,
 			});
 
-			if (parent == null) {
-				throw new ApiError(meta.errors.noSuchParentFolder);
+			if (folder == null) {
+				throw new ApiError(meta.errors.noSuchFolder);
 			}
 
-			// Check if the circular reference will occur
-			async function checkCircle(folderId: string): Promise<boolean> {
-				// Fetch folder
-				const folder2 = await DriveFolders.findOneBy({
-					id: folderId,
-				});
+			if (ps.name) folder.name = ps.name;
 
-				if (folder2!.id === folder!.id) {
-					return true;
-				} else if (folder2!.parentId) {
-					return await checkCircle(folder2!.parentId);
-				} else {
-					return false;
-				}
-			}
-
-			if (parent.parentId !== null) {
-				if (await checkCircle(parent.parentId)) {
+			if (ps.parentId !== undefined) {
+				if (ps.parentId === folder.id) {
 					throw new ApiError(meta.errors.recursiveNesting);
+				} else if (ps.parentId === null) {
+					folder.parentId = null;
+				} else {
+					// Get parent folder
+					const parent = await this.driveFoldersRepository.findOneBy({
+						id: ps.parentId,
+						userId: me.id,
+					});
+
+					if (parent == null) {
+						throw new ApiError(meta.errors.noSuchParentFolder);
+					}
+
+					// Check if the circular reference will occur
+					const checkCircle = async (folderId: string): Promise<boolean> => {
+						// Fetch folder
+						const folder2 = await this.driveFoldersRepository.findOneBy({
+							id: folderId,
+						});
+
+						if (folder2!.id === folder!.id) {
+							return true;
+						} else if (folder2!.parentId) {
+							return await checkCircle(folder2!.parentId);
+						} else {
+							return false;
+						}
+					};
+
+					if (parent.parentId !== null) {
+						if (await checkCircle(parent.parentId)) {
+							throw new ApiError(meta.errors.recursiveNesting);
+						}
+					}
+
+					folder.parentId = parent.id;
 				}
 			}
 
-			folder.parentId = parent.id;
-		}
+			// Update
+			this.driveFoldersRepository.update(folder.id, {
+				name: folder.name,
+				parentId: folder.parentId,
+			});
+
+			const folderObj = await this.driveFolderEntityService.pack(folder);
+
+			// Publish folderUpdated event
+			this.globalEventService.publishDriveStream(me.id, 'folderUpdated', folderObj);
+
+			return folderObj;
+		});
 	}
-
-	// Update
-	DriveFolders.update(folder.id, {
-		name: folder.name,
-		parentId: folder.parentId,
-	});
-
-	const folderObj = await DriveFolders.pack(folder);
-
-	// Publish folderUpdated event
-	publishDriveStream(user.id, 'folderUpdated', folderObj);
-
-	return folderObj;
-});
+}