X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=a5fbf63e6e607dd70d87d4717031229909a1dccc;hb=deca03e8aeb7cac9c19b0d43b4642b27299695b5;hp=6d8f5c1e865d4f1d7d14f7d5af88ac8a4d41a28a;hpb=052d17ea6e199533cefb11f1ef51020b55cb1382;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 6d8f5c1e..a5fbf63e 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -13,6 +13,7 @@ var db = require("../utils/database");
  * Structure table WillPlay:
  *   cid: ref challenge id
  *   uid: ref user id
+ *   yes: boolean (false means "not decided yet")
  */
 
 const ChallengeModel =
@@ -25,13 +26,22 @@ const ChallengeModel =
     if (!c.timeControl.match(/^[0-9dhms +]+$/))
       return "Wrong characters in time control";
 
-    if (!c.nbPlayers.match(/^[0-9]+$/))
-			return "Wrong number of players";
-
 		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)
 	{
@@ -45,16 +55,12 @@ const ChallengeModel =
 				if (!!err)
 					return cb(err);
 				db.get("SELECT last_insert_rowid() AS rowid", (err2,lastId) => {
-					
-          // TODO: also insert "will play" "no" for other players ?
-          // willplay = "maybe" by default ?
-          
           query =
 						"INSERT INTO WillPlay VALUES " +
 						"(true," + lastId["rowid"] + "," + c.uid + ")";
-						db.run(query, (err,ret) => {
-							cb(err, lastId); //all we need is the challenge ID
-						});
+					db.run(query, (err,ret) => {
+						cb(err, lastId); //all we need is the challenge ID
+					});
 				});
 			});
 		});
@@ -72,12 +78,15 @@ const ChallengeModel =
 			db.get(query, (err,challengeInfo) => {
 				if (!!err)
 					return cb(err);
+        let condition = "";
+        if (!!challengeInfo.to[0])
+          condition = " AND u.name in (" + challengeInfo.to.join(",") + ")";
 				query =
 					"SELECT w.uid AS id, u.name " +
 					"FROM WillPlay w " +
 					"JOIN Users u " +
 					"  ON w.uid = u.id " +
-					"WHERE w.cid = " + id;
+					"WHERE w.cid = " + id + condition;
 				db.run(query, (err2,players) => {
 					if (!!err2)
 						return cb(err2);
@@ -107,6 +116,7 @@ const ChallengeModel =
 			db.run(query, (err,challIds) => {
 				if (!!err)
 					return cb(err);
+        challIds = challIds || [];
 				let challenges = [];
 				challIds.forEach(cidRow => {
 					ChallengeModel.getOne(cidRow["cid"], (err2,chall) => {
@@ -120,17 +130,63 @@ const ChallengeModel =
 		});
 	},
 
-	remove: function(id)
+  getSeatCount: function(id, cb)
+  {
+		db.serialize(function() {
+      let query =
+        "SELECT COUNT(*) AS scount " +
+        "FROM WillPlay " +
+        "WHERE cid = " + id;
+      db.get(query, (err,scRow) => {
+        if (!!err)
+          return cb(err);
+        query =
+          "SELECT nbPlayers " +
+          "FROM Challenges " +
+          "WHERE id = " + id;
+        db.get(query, (err2,chRow) => {
+          if (!!err2)
+            return cb(err2);
+          cb(chRow["nbPlayers"] - scRow["scount"]);
+        });
+      });
+    });
+  },
+
+  setSeat: function(id, uid)
+  {
+    // TODO: remove extra "db.serialize" (parallelize by default)
+    //db.serialize(function() {
+    const query =
+      "INSERT OR REPLACE INTO WillPlay " +
+      "VALUES (true," + id + "," + uid +")";
+    db.run(query);
+    //});
+  },
+
+	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);
+        "SELECT 1 " +
+        "FROM Challenges " +
+        "WHERE id = " + id + " AND uid = " + uid;
+      db.run(query, (err,rows) => {
+        if (rows.length > 0) //it's my challenge
+        {
+          db.parallelize(function() {
+            query =
+              "DELETE FROM Challenges " +
+              "WHERE id = " + id;
+            db.run(query);
+            // Also remove matching WillPlay entries if a challenge was deleted
+            query =
+              "DELETE FROM WillPlay " +
+              "WHERE cid = " + id;
+            db.run(query);
+          });
+        }
+      });
 		});
 	},
 }