hmm
This commit is contained in:
parent
285123160c
commit
6f0f809fc5
|
@ -12,14 +12,13 @@ class filesGET extends Route {
|
|||
if (!id) return res.status(400).json({ message: 'Invalid file ID supplied' });
|
||||
|
||||
let file = await db.table('files').where({ id }).first();
|
||||
const user = await db.table('users')
|
||||
.select('id', 'username', 'enabled', 'createdAt', 'editedAt', 'apiKeyEditedAt', 'isAdmin')
|
||||
.where({ id: file.userId })
|
||||
.first();
|
||||
file = Util.constructFilePublicLink(req, file);
|
||||
|
||||
// Additional relevant data
|
||||
if (file.userId) {
|
||||
const user = await db.table('users')
|
||||
.select('id', 'username', 'enabled', 'createdAt', 'editedAt', 'apiKeyEditedAt', 'isAdmin')
|
||||
.where({ id: file.userId })
|
||||
.first();
|
||||
const filesFromUser = await db.table('files').where({ userId: user.id }).select('id');
|
||||
user.fileCount = filesFromUser.length;
|
||||
|
||||
|
@ -27,14 +26,12 @@ class filesGET extends Route {
|
|||
message: 'Successfully retrieved file',
|
||||
file,
|
||||
user
|
||||
});
|
||||
}
|
||||
else {
|
||||
return res.json({
|
||||
message: 'Successfully retrieved file',
|
||||
file
|
||||
});
|
||||
})
|
||||
}
|
||||
else return res.json({
|
||||
message: 'Successfully retrieved file',
|
||||
file
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue