Fixes

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

diff --git a/server/models/Game.js b/server/models/Game.js
index 77bbd27..0ac822e 100644 (file)
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -18,9 +18,15 @@ var db = require("../utils/database");
  * Structure table Moves:
  *   gid: ref game id
  *   squares: varchar (description)
- *   message: text
  *   played: datetime
  *   idx: integer
+ *
+ * Structure table Chats:
+ *   gid: game id (int)
+ *   msg: varchar
+ *   name: varchar
+ *   sid: varchar (socket ID when sending message)
+ *   added: datetime
  */
 
 const GameModel =
@@ -29,9 +35,10 @@ const GameModel =
        {
                db.serialize(function() {
                        let query =
-                               "INSERT INTO Games (vid, fenStart, fen, score, timeControl, created)"
+                               "INSERT INTO Games"
+        + " (vid, fenStart, fen, score, timeControl, created, drawOffer)"
         + " VALUES (" + vid + ",'" + fen + "','" + fen + "','*','"
-        + timeControl + "'," + Date.now() + ")";
+        + timeControl + "'," + Date.now() + "," + false + ")";
       db.run(query, function(err) {
         if (!!err)
           return cb(err);
@@ -72,20 +79,29 @@ const GameModel =
                                        if (!!err2)
                                                return cb(err2);
                                        query =
-                                               "SELECT squares, message, played, idx " +
+                                               "SELECT squares, played, idx " +
                                                "FROM Moves " +
                                                "WHERE gid = " + id;
                                        db.all(query, (err3,moves) => {
                                                if (!!err3)
                                                        return cb(err3);
-                                               const game = Object.assign({},
-              gameInfo,
-                                                 {
-                                                         players: players,
-                                                         moves: moves
-              }
-            );
-                                               return cb(null, game);
+                             query =
+              "SELECT msg, name, sid, added " +
+              "FROM Chats " +
+              "WHERE gid = " + id;
+                             db.all(query, (err4,chats) => {
+                                                 if (!!err4)
+                                                         return cb(err4);
+                                                 const game = Object.assign({},
+                gameInfo,
+                {
+                  players: players,
+                  moves: moves,
+                  chats: chats,
+                }
+              );
+                                                 return cb(null, game);
+            });
                                        });
                                });
                        });
@@ -133,27 +149,43 @@ const GameModel =
     });
   },
 
-  // obj can have fields move, fen and/or score
+  // obj can have fields move, chat, fen, drawOffer and/or score
   update: function(id, obj)
   {
                db.parallelize(function() {
       let query =
         "UPDATE Games " +
         "SET ";
+      let modifs = "";
+      if (!!obj.message)
+        modifs += "message = message || ' ' || '" + obj.message + "',";
+      if (!!obj.drawOffer)
+        modifs += "drawOffer = " + obj.drawOffer + ",";
       if (!!obj.fen)
-        query += "fen = '" + obj.fen + "',";
+        modifs += "fen = '" + obj.fen + "',";
       if (!!obj.score)
-        query += "score = '" + obj.score + "',";
-      query = query.slice(0,-1); //remove last comma
-      query += " WHERE id = " + id;
-      db.run(query);
+        modifs += "score = '" + obj.score + "',";
+      modifs = modifs.slice(0,-1); //remove last comma
+      if (modifs.length > 0)
+      {
+        query += modifs + " WHERE id = " + id;
+        db.run(query);
+      }
       if (!!obj.move)
       {
         const m = obj.move;
         query =
-          "INSERT INTO Moves (gid, squares, message, played, idx) VALUES " +
-          "(" + id + ",'" + JSON.stringify(m.squares) + "','" + m.message +
-            "'," + m.played + "," + m.idx + ")";
+          "INSERT INTO Moves (gid, squares, played, idx) VALUES " +
+          "(" + id + ",'" + JSON.stringify(m.squares) + "',"
+            + m.played + "," + m.idx + ")";
+        db.run(query);
+      }
+      if (!!obj.chat)
+      {
+                         query =
+               "INSERT INTO Chats (gid, msg, name, sid, added) VALUES " +
+            "(" + id + ",'" + obj.chat.msg + "','" + obj.chat.name +
+            "','" + obj.chat.sid + "'," + Date.now() + ")";
         db.run(query);
       }
     });
@@ -174,6 +206,10 @@ const GameModel =
                                "DELETE FROM Moves " +
                                "WHERE gid = " + id;
                        db.run(query);
+                       query =
+                               "DELETE FROM Chats " +
+                               "WHERE gid = " + id;
+                       db.run(query);
                });
        },
 
@@ -192,7 +228,7 @@ const GameModel =
             "SELECT max(played) AS lastMaj " +
             "FROM Moves " +
             "WHERE gid = " + g.id;
-          db.get(query, (err2,updated) {
+          db.get(query, (err2,updated) => {
             if (!updated && tsNow - g.created > 7*day)
               return GameModel.remove(g.id);
             const lastMaj = updated.lastMaj;