Step toward a one-page application

[vchess.git] / models / Problem.js

diff --git a/models/Problem.js b/models/Problem.js
index 0c80090..a1f9903 100644 (file)
--- a/models/Problem.js
+++ b/models/Problem.js
@@ -2,7 +2,7 @@ var db = require("../utils/database");
 
 /*
  * Structure:
- *   _id: problem number (int)
+ *   id: problem number (int)
  *   uid: user id (int)
  *   vid: variant id (int)
  *   added: timestamp
@@ -10,63 +10,72 @@ var db = require("../utils/database");
  *   solution: text
  */
 
-exports.create = function(vname, fen, instructions, solution)
+const ProblemModel =
 {
-       db.serialize(function() {
-               db.get("SELECT id FROM Variants WHERE name = '" + vname + "'", (err,variant) => {
-                       db.run(
-                               "INSERT INTO Problems (added, vid, fen, instructions, solution) VALUES " +
-                               "(" +
-                                       Date.now() + "," +
-                                       variant._id + "," +
-                                       fen + "," +
-                                       instructions + "," +
-                                       solution +
-                               ")");
+       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.getById = function(id, callback)
-{
-       db.serialize(function() {
-               db.get(
-                       "SELECT * FROM Problems " +
-                       "WHERE id ='" + id + "'",
-                       callback);
-       });
-}
+       getOne: function(id, callback)
+       {
+               db.serialize(function() {
+                       const query =
+                               "SELECT * " +
+                               "FROM Problems " +
+                               "WHERE id = " + id;
+                       db.get(query, callback);
+               });
+       },
 
-exports.fetchN = function(vname, directionStr, lastDt, MaxNbProblems, callback)
-{
-       db.serialize(function() {
-               db.all(
-                       "SELECT * FROM Problems " +
-                       "WHERE vid = (SELECT id FROM Variants WHERE name = '" + vname + "') " +
-                       "  AND added " + directionStr + " " + lastDt + " " +
-                       "ORDER BY added " + (directionStr=="<" ? "DESC " : "") +
-                       "LIMIT " + MaxNbProblems,
-                       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);
+               });
+       },
 
-exports.update = function(id, uid, fen, instructions, solution)
-{
-       db.serialize(function() {
-               db.run(
-                       "UPDATE Problems " +
-                               "fen = " + fen + ", " +
-                               "instructions = " + instructions + ", " +
-                               "solution = " + solution + " " +
-                       "WHERE id = " + id + " AND uid = " + uid);
-       });
-}
+       // 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() {
-               db.run(
-                       "DELETE FROM Problems " +
-                       "WHERE id = " + id + " AND uid = " + uid);
-       });
+       remove: function(id, uid)
+       {
+               db.serialize(function() {
+                       const query =
+                               "DELETE FROM Problems " +
+                               "WHERE id = " + id + " AND uid = " + uid;
+                       db.run(query);
+               });
+       },
 }
+
+module.exports = ProblemModel;