walamana/minis-data-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validating group ids in ministranten route and retrived the latest group id if query param "group" is set to -1

Browse Source 
Signed-off-by: walamana <joniogerg@gmail.com>
This commit is contained in:
walamana 2018-08-23 15:59:43 +02:00
parent b6e26097a4
commit 6a593ae271
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app.js
View File

@ -208,36 +208,51 @@ app.get("/groups", (req, res) => {
app.get("/ministranten", (req, res) =>{
tokenIsValid(req.cookies.user, req.cookies.loginToken).then(valid => {
con.query("SELECT `ministranten`.`USERNAME`, `ministranten`.`VORNAME`, `ministranten`.`NACHNAME`, `anwesenheit`.`ANWESENHEIT`, `anwesenheit`.`gottesdienst_ID` FROM `ministranten` LEFT JOIN `anwesenheit` ON `anwesenheit`.`USERNAME` = `ministranten`.`USERNAME`, `gottesdienst` WHERE `gottesdienst`.`ID` = `anwesenheit`.`gottesdienst_ID` AND `gottesdienst`.`gruppe_ID` = " + req.query.group + " ORDER BY `ministranten`.`NACHNAME`, `ministranten`.`VORNAME`, `anwesenheit`.`gottesdienst_ID` DESC LIMIT 30", (err, results) => {
if (err) throw err;
var minis = [];
var curMini;
for(var i = 0; i < results.length; i++){
var result = results[i];
if(result["USERNAME"] == "admin"){
continue;
}
if(!curMini || curMini.username != result["USERNAME"]){
if(curMini != undefined || curMini != null){
minis.push(curMini);
}
curMini = {
firstname: result["VORNAME"],
lastname: valid ? result["NACHNAME"] : result["NACHNAME"].substring(0, 1) + ".",
username: result["USERNAME"],
registered: {}
con.query("SELECT * FROM `gruppe` ORDER BY `gruppe`.`START` DESC", (err, groupResults) => {
var groupID = req.query.group;
if(groupID == -1){
groupID = groupResults[0]["ID"];
}else{
var valid = false;
for(let id of groupResults){
if(id.ID == groupID){
valid = true;
}
}
curMini.registered[result["gottesdienst_ID"]] = result["ANWESENHEIT"];
if(!valid){
res.send("{error: 'Invalid group id'}");
}
}
minis.push(curMini);
con.query("SELECT `ministranten`.`USERNAME`, `ministranten`.`VORNAME`, `ministranten`.`NACHNAME`, `anwesenheit`.`ANWESENHEIT`, `anwesenheit`.`gottesdienst_ID` FROM `ministranten` LEFT JOIN `anwesenheit` ON `anwesenheit`.`USERNAME` = `ministranten`.`USERNAME`, `gottesdienst` WHERE `gottesdienst`.`ID` = `anwesenheit`.`gottesdienst_ID` AND `gottesdienst`.`gruppe_ID` = " + groupID + " ORDER BY `ministranten`.`NACHNAME`, `ministranten`.`VORNAME`, `anwesenheit`.`gottesdienst_ID` DESC LIMIT 30", (err, results) => {
if (err) throw err;
var minis = [];
res.send(JSON.stringify(minis));
var curMini;
for(var i = 0; i < results.length; i++){
var result = results[i];
if(result["USERNAME"] == "admin"){
continue;
}
if(!curMini || curMini.username != result["USERNAME"]){
if(curMini != undefined || curMini != null){
minis.push(curMini);
}
curMini = {
firstname: result["VORNAME"],
lastname: valid ? result["NACHNAME"] : result["NACHNAME"].substring(0, 1) + ".",
username: result["USERNAME"],
registered: {}
}
}
curMini.registered[result["gottesdienst_ID"]] = result["ANWESENHEIT"];
}
minis.push(curMini);
res.send(JSON.stringify(minis));
});
});
})
});