Fix challenge send+accept. Now debug game launch from server

[vchess.git] / server / models / Game.js

diff --git a/server/models/Game.js b/server/models/Game.js
index 23a74e8..78827e2 100644 (file)
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -6,8 +6,7 @@ var db = require("../utils/database");
  *   vid: integer (variant id)
  *   fenStart: varchar (initial position)
  *   fen: varchar (current position)
- *   mainTime: integer
- *   addTime: integer (increment)
+ *   timeControl: string
  *   score: varchar (result)
  *
  * Structure table Players:
@@ -27,24 +26,24 @@ var db = require("../utils/database");
 
 const GameModel =
 {
-       // mainTime and increment in milliseconds
-       create: function(vid, fen, mainTime, increment, players, cb)
+       create: function(vid, fen, timeControl, players, cb)
        {
-               db.serialize({
+               db.serialize(function() {
                        let query =
-                               "INSERT INTO Games (vid, fen, mainTime, addTime) " +
-                               "VALUES (" + vid + ",'" + fen + "'," + mainTime + "," + increment + ")";
-                       db.run(insertQuery, err => {
+                               "INSERT INTO Games (vid, fen, timeControl) " +
+                               "VALUES (" + vid + ",'" + fen + "','" + timeControl + "')";
+      db.run(query, function(err) {
                                if (!!err)
                                        return cb(err);
-                               db.get("SELECT last_insert_rowid() AS rowid", (err2,lastId) => {
-                                       players.forEach(p => {
-                                               query =
-                                                       "INSERT INTO Players VALUES " +
-                                                       "(" + lastId["rowid"] + "," + p.id + "," + p.color + "," + mainTime + ")";
-                                               db.run(query, cb);
-                                       });
-                               });
+        players.forEach((p,idx) => {
+          const color = (idx==0 ? "w" : "b");
+          query =
+            "INSERT INTO Players VALUES " +
+            // Remaining time = -1 means "unstarted"
+            "(" + this.lastID + "," + p.id + ",'" + color + "', -1)";
+          db.run(query);
+        });
+        cb(null, {gid: this.lastID});
                        });
                });
        },
@@ -94,17 +93,18 @@ const GameModel =
                });
        },
 
-       getByUser: function(uid, cb)
+       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 = " + uid;
+                               "WHERE uid " + (excluded ? "<>" : "=") + " " + uid;
                        db.run(query, (err,gameIds) => {
                                if (!!err)
                                        return cb(err);
+        gameIds = gameIds || []; //might be empty
                                let gameArray = [];
                                gameIds.forEach(gidRow => {
                                        GameModel.getOne(gidRow["gid"], (err2,game) => {