From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 29 Mar 2018 14:48:47 +0900 Subject: Resolve conflicts --- src/server/api/endpoints/drive.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/api/endpoints/drive.ts') diff --git a/src/server/api/endpoints/drive.ts b/src/server/api/endpoints/drive.ts index d92473633a..eb21853916 100644 --- a/src/server/api/endpoints/drive.ts +++ b/src/server/api/endpoints/drive.ts @@ -14,7 +14,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => { // Calculate drive usage const usage = ((await DriveFile .aggregate([ - { $match: { 'metadata.user_id': user._id } }, + { $match: { 'metadata.userId': user._id } }, { $project: { length: true @@ -31,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => { }).usage; res({ - capacity: user.drive_capacity, + capacity: user.driveCapacity, usage: usage }); }); -- cgit v1.2.3-freya