refactor: migrate to typeorm 3.0 (#8443)

* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
This commit is contained in:
syuilo
2022-03-26 15:34:00 +09:00
committed by GitHub
parent 41c87074e6
commit 1c67c26bd8
325 changed files with 1314 additions and 1494 deletions

View File

@@ -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,
});

View File

@@ -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,
});

View File

@@ -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);

View File

@@ -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,
});

View File

@@ -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 })));

View File

@@ -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: [{

View File

@@ -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,
});