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

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server/api/models/drive-file.ts
View file

@ -4,14 +4,14 @@ import { pack as packFolder } from './drive-folder';
import config from '../../../conf';
import monkDb, { nativeDbConn } from '../../../db/mongodb';
const DriveFile = monkDb.get<IDriveFile>('drive_files.files');
const DriveFile = monkDb.get<IDriveFile>('driveFiles.files');
export default DriveFile;
const getGridFSBucket = async (): Promise<mongodb.GridFSBucket> => {
const db = await nativeDbConn();
const bucket = new mongodb.GridFSBucket(db, {
bucketName: 'drive_files'
bucketName: 'driveFiles'
});
return bucket;
};
@ -26,8 +26,8 @@ export type IDriveFile = {
contentType: string;
metadata: {
properties: any;
user_id: mongodb.ObjectID;
folder_id: mongodb.ObjectID;
userId: mongodb.ObjectID;
folderId: mongodb.ObjectID;
}
};
@ -79,7 +79,7 @@ export const pack = (
let _target: any = {};
_target.id = _file._id;
_target.created_at = _file.uploadDate;
_target.createdAt = _file.uploadDate;
_target.name = _file.filename;
_target.type = _file.contentType;
_target.datasize = _file.length;
@ -92,9 +92,9 @@ export const pack = (
if (_target.properties == null) _target.properties = {};
if (opts.detail) {
if (_target.folder_id) {
if (_target.folderId) {
// Populate folder
_target.folder = await packFolder(_target.folder_id, {
_target.folder = await packFolder(_target.folderId, {
detail: true
});
}