summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-17 02:11:22 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-17 02:11:22 +0900
commite265b538cc96b10b2ffc98c15227ab097cf4744b (patch)
tree2d9738ca5c8ad3c600bd2e842c33c10c142d997c /src/services
parentMetaのアクセスでトランザクションを張るように (#4720) (diff)
downloadsharkey-e265b538cc96b10b2ffc98c15227ab097cf4744b.tar.gz
sharkey-e265b538cc96b10b2ffc98c15227ab097cf4744b.tar.bz2
sharkey-e265b538cc96b10b2ffc98c15227ab097cf4744b.zip
Fix #4724
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/delete-file.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts
index bba453b982..1aba0d5fd8 100644
--- a/src/services/drive/delete-file.ts
+++ b/src/services/drive/delete-file.ts
@@ -2,7 +2,7 @@ import * as Minio from 'minio';
import config from '../../config';
import { DriveFile } from '../../models/entities/drive-file';
import { InternalStorage } from './internal-storage';
-import { DriveFiles, Instances } from '../../models';
+import { DriveFiles, Instances, Notes } from '../../models';
import { driveChart, perUserDriveChart, instanceChart } from '../chart';
export default async function(file: DriveFile, isExpired = false) {
@@ -40,6 +40,11 @@ export default async function(file: DriveFile, isExpired = false) {
});
} else {
DriveFiles.delete(file.id);
+
+ // TODO: トランザクション
+ Notes.createQueryBuilder('note').delete()
+ .andWhere(':id = ANY(note.fileIds)', { id: file.id })
+ .execute();
}
// 統計を更新