Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: migrate to typeorm 3.0 (#8443)

Browse source 
* 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
325 changed files with 1314 additions and 1494 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/server/api/endpoints/drive/folders/create.ts
View file

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

6
packages/backend/src/server/api/endpoints/drive/folders/delete.ts
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) => {
// 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) {

5
packages/backend/src/server/api/endpoints/drive/folders/find.ts
View file

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

2
packages/backend/src/server/api/endpoints/drive/folders/show.ts
View file

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

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

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