X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=f82f9e817938c4bf51f80a2150a6564d53a8e499;hp=a5fbf63e6e607dd70d87d4717031229909a1dccc;hb=8c564f462f5406fcd311d4733f851daf6ada665d;hpb=f05815d7da84284bd9d7c1ce5b808acd675f2a3e

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index a5fbf63e..f82f9e81 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,194 +1,97 @@
 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 =
 {
-	checkChallenge: function(c)
-	{
-    if (!c.vid.match(/^[0-9]+$/))
-			return "Wrong variant ID";
-
+  checkChallenge: function(c)
+  {
+    if (!c.vid.toString().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";
+    return "";
+  },
 
-		if (!c.fen.match(/^[a-zA-Z0-9, /-]+$/))
-			return "Bad FEN string";
-	},
-
-  initializeWillPlay: function(uids, cid, cb)
+  // fen cannot be undefined
+  create: function(c, 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);
+    db.serialize(function() {
+      const query =
+        "INSERT INTO Challenges " +
+        "(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, function(err) {
+        return cb(err, {cid: this.lastID});
+      });
+    });
   },
 
-	// 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 + ")";
-			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
-					});
-				});
-			});
-		});
-	},
-
-	getOne: function(id, cb)
-	{
-		db.serialize(function() {
-			let query =
-				"SELECT * " +
-				"FROM Challenges c " +
-				"JOIN Variants v " +
-				"  ON c.vid = v.id "
-				"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(",") + ")";
-				query =
-					"SELECT w.uid AS id, u.name " +
-					"FROM WillPlay w " +
-					"JOIN Users u " +
-					"  ON w.uid = u.id " +
-					"WHERE w.cid = " + id + condition;
-				db.run(query, (err2,players) => {
-					if (!!err2)
-						return cb(err2);
-					const challenge = {
-						id: id,
-						uid: challengeInfo.uid,
-						vname: challengeInfo.name,
-						added: challengeInfo.added,
-						nbPlayers: challengeInfo.nbPlayers,
-						players: players, //currently in
-						fen: challengeInfo.fen,
-						timeControl: challengeInfo.timeControl,
-					};
-					return cb(null, challenge);
-				});
-			});
-		});
-	},
-
-	getByUser: function(uid, cb)
-	{
-		db.serialize(function() {
-			const query =
-				"SELECT cid " +
-				"FROM WillPlay " +
-				"WHERE uid = " + uid;
-			db.run(query, (err,challIds) => {
-				if (!!err)
-					return cb(err);
-        challIds = challIds || [];
-				let challenges = [];
-				challIds.forEach(cidRow => {
-					ChallengeModel.getOne(cidRow["cid"], (err2,chall) => {
-						if (!!err2)
-							return cb(err2);
-						challenges.push(chall);
-					});
-				});
-				return cb(null, challenges);
-			});
-		});
-	},
+  getOne: function(id, cb)
+  {
+    db.serialize(function() {
+      const query =
+        "SELECT * " +
+        "FROM Challenges " +
+        "WHERE id = " + id;
+      db.get(query, (err,challenge) => {
+        return cb(err, challenge);
+      });
+    });
+  },
 
-  getSeatCount: function(id, cb)
+  // all challenges except where target is defined and not me
+  getByUser: function(uid, 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"]);
-        });
+    db.serialize(function() {
+      const query =
+        "SELECT * " +
+        "FROM Challenges " +
+        "WHERE target IS NULL OR target = " + uid;
+      db.all(query, (err,challenges) => {
+        return cb(err, challenges);
       });
     });
   },
 
-  setSeat: function(id, uid)
+  remove: function(id)
   {
-    // 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);
-    //});
+    db.serialize(function() {
+      const query =
+        "DELETE FROM Challenges " +
+        "WHERE id = " + id;
+      db.run(query);
+    });
   },
 
-	remove: function(id, uid)
-	{
-		db.serialize(function() {
-			let query =
+  safeRemove: function(id, uid, cb)
+  {
+    db.serialize(function() {
+      const 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);
-          });
-        }
+      db.get(query, (err,chall) => {
+        if (!chall)
+          return cb({errmsg: "Not your challenge"});
+        ChallengeModel.remove(id);
+        cb(null);
       });
-		});
-	},
+    });
+  },
 }
 
 module.exports = ChallengeModel;