summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/drive
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/endpoints/drive
parent.js (diff)
downloadsharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/api/endpoints/drive')
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/check-existence.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/delete.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/find.ts5
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/show.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files/update.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/drive/folders/create.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/drive/folders/delete.ts6
-rw-r--r--packages/backend/src/server/api/endpoints/drive/folders/find.ts5
-rw-r--r--packages/backend/src/server/api/endpoints/drive/folders/show.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/drive/folders/update.ts8
12 files changed, 23 insertions, 21 deletions
diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
index 3c68beee17..7ffe89a1e5 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
@@ -39,7 +39,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch file
- const file = await DriveFiles.findOne({
+ const file = await DriveFiles.findOneBy({
id: ps.fileId,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
index 7e5cb2498e..80293df5d9 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
@@ -24,7 +24,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const file = await DriveFiles.findOne({
+ const file = await DriveFiles.findOneBy({
md5: ps.md5,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
index eac8eabfc0..61c56e6314 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
@@ -36,7 +36,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const file = await DriveFiles.findOne(ps.fileId);
+ const file = await DriveFiles.findOneBy({ id: ps.fileId });
if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
diff --git a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts
index e45ec633d3..f9b4ea89ea 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts
@@ -29,7 +29,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const files = await DriveFiles.find({
+ const files = await DriveFiles.findBy({
md5: ps.md5,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts
index 974fc9fbad..4938a69d11 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts
@@ -1,5 +1,6 @@
import define from '../../../define.js';
import { DriveFiles } from '@/models/index.js';
+import { IsNull } from 'typeorm';
export const meta = {
requireCredential: true,
@@ -30,10 +31,10 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const files = await DriveFiles.find({
+ const files = await DriveFiles.findBy({
name: ps.name,
userId: user.id,
- folderId: ps.folderId,
+ folderId: ps.folderId ?? IsNull(),
});
return await Promise.all(files.map(file => DriveFiles.pack(file, { self: true })));
diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts
index 16b313cabf..c8e9d3dd93 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/show.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts
@@ -51,7 +51,7 @@ export default define(meta, paramDef, async (ps, user) => {
let file: DriveFile | undefined;
if (ps.fileId) {
- file = await DriveFiles.findOne(ps.fileId);
+ file = await DriveFiles.findOneBy({ id: ps.fileId });
} else if (ps.url) {
file = await DriveFiles.findOne({
where: [{
diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts
index 30d7847b5b..4b3f5f2dc9 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -58,7 +58,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const file = await DriveFiles.findOne(ps.fileId);
+ const file = await DriveFiles.findOneBy({ id: ps.fileId });
if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
@@ -81,7 +81,7 @@ export default define(meta, paramDef, async (ps, user) => {
if (ps.folderId === null) {
file.folderId = null;
} else {
- const folder = await DriveFolders.findOne({
+ const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
index 4ae10f0621..3d7f514c85 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
@@ -41,7 +41,7 @@ export default define(meta, paramDef, async (ps, user) => {
let parent = null;
if (ps.parentId) {
// Fetch parent folder
- parent = await DriveFolders.findOne({
+ parent = await DriveFolders.findOneBy({
id: ps.parentId,
userId: user.id,
});
@@ -58,7 +58,7 @@ export default define(meta, paramDef, async (ps, user) => {
name: ps.name,
parentId: parent !== null ? parent.id : null,
userId: user.id,
- }).then(x => DriveFolders.findOneOrFail(x.identifiers[0]));
+ }).then(x => DriveFolders.findOneByOrFail(x.identifiers[0]));
const folderObj = await DriveFolders.pack(folder);
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
index 4994615cc6..ab9d411ec0 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
@@ -36,7 +36,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Get folder
- const folder = await DriveFolders.findOne({
+ const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
@@ -46,8 +46,8 @@ export default define(meta, paramDef, async (ps, user) => {
}
const [childFoldersCount, childFilesCount] = await Promise.all([
- DriveFolders.count({ parentId: folder.id }),
- DriveFiles.count({ folderId: folder.id }),
+ DriveFolders.countBy({ parentId: folder.id }),
+ DriveFiles.countBy({ folderId: folder.id }),
]);
if (childFoldersCount !== 0 || childFilesCount !== 0) {
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
index 9bf0e3d61b..1feab273a1 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
@@ -1,5 +1,6 @@
import define from '../../../define.js';
import { DriveFolders } from '@/models/index.js';
+import { IsNull } from 'typeorm';
export const meta = {
tags: ['drive'],
@@ -30,10 +31,10 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const folders = await DriveFolders.find({
+ const folders = await DriveFolders.findBy({
name: ps.name,
userId: user.id,
- parentId: ps.parentId,
+ parentId: ps.parentId ?? IsNull(),
});
return await Promise.all(folders.map(folder => DriveFolders.pack(folder)));
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts
index f09816d57a..1e7aa2b16c 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts
@@ -35,7 +35,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Get folder
- const folder = await DriveFolders.findOne({
+ const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
index c020b243ef..1aa2e84292 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
@@ -50,7 +50,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch folder
- const folder = await DriveFolders.findOne({
+ const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
@@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, user) => {
folder.parentId = null;
} else {
// Get parent folder
- const parent = await DriveFolders.findOne({
+ const parent = await DriveFolders.findOneBy({
id: ps.parentId,
userId: user.id,
});
@@ -78,9 +78,9 @@ export default define(meta, paramDef, async (ps, user) => {
}
// Check if the circular reference will occur
- async function checkCircle(folderId: any): Promise<boolean> {
+ async function checkCircle(folderId: string): Promise<boolean> {
// Fetch folder
- const folder2 = await DriveFolders.findOne({
+ const folder2 = await DriveFolders.findOneBy({
id: folderId,
});