ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev' 

Update `/events/` API

See merge request Shinobi-Systems/Shinobi!78
merge-requests/76/head
Moe 2019-07-19 20:43:05 +00:00
parent d42f04da3e cb18ea71f8
commit dfd241d30e
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libs/webServerPaths.js
View File

@ -1078,7 +1078,10 @@ module.exports = function(s,config,lang,app,io){
/** /**
* API : Get Events * API : Get Events
*/ */
app.get([config.webPaths.apiPrefix+':auth/events/:ke',config.webPaths.apiPrefix+':auth/events/:ke/:id',config.webPaths.apiPrefix+':auth/events/:ke/:id/:limit',config.webPaths.apiPrefix+':auth/events/:ke/:id/:limit/:start',config.webPaths.apiPrefix+':auth/events/:ke/:id/:limit/:start/:end'], function (req,res){ app.get([
config.webPaths.apiPrefix+':auth/events/:ke',
config.webPaths.apiPrefix+':auth/events/:ke/:id'
], function (req,res){
req.ret={ok:false}; req.ret={ok:false};
res.setHeader('Content-Type', 'application/json'); res.setHeader('Content-Type', 'application/json');
s.auth(req.params,function(user){ s.auth(req.params,function(user){
@ -1104,20 +1107,42 @@ module.exports = function(s,config,lang,app,io){
return; return;
} }
} }
if(req.params.start&&req.params.start!==''){ if(req.query.start||req.query.end){
req.params.start = s.stringToSqlTime(req.params.start) if(req.query.start && req.query.start !== ''){
if(req.params.end&&req.params.end!==''){ req.query.start = s.stringToSqlTime(req.query.start)
req.params.end = s.stringToSqlTime(req.params.end) }
req.sql+=' AND `time` >= ? AND `time` <= ?'; if(req.query.end && req.query.end !== ''){
req.ar.push(decodeURIComponent(req.params.start)) req.query.end = s.stringToSqlTime(req.query.end)
req.ar.push(decodeURIComponent(req.params.end)) }
}else{ if(!req.query.startOperator||req.query.startOperator==''){
req.sql+=' AND `time` >= ?'; req.query.startOperator='>='
req.ar.push(decodeURIComponent(req.params.start)) }
if(!req.query.endOperator||req.query.endOperator==''){
req.query.endOperator='<='
}
switch(true){
case(req.query.start&&req.query.start!==''&&req.query.end&&req.query.end!==''):
req.sql+=' AND `time` '+req.query.startOperator+' ? AND `time` '+req.query.endOperator+' ?';
req.ar.push(req.query.start)
req.ar.push(req.query.end)
break;
case(req.query.start&&req.query.start!==''):
req.sql+=' AND `time` '+req.query.startOperator+' ?';
req.ar.push(req.query.start)
break;
case(req.query.end&&req.query.end!==''):
req.sql+=' AND `time` '+req.query.endOperator+' ?';
req.ar.push(req.query.end)
break;
} }
} }
if(!req.params.limit||req.params.limit==''){req.params.limit=100} req.sql+=' ORDER BY `time` DESC';
req.sql+=' ORDER BY `time` DESC LIMIT '+req.params.limit+''; if(!req.query.limit||req.query.limit==''){
req.query.limit='100'
}
if(req.query.limit!=='0'){
req.sql+=' LIMIT '+req.query.limit
}
s.sqlQuery(req.sql,req.ar,function(err,r){ s.sqlQuery(req.sql,req.ar,function(err,r){
if(err){ if(err){
err.sql=req.sql; err.sql=req.sql;