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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 96db0a2b..602531f4 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,44 +1,47 @@
 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)
- *   mainTime: integer
- *   addTime: integer
- *
- * Structure table WillPlay:
- *   cid: ref challenge id
- *   uid: ref user id
+ *   timeControl: string (3m+2s, 7d+1d ...)
  */
 
 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";
+	},
+
+	// fen cannot be undefined
 	create: function(c, cb)
 	{
 		db.serialize(function() {
 			let query =
 				"INSERT INTO Challenges " +
-				"(added, uid, vid, nbPlayers, fen, mainTime, addTime) VALUES " +
-				"(" + Date.now() + "," + c.uid + "," + c.vid + "," + c.nbPlayers +
-					",'" + c.fen + "'," + c.mainTime + "," + c.increment + ")";
+				"(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 " +
-						"(" + lastId["rowid"] + "," + c.uid + ")";
-						db.run(query, (err,ret) => {
-							cb(err, lastId); //all we need is the challenge ID
-						});
-				});
-			});
+			    return cb(err2, lastId);
+        });
+      });
 		});
 	},
 
@@ -47,32 +50,31 @@ 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)
+          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;
+					"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,
-						mainTime: challengeInfo.mainTime,
-						increment: challengeInfo.addTime,
+						timeControl: challengeInfo.timeControl,
 					};
 					return cb(null, challenge);
 				});
@@ -90,6 +92,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) => {
@@ -103,17 +106,21 @@ 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);
+        "SELECT 1 " +
+        "FROM Challenges " +
+        "WHERE id = " + id + " AND uid = " + uid;
+      db.run(query, (err,rows) => {
+        if (rows.length == 0)
+          return res.json({errmsg: "Not your challenge"});
+        query =
+          "DELETE FROM Challenges " +
+          "WHERE id = " + id;
+        db.run(query);
+      });
 		});
 	},
 }