notifications: fix pagination of listByUserIdPaged
we have to filter in sql query, otherwise we don't get consistent per page count
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
'use strict';
|
||||
|
||||
exports = module.exports = {
|
||||
verifyOwnership: verifyOwnership,
|
||||
get: get,
|
||||
list: list,
|
||||
ack: ack
|
||||
verifyOwnership,
|
||||
get,
|
||||
list,
|
||||
ack
|
||||
};
|
||||
|
||||
let assert = require('assert'),
|
||||
@@ -34,17 +34,17 @@ function get(req, res, next) {
|
||||
}
|
||||
|
||||
function list(req, res, next) {
|
||||
var page = typeof req.query.page !== 'undefined' ? parseInt(req.query.page) : 1;
|
||||
const page = typeof req.query.page !== 'undefined' ? parseInt(req.query.page) : 1;
|
||||
if (!page || page < 0) return next(new HttpError(400, 'page query param has to be a postive number'));
|
||||
|
||||
var perPage = typeof req.query.per_page !== 'undefined'? parseInt(req.query.per_page) : 25;
|
||||
const perPage = typeof req.query.per_page !== 'undefined'? parseInt(req.query.per_page) : 25;
|
||||
if (!perPage || perPage < 0) return next(new HttpError(400, 'per_page query param has to be a postive number'));
|
||||
|
||||
var acknowledged = null;
|
||||
if (req.query.acknowledged && !(req.query.acknowledged === 'true' || req.query.acknowledged === 'false')) return next(new HttpError(400, 'acknowledged must be a true or false'));
|
||||
else if (req.query.acknowledged) acknowledged = req.query.acknowledged === 'true' ? true : false;
|
||||
|
||||
notifications.getAllPaged(req.user.id, acknowledged, page, perPage, function (error, result) {
|
||||
const acknowledged = req.query.acknowledged ? req.query.acknowledged === 'true' : null;
|
||||
|
||||
notifications.listByUserIdPaged(req.user.id, { acknowledged }, page, perPage, function (error, result) {
|
||||
if (error) return next(BoxError.toHttpError(error));
|
||||
|
||||
next(new HttpSuccess(200, { notifications: result }));
|
||||
|
||||
Reference in New Issue
Block a user