Some more cleaning + fixes

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

diff --git a/server/models/Game.js b/server/models/Game.js
index 70f32be..b4f128b 100644 (file)
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -36,8 +36,6 @@ const GameModel =
   checkGameInfo: function(g) {
     if (!g.vid.toString().match(/^[0-9]+$/))
       return "Wrong variant ID";
-    if (!g.vname.match(/^[a-zA-Z0-9]+$/))
-      return "Wrong variant name";
     if (!g.cadence.match(/^[0-9dhms +]+$/))
       return "Wrong characters in time control";
     if (!g.fen.match(/^[a-zA-Z0-9, /-]*$/))
@@ -79,7 +77,7 @@ const GameModel =
       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.cadence, g.score, " +
+        "SELECT g.id, g.vid, g.fen, g.fenStart, g.cadence, g.created, g.score, " +
           "g.scoreMsg, g.drawOffer, v.name AS vname " +
         "FROM Games g " +
         "JOIN Variants v " +
@@ -139,24 +137,38 @@ const GameModel =
   getByUser: function(uid, excluded, cb)
   {
     db.serialize(function() {
-      const query =
-        "SELECT DISTINCT gid " +
-        "FROM Players " +
-        "WHERE uid " + (excluded ? "<>" : "=") + " " + uid;
+      let query = "";
+      if (uid == 0)
+      {
+        // Special case anonymous user: show all games
+        query =
+          "SELECT id AS gid " +
+          "FROM Games";
+      }
+      else
+      {
+        // Registered user:
+        query =
+          "SELECT gid " +
+          "FROM Players " +
+          "GROUP BY gid " +
+          "HAVING COUNT(uid = " + uid + " OR NULL) " +
+          (excluded ? " = 0" : " > 0");
+      }
       db.all(query, (err,gameIds) => {
-        if (!!err)
-          return cb(err);
-        if (gameIds.length == 0)
-          return cb(null, []);
+        if (!!err || gameIds.length == 0)
+          return cb(err, []);
         let gameArray = [];
+        let kounter = 0;
         for (let i=0; i<gameIds.length; i++)
         {
           GameModel.getOne(gameIds[i]["gid"], true, (err2,game) => {
             if (!!err2)
               return cb(err2);
             gameArray.push(game);
+            kounter++; //TODO: let's hope this is atomic?!
             // Call callback function only when gameArray is complete:
-            if (i == gameIds.length - 1)
+            if (kounter == gameIds.length)
               return cb(null, gameArray);
           });
         }
@@ -168,7 +180,7 @@ const GameModel =
   {
     db.serialize(function() {
       const query =
-        "SELECT id " +
+        "SELECT uid " +
         "FROM Players " +
         "WHERE gid = " + id;
       db.all(query, (err,players) => {
@@ -277,7 +289,7 @@ const GameModel =
     const day = 86400000;
     db.serialize(function() {
       let query =
-        "SELECT id,created " +
+        "SELECT id, created " +
         "FROM Games ";
       db.all(query, (err,games) => {
         games.forEach(g => {
@@ -291,7 +303,7 @@ const GameModel =
             if ((mstats.nbMoves == 0 && tsNow - g.created > 91*day) ||
               (mstats.nbMoves == 1 && tsNow - mstats.lastMaj > 91*day))
             {
-              return GameModel.remove(g.id);
+              GameModel.remove(g.id);
             }
           });
         });