banana/definma-api
Archived
2
Fork 0
Code Releases Activity

changed last-id behaviour to from-id

Browse Source
This commit is contained in:
VLE2FE
2020-06-25 11:59:36 +02:00
parent cd2962e186
commit 4dad680edf
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/sample.ts
View File

@ -43,18 +43,18 @@ router.get('/samples', (req, res, next) => {
query.limit(filters['page-size']);
}
if (filters['last-id']) {
if (filters['from-id']) {
if (filters['to-page'] && filters['to-page'] < 0) {
query.lte('_id', mongoose.Types.ObjectId(filters['last-id'])); // TODO: consider sorting
query.lt('_id', mongoose.Types.ObjectId(filters['from-id'])); // TODO: consider sorting
query.sort({_id: -1});
}
else {
query.gt('_id', mongoose.Types.ObjectId(filters['last-id'])); // TODO: consider sorting
query.gte('_id', mongoose.Types.ObjectId(filters['from-id'])); // TODO: consider sorting
}
}
if (filters['to-page']) {
query.skip(Math.abs(filters['to-page']) * filters['page-size']); // TODO: check order for negative numbers
query.skip(Math.abs(filters['to-page'] + Number(filters['to-page'] < 0)) * filters['page-size']); // TODO: check order for negative numbers
}
query.lean().exec((err, data) => {
@ -62,6 +62,7 @@ router.get('/samples', (req, res, next) => {
if (filters['to-page'] && filters['to-page'] < 0) {
data.reverse();
}
console.log(data);
res.json(_.compact(data.map(e => SampleValidate.output(e)))); // validate all and filter null values from validation errors
})
});