X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=models%2FProblem.js;h=a1f99031297f962ebdbf3b59cec20353bc966f7f;hp=8f3a302c8d61d6515997ab5a9be5c915cb892265;hb=ab4f4bf258ed68d8292b64d81babde03cddbae3c;hpb=00f2759e16ec73fa1ecd0254a9c9018530d71892

diff --git a/models/Problem.js b/models/Problem.js
index 8f3a302c..a1f99031 100644
--- a/models/Problem.js
+++ b/models/Problem.js
@@ -10,67 +10,72 @@ var db = require("../utils/database");
  *   solution: text
  */
 
-exports.create = function(uid, vid, fen, instructions, solution, cb)
+const ProblemModel =
 {
-	db.serialize(function() {
-		const insertQuery =
-			"INSERT INTO Problems (added, uid, vid, fen, instructions, solution) " +
-			"VALUES (" + Date.now() + "," + uid + "," + vid + ",'" + fen + "',?,?)";
-		db.run(insertQuery, [instructions, solution], err => {
-			if (!!err)
-				return cb(err);
-			db.get("SELECT last_insert_rowid() AS rowid", cb);
+	create: function(uid, vid, fen, instructions, solution, cb)
+	{
+		db.serialize(function() {
+			const insertQuery =
+				"INSERT INTO Problems (added, uid, vid, fen, instructions, solution) " +
+				"VALUES (" + Date.now() + "," + uid + "," + vid + ",'" + fen + "',?,?)";
+			db.run(insertQuery, [instructions, solution], err => {
+				if (!!err)
+					return cb(err);
+				db.get("SELECT last_insert_rowid() AS rowid", cb);
+			});
 		});
-	});
-}
+	},
 
-exports.getOne = function(id, callback)
-{
-	db.serialize(function() {
-		const query =
-			"SELECT * " +
-			"FROM Problems " +
-			"WHERE id = " + id;
-		db.get(query, callback);
-	});
-}
+	getOne: function(id, callback)
+	{
+		db.serialize(function() {
+			const query =
+				"SELECT * " +
+				"FROM Problems " +
+				"WHERE id = " + id;
+			db.get(query, callback);
+		});
+	},
 
-exports.fetchN = function(vid, uid, type, directionStr, lastDt, MaxNbProblems, callback)
-{
-	db.serialize(function() {
-		let typeLine = "";
-		if (uid > 0)
-			typeLine = "AND uid " + (type=="others" ? "!=" : "=") + " " + uid;
-		const query =
-			"SELECT * FROM Problems " +
-			"WHERE vid = " + vid +
-			"  AND added " + directionStr + " " + lastDt + " " + typeLine + " " +
-			"ORDER BY added " + (directionStr=="<" ? "DESC " : "") +
-			"LIMIT " + MaxNbProblems;
-		db.all(query, callback);
-	});
-}
+	fetchN: function(vid, uid, type, directionStr, lastDt, MaxNbProblems, callback)
+	{
+		db.serialize(function() {
+			let typeLine = "";
+			if (uid > 0)
+				typeLine = "AND uid " + (type=="others" ? "!=" : "=") + " " + uid;
+			const query =
+				"SELECT * FROM Problems " +
+				"WHERE vid = " + vid +
+				"  AND added " + directionStr + " " + lastDt + " " + typeLine + " " +
+				"ORDER BY added " + (directionStr=="<" ? "DESC " : "") +
+				"LIMIT " + MaxNbProblems;
+			db.all(query, callback);
+		});
+	},
 
-// TODO: update fails (but insert is OK)
-exports.update = function(id, uid, fen, instructions, solution, cb)
-{
-	db.serialize(function() {
-		const query =
-			"UPDATE Problems SET " +
-				"fen = '" + fen + "', " +
-				"instructions = ?, " +
-				"solution = ? " +
-			"WHERE id = " + id + " AND uid = " + uid;
-		db.run(query, [instructions,solution], cb);
-	});
-}
+	// TODO: update fails (but insert is OK)
+	update: function(id, uid, fen, instructions, solution, cb)
+	{
+		db.serialize(function() {
+			const query =
+				"UPDATE Problems SET " +
+					"fen = '" + fen + "', " +
+					"instructions = ?, " +
+					"solution = ? " +
+				"WHERE id = " + id + " AND uid = " + uid;
+			db.run(query, [instructions,solution], cb);
+		});
+	},
 
-exports.remove = function(id, uid)
-{
-	db.serialize(function() {
-		const query =
-			"DELETE FROM Problems " +
-			"WHERE id = " + id + " AND uid = " + uid;
-		db.run(query);
-	});
+	remove: function(id, uid)
+	{
+		db.serialize(function() {
+			const query =
+				"DELETE FROM Problems " +
+				"WHERE id = " + id + " AND uid = " + uid;
+			db.run(query);
+		});
+	},
 }
+
+module.exports = ProblemModel;