Remove test instructions, fix CORS for DELETE method

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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 96db0a2..de2818b 100644 (file)
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -8,35 +8,59 @@ var db = require("../utils/database");
  *   vid: variant id (int)
  *   nbPlayers: integer
  *   fen: varchar (optional)
- *   mainTime: integer
- *   addTime: integer
+ *   timeControl: string (3m+2s, 7d+1d ...)
  *
  * Structure table WillPlay:
  *   cid: ref challenge id
  *   uid: ref user id
+ *   yes: boolean (false means "not decided yet")
  */
 
 const ChallengeModel =
 {
-       // fen cannot be undefined; TODO: generate fen on server instead
+       checkChallenge: function(c)
+       {
+    if (!c.vid.match(/^[0-9]+$/))
+                       return "Wrong variant ID";
+
+    if (!c.timeControl.match(/^[0-9dhms +]+$/))
+      return "Wrong characters in time control";
+
+               if (!c.fen.match(/^[a-zA-Z0-9, /-]+$/))
+                       return "Bad FEN string";
+       },
+
+  initializeWillPlay: function(uids, cid, cb)
+  {
+    let query = "INSERT INTO WillPlay VALUES ";
+    for (let i=0; i<uids.length; i++)
+    {
+      query += "(false," + cid + "," + uids[i] + ")";
+      if (i < uids.length-1)
+        query += ",";
+    }
+    db.run(query, cb);
+  },
+
+       // fen cannot be undefined
        create: function(c, cb)
        {
                db.serialize(function() {
                        let query =
                                "INSERT INTO Challenges " +
-                               "(added, uid, vid, nbPlayers, fen, mainTime, addTime) VALUES " +
+                               "(added, uid, vid, nbPlayers, fen, timeControl) VALUES " +
                                "(" + Date.now() + "," + c.uid + "," + c.vid + "," + c.nbPlayers +
-                                       ",'" + c.fen + "'," + c.mainTime + "," + c.increment + ")";
+                                       ",'" + c.fen + "'," + c.timeControl + ")";
                        db.run(query, err => {
                                if (!!err)
                                        return cb(err);
                                db.get("SELECT last_insert_rowid() AS rowid", (err2,lastId) => {
-                                       query =
+          query =
                                                "INSERT INTO WillPlay VALUES " +
-                                               "(" + lastId["rowid"] + "," + c.uid + ")";
-                                               db.run(query, (err,ret) => {
-                                                       cb(err, lastId); //all we need is the challenge ID
-                                               });
+                                               "(true," + lastId["rowid"] + "," + c.uid + ")";
+                                       db.run(query, (err,ret) => {
+                                               cb(err, lastId); //all we need is the challenge ID
+                                       });
                                });
                        });
                });
@@ -71,8 +95,7 @@ const ChallengeModel =
                                                nbPlayers: challengeInfo.nbPlayers,
                                                players: players, //currently in
                                                fen: challengeInfo.fen,
-                                               mainTime: challengeInfo.mainTime,
-                                               increment: challengeInfo.addTime,
+                                               timeControl: challengeInfo.timeControl,
                                        };
                                        return cb(null, challenge);
                                });
@@ -103,17 +126,22 @@ const ChallengeModel =
                });
        },
 
-       remove: function(id)
+       remove: function(id, uid)
        {
-               db.parallelize(function() {
+               db.serialize(function() {
                        let query =
                                "DELETE FROM Challenges " +
-                               "WHERE id = " + id;
-                       db.run(query);
-                       query =
-                               "DELETE FROM WillPlay " +
-                               "WHERE cid = " + id;
-                       db.run(query);
+                               "WHERE id = " + id + " AND uid = " + uid;
+                       db.run(query, (err,ret) => {
+                         if (!err && ret >= 1)
+        {
+          // Also remove matching WillPlay entries if a challenge was deleted
+          query =
+                                   "DELETE FROM WillPlay " +
+                                   "WHERE cid = " + id;
+                           db.run(query);
+        }
+      });
                });
        },
 }