Resolve conflicts

src/server/api/endpoints/drive/folders/find.ts

@@ -16,16 +16,16 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const [name, nameErr] = $(params.name).string().$;
 	if (nameErr) return rej('invalid name param');
 
-	// Get 'parent_id' parameter
-	const [parentId = null, parentIdErr] = $(params.parent_id).optional.nullable.id().$;
-	if (parentIdErr) return rej('invalid parent_id param');
+	// Get 'parentId' parameter
+	const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.id().$;
+	if (parentIdErr) return rej('invalid parentId param');
 
 	// Issue query
 	const folders = await DriveFolder
 		.find({
 			name: name,
-			user_id: user._id,
-			parent_id: parentId
+			userId: user._id,
+			parentId: parentId
 		});
 
 	// Serialize