X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=ba805aa1701fc8480608ec7bacf2cb2d38ee858b;hb=d431028c73d41a22636130bd6aff562762eaf2bb;hp=82b252fd281bf6b59cb3b8aa19bcb4606dc0719e;hpb=bebcc8d45532e67902175f69084a08040f06855f;p=vchess.git diff --git a/server/models/Challenge.js b/server/models/Challenge.js index 82b252fd..ba805aa1 100644 --- a/server/models/Challenge.js +++ b/server/models/Challenge.js @@ -34,8 +34,8 @@ const ChallengeModel = "vid, fen, timeControl) VALUES " + "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") + c.vid + ",'" + c.fen + "','" + c.timeControl + "')"; - db.run(query, err => { - return cb(err); + db.run(query, function(err) { + return cb(err, {cid: this.lastID}); }); }); }, @@ -67,24 +67,49 @@ const ChallengeModel = }); }, - remove: function(id, uid, cb) + remove: function(id) { db.serialize(function() { - let query = + const query = + "DELETE FROM Challenges " + + "WHERE id = " + id; + db.run(query); + }); + }, + + safeRemove: function(id, uid, cb) + { + db.serialize(function() { + const query = "SELECT 1 " + "FROM Challenges " + "WHERE id = " + id + " AND uid = " + uid; db.get(query, (err,chall) => { if (!chall) return cb({errmsg: "Not your challenge"}); - query = - "DELETE FROM Challenges " + - "WHERE id = " + id; - db.run(query); + ChallengeModel.remove(id); cb(null); }); }); }, } +// TODO: adapt +// Remove challenges older than 1 month, and 1to1 older than 36h +//exports.removeOld = function() +//{ +// var tsNow = new Date().getTime(); +// // 86400000 = 24 hours in milliseconds +// var day = 86400000; +// db.challenges.find({}, (err,challengeArray) => { +// challengeArray.forEach( c => { +// if (c._id.getTimestamp() + 30*day < tsNow //automatch +// || (!!c.to && c._id.getTimestamp() + 1.5*day < tsNow)) //1 to 1 +// { +// db.challenges.remove({"_id": c._id}); +// } +// }); +// }); +//} + module.exports = ChallengeModel;