X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=d57aac8dd6427b12147a3936f8a773ce20868692;hb=633959bf1cf6a8701760748d399b0ae86afddaad;hp=5e1c79903e98f7b5f847001d0891609809dc065f;hpb=41c80bb63b85b2696d3925c10784c3d7bb5d2aa3;p=vchess.git diff --git a/server/models/Game.js b/server/models/Game.js index 5e1c7990..d57aac8d 100644 --- a/server/models/Game.js +++ b/server/models/Game.js @@ -11,7 +11,7 @@ const UserModel = require("./User"); * score: varchar (result) * scoreMsg: varchar ("Time", "Mutual agreement"...) * created: datetime - * drawOffer: boolean + * drawOffer: char ('w','b' or '' for none) * * Structure table Players: * gid: ref game id @@ -49,14 +49,14 @@ const GameModel = return ""; }, - create: function(vid, fen, timeControl, players, cb) - { - db.serialize(function() { - let query = - "INSERT INTO Games" + create: function(vid, fen, timeControl, players, cb) + { + db.serialize(function() { + let query = + "INSERT INTO Games" + " (vid, fenStart, fen, score, timeControl, created, drawOffer)" + " VALUES (" + vid + ",'" + fen + "','" + fen + "','*','" - + timeControl + "'," + Date.now() + "," + false + ")"; + + timeControl + "'," + Date.now() + ",'')"; db.run(query, function(err) { if (!!err) return cb(err); @@ -68,51 +68,51 @@ const GameModel = db.run(query); }); cb(null, {gid: this.lastID}); - }); - }); - }, + }); + }); + }, - // TODO: queries here could be async, and wait for all to complete - getOne: function(id, cb) - { - db.serialize(function() { + // TODO: queries here could be async, and wait for all to complete + getOne: function(id, cb) + { + db.serialize(function() { // TODO: optimize queries? - let query = + let query = // NOTE: g.scoreMsg can be NULL // (in this case score = "*" and no reason to look at it) - "SELECT g.id, g.vid, g.fen, g.fenStart, g.timeControl, g.score, " + - "g.scoreMsg, v.name AS vname " + - "FROM Games g " + + "SELECT g.id, g.vid, g.fen, g.fenStart, g.timeControl, g.score, " + + "g.scoreMsg, g.drawOffer, v.name AS vname " + + "FROM Games g " + "JOIN Variants v " + " ON g.vid = v.id " + - "WHERE g.id = " + id; - db.get(query, (err,gameInfo) => { - if (!!err) - return cb(err); - query = - "SELECT p.uid, p.color, u.name " + - "FROM Players p " + + "WHERE g.id = " + id; + db.get(query, (err,gameInfo) => { + if (!!err) + return cb(err); + query = + "SELECT p.uid, p.color, u.name " + + "FROM Players p " + "JOIN Users u " + " ON p.uid = u.id " + - "WHERE p.gid = " + id; - db.all(query, (err2,players) => { - if (!!err2) - return cb(err2); - query = - "SELECT squares, played, idx " + - "FROM Moves " + - "WHERE gid = " + id; - db.all(query, (err3,moves) => { - if (!!err3) - return cb(err3); - query = + "WHERE p.gid = " + id; + db.all(query, (err2,players) => { + if (!!err2) + return cb(err2); + query = + "SELECT squares, played, idx " + + "FROM Moves " + + "WHERE gid = " + id; + db.all(query, (err3,moves) => { + if (!!err3) + return cb(err3); + query = "SELECT msg, name, added " + "FROM Chats " + "WHERE gid = " + id; - db.all(query, (err4,chats) => { - if (!!err4) - return cb(err4); - const game = Object.assign({}, + db.all(query, (err4,chats) => { + if (!!err4) + return cb(err4); + const game = Object.assign({}, gameInfo, { players: players, @@ -120,41 +120,40 @@ const GameModel = chats: chats, } ); - return cb(null, game); + return cb(null, game); }); - }); - }); - }); - }); - }, + }); + }); + }); + }); + }, - getByUser: function(uid, excluded, cb) - { - db.serialize(function() { - // Next query is fine because a player appear at most once in a game - const query = - "SELECT gid " + - "FROM Players " + - "WHERE uid " + (excluded ? "<>" : "=") + " " + uid; - db.all(query, (err,gameIds) => { - if (!!err) - return cb(err); + getByUser: function(uid, excluded, cb) + { + db.serialize(function() { + const query = + "SELECT DISTINCT gid " + + "FROM Players " + + "WHERE uid " + (excluded ? "<>" : "=") + " " + uid; + db.all(query, (err,gameIds) => { + if (!!err) + return cb(err); gameIds = gameIds || []; //might be empty - let gameArray = []; - for (let i=0; i { - if (!!err2) - return cb(err2); - gameArray.push(game); - // Call callback function only when gameArray is complete: - if (i == gameIds.length - 1) - return cb(null, gameArray); - }); - } - }); - }); - }, + let gameArray = []; + for (let i=0; i { + if (!!err2) + return cb(err2); + gameArray.push(game); + // Call callback function only when gameArray is complete: + if (i == gameIds.length - 1) + return cb(null, gameArray); + }); + } + }); + }); + }, getPlayers: function(id, cb) { @@ -179,6 +178,8 @@ const GameModel = if (!obj.move.idx.toString().match(/^[0-9]+$/)) return "Wrong move index"; } + if (!!obj.drawOffer && !obj.drawOffer.match(/^[wbtn]$/)) + return "Wrong draw offer format"; if (!!obj.fen && !obj.fen.match(/^[a-zA-Z0-9, /-]*$/)) return "Wrong FEN string"; if (!!obj.score && !obj.score.match(/^[012?*\/-]+$/)) @@ -193,15 +194,21 @@ const GameModel = // obj can have fields move, chat, fen, drawOffer and/or score update: function(id, obj) { - db.parallelize(function() { + db.parallelize(function() { let query = "UPDATE Games " + "SET "; let modifs = ""; if (!!obj.message) modifs += "message = message || ' ' || '" + obj.message + "',"; - if ([true,false].includes(obj.drawOffer)) - modifs += "drawOffer = " + obj.drawOffer + ","; + // NOTE: if drawOffer is set, we should check that it's player's turn + // A bit overcomplicated. Let's trust the client on that for now... + if (!!obj.drawOffer) + { + if (obj.drawOffer == "n") //Special "None" update + obj.drawOffer = ""; + modifs += "drawOffer = '" + obj.drawOffer + "',"; + } if (!!obj.fen) modifs += "fen = '" + obj.fen + "',"; if (!!obj.score) @@ -224,35 +231,35 @@ const GameModel = } if (!!obj.chat) { - query = - "INSERT INTO Chats (gid, msg, name, added) VALUES (" + query = + "INSERT INTO Chats (gid, msg, name, added) VALUES (" + id + ",?,'" + obj.chat.name + "'," + Date.now() + ")"; db.run(query, obj.chat.msg); } }); }, - remove: function(id) - { - db.parallelize(function() { - let query = - "DELETE FROM Games " + - "WHERE id = " + id; - db.run(query); - query = - "DELETE FROM Players " + - "WHERE gid = " + id; - db.run(query); - query = - "DELETE FROM Moves " + - "WHERE gid = " + id; - db.run(query); - query = - "DELETE FROM Chats " + - "WHERE gid = " + id; - db.run(query); - }); - }, + remove: function(id) + { + db.parallelize(function() { + let query = + "DELETE FROM Games " + + "WHERE id = " + id; + db.run(query); + query = + "DELETE FROM Players " + + "WHERE gid = " + id; + db.run(query); + query = + "DELETE FROM Moves " + + "WHERE gid = " + id; + db.run(query); + query = + "DELETE FROM Chats " + + "WHERE gid = " + id; + db.run(query); + }); + }, cleanGamesDb: function() {