X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=models%2FProblem.js;h=6184eafcf1c947f20c56a5455c8290038f8a3b5f;hb=936dc463c969f648ae0bc81074ff3272c7c99697;hp=cdd146e704c5086e33d73332f8547c212d30db0c;hpb=ae99d72ce4e0912f459b89059731563f5f20d34d;p=vchess.git

diff --git a/models/Problem.js b/models/Problem.js
index cdd146e7..6184eafc 100644
--- a/models/Problem.js
+++ b/models/Problem.js
@@ -10,11 +10,16 @@ var db = require("../utils/database");
  *   solution: text
  */
 
+// TODO: callback ?
 exports.create = function(vname, fen, instructions, solution)
 {
 	db.serialize(function() {
-		db.get("SELECT id FROM Variants WHERE name = '" + vname + "'", (err,variant) => {
-			db.run(
+		const vidQuery =
+			"SELECT id " +
+			"FROM Variants " +
+			"WHERE name = '" + vname + "'";
+		db.get(vidQuery, (err,variant) => {
+			const insertQuery =
 				"INSERT INTO Problems (added, vid, fen, instructions, solution) VALUES " +
 				"(" +
 					Date.now() + "," +
@@ -22,7 +27,8 @@ exports.create = function(vname, fen, instructions, solution)
 					fen + "," +
 					instructions + "," +
 					solution +
-				")");
+				")";
+			db.run(insertQuery);
 		});
 	});
 }
@@ -30,43 +36,59 @@ exports.create = function(vname, fen, instructions, solution)
 exports.getById = function(id, callback)
 {
 	db.serialize(function() {
-		db.get(
+		const query =
 			"SELECT * FROM Problems " +
-			"WHERE id ='" + id + "'",
-			callback);
+			"WHERE id ='" + id + "'";
+		db.get(query, callback);
 	});
 }
 
-exports.fetchN = function(vname, directionStr, lastDt, MaxNbProblems, callback)
+exports.getOne = function(vname, pid, callback)
 {
 	db.serialize(function() {
-		db.all(
+		const query =
+			"SELECT * " +
+			"FROM Problems " +
+			"WHERE id = " + pid;
+		db.get(query, callback);
+	});
+}
+
+exports.fetchN = function(vname, uid, type, directionStr, lastDt, MaxNbProblems, callback)
+{
+	db.serialize(function() {
+		let typeLine = "";
+		if (uid > 0)
+			typeLine = "AND id " + (type=="others" ? "!=" : "=") + " " + uid;
+		const query =
 			"SELECT * FROM Problems " +
 			"WHERE vid = (SELECT id FROM Variants WHERE name = '" + vname + "') " +
-			"  AND added " + directionStr + " " + lastDt + " " +
+			"  AND added " + directionStr + " " + lastDt + " " + typeLine + " " +
 			"ORDER BY added " + (directionStr=="<" ? "DESC " : "") +
 			"LIMIT " + MaxNbProblems,
-			callback);
+		db.all(query, callback);
 	});
 }
 
 exports.update = function(id, uid, fen, instructions, solution)
 {
 	db.serialize(function() {
-		db.run(
+		const query =
 			"UPDATE Problems " +
 				"fen = " + fen + ", " +
 				"instructions = " + instructions + ", " +
 				"solution = " + solution + " " +
-			"WHERE id = " + id + " AND uid = " + uid);
+			"WHERE id = " + id + " AND uid = " + uid;
+		db.run(query);
 	});
 }
 
 exports.remove = function(id, uid)
 {
 	db.serialize(function() {
-		db.run(
+		const query =
 			"DELETE FROM Problems " +
-			"WHERE id = " + id + " AND uid = " + uid);
+			"WHERE id = " + id + " AND uid = " + uid;
+		db.run(query);
 	});
 }