X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=602531f4456c482d92112e3da2f107477c405af4;hp=a5fbf63e6e607dd70d87d4717031229909a1dccc;hb=bf20f404705c622a7bb7e458dacce37ecb7405a9;hpb=5d04793e1bce0d448b4ffc532f1e8eb47a72e972

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index a5fbf63e..602531f4 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,19 +1,14 @@
 var db = require("../utils/database");
 
 /*
- * Structure table Challenges:
+ * Structure:
  *   id: integer
  *   added: datetime
  *   uid: user id (int)
+ *   target: recipient id (optional)
  *   vid: variant id (int)
- *   nbPlayers: integer
  *   fen: varchar (optional)
  *   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 =
@@ -30,39 +25,23 @@ const ChallengeModel =
 			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, timeControl) VALUES " +
-				"(" + Date.now() + "," + c.uid + "," + c.vid + "," + c.nbPlayers +
-					",'" + c.fen + "'," + c.timeControl + ")";
+				"(added, uid, " + (!!c.to ? "target, " : "") +
+          "vid, fen, timeControl) VALUES " +
+				"(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
+          c.vid + ",'" + c.fen + "','" + c.timeControl + "')";
 			db.run(query, err => {
 				if (!!err)
 					return cb(err);
 				db.get("SELECT last_insert_rowid() AS rowid", (err2,lastId) => {
-          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
-					});
-				});
-			});
+			    return cb(err2, lastId);
+        });
+      });
 		});
 	},
 
@@ -71,32 +50,29 @@ const ChallengeModel =
 		db.serialize(function() {
 			let query =
 				"SELECT * " +
-				"FROM Challenges c " +
-				"JOIN Variants v " +
-				"  ON c.vid = v.id "
+				"FROM Challenges " +
 				"WHERE id = " + id;
 			db.get(query, (err,challengeInfo) => {
 				if (!!err)
 					return cb(err);
         let condition = "";
-        if (!!challengeInfo.to[0])
-          condition = " AND u.name in (" + challengeInfo.to.join(",") + ")";
+        if (!!challengeInfo.to)
+          condition = "IN (" + challengeInfo.uid + "," + challengeInfo.to + ")";
+        else
+          condition = "= " + challengeInfo.uid;
 				query =
-					"SELECT w.uid AS id, u.name " +
-					"FROM WillPlay w " +
-					"JOIN Users u " +
-					"  ON w.uid = u.id " +
-					"WHERE w.cid = " + id + condition;
+					"SELECT id, name " +
+					"FROM Users " +
+					"WHERE id " + condition;
 				db.run(query, (err2,players) => {
 					if (!!err2)
 						return cb(err2);
 					const challenge = {
 						id: id,
-						uid: challengeInfo.uid,
-						vname: challengeInfo.name,
+						uid: challengeInfo.uid, //sender (but we don't know who ask)
+						vid: challengeInfo.vid,
 						added: challengeInfo.added,
-						nbPlayers: challengeInfo.nbPlayers,
-						players: players, //currently in
+						players: players, //sender + potential receiver
 						fen: challengeInfo.fen,
 						timeControl: challengeInfo.timeControl,
 					};
@@ -130,40 +106,6 @@ const ChallengeModel =
 		});
 	},
 
-  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.serialize(function() {
@@ -172,20 +114,12 @@ const ChallengeModel =
         "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);
-          });
-        }
+        if (rows.length == 0)
+          return res.json({errmsg: "Not your challenge"});
+        query =
+          "DELETE FROM Challenges " +
+          "WHERE id = " + id;
+        db.run(query);
       });
 		});
 	},