X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=dea0ac3908d1a3baaecaeb77cf2e6662585cb558;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hp=3f713203f1adeaacbd59ae4af7dfb0434e02b5db;hpb=b1aa927be964db4fa6a3eb7cf6c04640951d7dbb;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 3f713203..dea0ac39 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,81 +8,72 @@ 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.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";
+const ChallengeModel = {
+  checkChallenge: function(c) {
+    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)
-  {
+  create: function(c, cb) {
     db.serialize(function() {
-      let query =
+      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, err => {
-        return cb(err);
+          "(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) {
+        cb(err, { id: this.lastID });
       });
     });
   },
 
-  getOne: function(id, cb)
-  {
+  // All challenges related to user with ID uid
+  getByUser: function(uid, cb) {
     db.serialize(function() {
-      let query =
+      const query =
         "SELECT * " +
         "FROM Challenges " +
-        "WHERE id = " + id;
-      db.get(query, (err,challenge) => {
-        return cb(err, challenge);
+        "WHERE target IS NULL" +
+          " OR uid = " + uid +
+          " OR target = " + uid;
+      db.all(query, (err, challenges) => {
+        cb(err, challenges);
       });
     });
   },
 
-  // all challenges except where target is defined and not me
-  getByUser: function(uid, cb)
-  {
+  remove: function(id) {
     db.serialize(function() {
       const query =
-        "SELECT * " +
-        "FROM Challenges " +
-        "WHERE target IS NULL OR target = " + uid;
-      db.run(query, (err,challenges) => {
-        return cb(err, challenges);
-      });
+        "DELETE FROM Challenges " +
+        "WHERE id = " + id;
+      db.run(query);
     });
   },
 
-  remove: function(id, uid)
-  {
+  safeRemove: function(id, uid) {
     db.serialize(function() {
-      let query =
+      const 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);
+        "WHERE id = " + id + " " +
+          // Condition: I'm the sender or the target
+          "AND (uid = " + uid + " OR target = " + uid + ")";
+      db.get(query, (err,chall) => {
+        if (!err && chall)
+          ChallengeModel.remove(id);
       });
     });
   },