eventlog: async'ify
This commit is contained in:
@@ -5,36 +5,36 @@ exports = module.exports = {
|
||||
list
|
||||
};
|
||||
|
||||
var BoxError = require('../boxerror.js'),
|
||||
const BoxError = require('../boxerror.js'),
|
||||
eventlog = require('../eventlog.js'),
|
||||
HttpError = require('connect-lastmile').HttpError,
|
||||
HttpSuccess = require('connect-lastmile').HttpSuccess;
|
||||
HttpSuccess = require('connect-lastmile').HttpSuccess,
|
||||
safe = require('safetydance');
|
||||
|
||||
function get(req, res, next) {
|
||||
eventlog.get(req.params.eventId, function (error, result) {
|
||||
if (error) return next(BoxError.toHttpError(error));
|
||||
async function get(req, res, next) {
|
||||
const [error, event] = await safe(eventlog.get(req.params.eventId));
|
||||
if (error) return next(BoxError.toHttpError(error));
|
||||
if (!event) return next(new HttpError(404, 'Eventlog not found'));
|
||||
|
||||
next(new HttpSuccess(200, { event: result }));
|
||||
});
|
||||
next(new HttpSuccess(200, { event }));
|
||||
}
|
||||
|
||||
function list(req, res, next) {
|
||||
var page = typeof req.query.page !== 'undefined' ? parseInt(req.query.page) : 1;
|
||||
async function list(req, res, next) {
|
||||
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'));
|
||||
|
||||
if (req.query.actions && typeof req.query.actions !== 'string') return next(new HttpError(400, 'actions must be a comma separated string'));
|
||||
if (req.query.action && typeof req.query.action !== 'string') return next(new HttpError(400, 'action must be a string'));
|
||||
if (req.query.search && typeof req.query.search !== 'string') return next(new HttpError(400, 'search must be a string'));
|
||||
|
||||
var actions = req.query.actions ? req.query.actions.split(',').map(function (s) { return s.trim(); }) : [];
|
||||
const actions = req.query.actions ? req.query.actions.split(',').map(function (s) { return s.trim(); }) : [];
|
||||
if (req.query.action) actions.push(req.query.action);
|
||||
|
||||
eventlog.getAllPaged(actions, req.query.search || null, page, perPage, function (error, result) {
|
||||
if (error) return next(BoxError.toHttpError(error));
|
||||
const [error, eventlogs] = await safe(eventlog.getAllPaged(actions, req.query.search || null, page, perPage));
|
||||
if (error) return next(BoxError.toHttpError(error));
|
||||
|
||||
next(new HttpSuccess(200, { eventlogs: result }));
|
||||
});
|
||||
next(new HttpSuccess(200, { eventlogs }));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user