X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=243da709d697f3dac38e7b4f06bfbb8040b95bfd;hb=7ba4a5bc5b64e19a1e7f26aa232d5c50770d07ad;hp=ba805aa1701fc8480608ec7bacf2cb2d38ee858b;hpb=d431028c73d41a22636130bd6aff562762eaf2bb;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index ba805aa1..243da709 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,4 +1,5 @@
-var db = require("../utils/database");
+const db = require("../utils/database");
+const UserModel = require("./User");
 
 /*
  * Structure:
@@ -7,62 +8,52 @@ var db = require("../utils/database");
  *   uid: user id (int)
  *   target: recipient id (optional)
  *   vid: variant id (int)
+ *   randomness: integer in 0..2
  *   fen: varchar (optional)
- *   timeControl: string (3m+2s, 7d+1d ...)
+ *   cadence: string (3m+2s, 7d ...)
  */
 
 const ChallengeModel =
 {
   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 "";
+    return (
+      c.vid.toString().match(/^[0-9]+$/) &&
+      c.cadence.match(/^[0-9dhms +]+$/) &&
+      c.randomness.toString().match(/^[0-2]$/) &&
+      c.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
+      (!c.to || UserModel.checkNameEmail({name: c.to}))
+    );
   },
 
-  // fen cannot be undefined
   create: function(c, 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 + "')";
+          "(added, uid, " + (!!c.to ? "target, " : "") +
+          "vid, randomness, fen, cadence) " +
+        "VALUES " +
+          "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
+          c.vid + "," + c.randomness + ",'" + c.fen + "','" + c.cadence + "')";
       db.run(query, function(err) {
-        return cb(err, {cid: this.lastID});
+        cb(err, {cid: this.lastID});
       });
     });
   },
 
-  getOne: function(id, cb)
-  {
-    db.serialize(function() {
-      const query =
-        "SELECT * " +
-        "FROM Challenges " +
-        "WHERE id = " + id;
-      db.get(query, (err,challenge) => {
-        return cb(err, challenge);
-      });
-    });
-  },
-
-  // all challenges except where target is defined and not me
+  // All challenges related to user with ID uid
   getByUser: function(uid, cb)
   {
     db.serialize(function() {
       const query =
         "SELECT * " +
         "FROM Challenges " +
-        "WHERE target IS NULL OR target = " + uid;
+        "WHERE target IS NULL" +
+          " OR uid = " + uid +
+          " OR target = " + uid;
       db.all(query, (err,challenges) => {
-        return cb(err, challenges);
+        cb(err, challenges);
       });
     });
   },
@@ -77,7 +68,7 @@ const ChallengeModel =
     });
   },
 
-  safeRemove: function(id, uid, cb)
+  safeRemove: function(id, uid)
   {
     db.serialize(function() {
       const query =
@@ -85,31 +76,11 @@ const ChallengeModel =
         "FROM Challenges " +
         "WHERE id = " + id + " AND uid = " + uid;
       db.get(query, (err,chall) => {
-        if (!chall)
-          return cb({errmsg: "Not your challenge"});
-        ChallengeModel.remove(id);
-        cb(null);
+        if (!err && chall)
+          ChallengeModel.remove(id);
       });
     });
   },
 }
 
-// TODO: adapt
-// Remove challenges older than 1 month, and 1to1 older than 36h
-//exports.removeOld = function()
-//{
-//	var tsNow = new Date().getTime();
-//	// 86400000 = 24 hours in milliseconds
-//	var day = 86400000;
-//	db.challenges.find({}, (err,challengeArray) => {
-//		challengeArray.forEach( c => {
-//			if (c._id.getTimestamp() + 30*day < tsNow //automatch
-//				|| (!!c.to && c._id.getTimestamp() + 1.5*day < tsNow)) //1 to 1
-//			{
-//				db.challenges.remove({"_id": c._id});
-//			}
-//		});
-//	});
-//}
-
 module.exports = ChallengeModel;