X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=routes%2Fchallenge.js;fp=routes%2Fchallenge.js;h=2131870f982c9a9198b452cfb0642dc0e8f015fd;hb=ab4f4bf258ed68d8292b64d81babde03cddbae3c;hp=1a4d22b85d3dc41048f1b2429f5292bac021c189;hpb=00f2759e16ec73fa1ecd0254a9c9018530d71892;p=vchess.git

diff --git a/routes/challenge.js b/routes/challenge.js
index 1a4d22b8..2131870f 100644
--- a/routes/challenge.js
+++ b/routes/challenge.js
@@ -1,77 +1,81 @@
-// TODO: adapt this (from Mongo to SQLite, and challenge format changed) for corr play
+// AJAX methods to get, create, update or delete a challenge
 
-var router = require("express").Router();
-var ObjectID = require("bson-objectid");
-var ChallengeModel = require('../models/Challenge');
-var UserModel = require('../models/User');
-var ObjectID = require("bson-objectid");
-var access = require("../utils/access");
+let router = require("express").Router();
+const access = require("../utils/access");
+const ChallengeModel = require("../models/Challenge");
+const checkChallenge = require("../public/javascripts/shared/challengeCheck.js");
 
-// variant page
-router.get("/challengesbyvariant", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your challenges"});
-	let uid = ObjectID(req.query["uid"]);
-	let vid = ObjectID(req.query["vid"]);
-	ChallengeModel.getByVariant(uid, vid, (err, challengeArray) => {
-		res.json(err || {challenges: challengeArray});
+router.post("/challenges/:vid([0-9]+)", access.logged, access.ajax, (req,res) => {
+	const vid = req.params["vid"];
+	const chall = {
+		uid: req.userId,
+		vid: vid,
+		fen: req.body["fen"],
+		mainTime: req.body["mainTime"],
+		increment: req.body["increment"],
+		nbPlayers: req.body["nbPlayers"],
+		players: req.body["players"],
+	};
+	const error = checkChallenge(chall);
+	ChallengeModel.create(chall, (err,lastId) => {
+		res.json(err || {challenge: Object.assign(chall, {id: lastId["rowid"]})});
 	});
 });
 
-// index
-router.get("/challengesbyplayer", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your challenges"});
-	let uid = ObjectID(req.query["uid"]);
-	ChallengeModel.getByPlayer(uid, (err, challengeArray) => {
-		res.json(err || {challenges: challengeArray});
-	});
-});
-
-function createChallenge(vid, from, to, res)
-{
-	ChallengeModel.create(vid, from, to, (err, chall) => {
-		res.json(err || {
-			// A challenge can be sent using only name, thus 'to' is returned
-			to: chall.to,
-			cid: chall._id
-		});
-	});
-}
-
-// from[, to][,nameTo]
-router.post("/challenges", access.logged, access.ajax, (req,res) => {
-	if (req.body.from != req.user._id)
-		return res.json({errmsg: "Identity usurpation"});
-	let from = ObjectID(req.body.from);
-	let to = !!req.body.to ? ObjectID(req.body.to) : undefined;
-	let nameTo = !!req.body.nameTo ? req.body.nameTo : undefined;
-	let vid = ObjectID(req.body.vid);
-	if (!to && !!nameTo)
-	{
-		UserModel.getByName(nameTo, (err,user) => {
-			access.checkRequest(res, err, user, "Opponent not found", () => {
-				createChallenge(vid, from, user._id, res);
-			});
-		});
-	}
-	else if (!!to)
-		createChallenge(vid, from, to, res);
-	else
-		createChallenge(vid, from, undefined, res); //automatch
-});
-
-router.delete("/challenges", access.logged, access.ajax, (req,res) => {
-	let cid = ObjectID(req.query.cid);
-	ChallengeModel.getById(cid, (err,chall) => {
-		access.checkRequest(res, err, chall, "Challenge not found", () => {
-			if (!chall.from.equals(req.user._id) && !!chall.to && !chall.to.equals(req.user._id))
-				return res.json({errmsg: "Not your challenge"});
-			ChallengeModel.remove(cid, err => {
-				res.json(err || {});
-			});
-		});
-	});
-});
+//// index
+//router.get("/challengesbyplayer", access.logged, access.ajax, (req,res) => {
+//	if (req.query["uid"] != req.user._id)
+//		return res.json({errmsg: "Not your challenges"});
+//	let uid = ObjectID(req.query["uid"]);
+//	ChallengeModel.getByPlayer(uid, (err, challengeArray) => {
+//		res.json(err || {challenges: challengeArray});
+//	});
+//});
+//
+//function createChallenge(vid, from, to, res)
+//{
+//	ChallengeModel.create(vid, from, to, (err, chall) => {
+//		res.json(err || {
+//			// A challenge can be sent using only name, thus 'to' is returned
+//			to: chall.to,
+//			cid: chall._id
+//		});
+//	});
+//}
+//
+//// from[, to][,nameTo]
+//router.post("/challenges", access.logged, access.ajax, (req,res) => {
+//	if (req.body.from != req.user._id)
+//		return res.json({errmsg: "Identity usurpation"});
+//	let from = ObjectID(req.body.from);
+//	let to = !!req.body.to ? ObjectID(req.body.to) : undefined;
+//	let nameTo = !!req.body.nameTo ? req.body.nameTo : undefined;
+//	let vid = ObjectID(req.body.vid);
+//	if (!to && !!nameTo)
+//	{
+//		UserModel.getByName(nameTo, (err,user) => {
+//			access.checkRequest(res, err, user, "Opponent not found", () => {
+//				createChallenge(vid, from, user._id, res);
+//			});
+//		});
+//	}
+//	else if (!!to)
+//		createChallenge(vid, from, to, res);
+//	else
+//		createChallenge(vid, from, undefined, res); //automatch
+//});
+//
+//router.delete("/challenges", access.logged, access.ajax, (req,res) => {
+//	let cid = ObjectID(req.query.cid);
+//	ChallengeModel.getById(cid, (err,chall) => {
+//		access.checkRequest(res, err, chall, "Challenge not found", () => {
+//			if (!chall.from.equals(req.user._id) && !!chall.to && !chall.to.equals(req.user._id))
+//				return res.json({errmsg: "Not your challenge"});
+//			ChallengeModel.remove(cid, err => {
+//				res.json(err || {});
+//			});
+//		});
+//	});
+//});
 
 module.exports = router;