X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=0949fc98712c870fae9dd7d13d549ec8b0eae3cb;hb=afd3240d89a2f6191fe9426960dc0c1667b40c77;hp=23a74e81ed7140baadd5aabac8c569f5eb16e39c;hpb=625022fdcf750f0aff8fcd699f7e9b89730e1d10;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index 23a74e81..0949fc98 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -6,45 +6,41 @@ var db = require("../utils/database");
  *   vid: integer (variant id)
  *   fenStart: varchar (initial position)
  *   fen: varchar (current position)
- *   mainTime: integer
- *   addTime: integer (increment)
+ *   timeControl: string
  *   score: varchar (result)
  *
  * Structure table Players:
  *   gid: ref game id
  *   uid: ref user id
  *   color: character
- *   rtime: real (remaining time)
  *
  * Structure table Moves:
  *   gid: ref game id
- *   move: varchar (description)
+ *   squares: varchar (description)
  *   message: text
  *   played: datetime
  *   idx: integer
- *   color: character
  */
 
 const GameModel =
 {
-	// mainTime and increment in milliseconds
-	create: function(vid, fen, mainTime, increment, players, cb)
+	create: function(vid, fen, timeControl, players, cb)
 	{
-		db.serialize({
+		db.serialize(function() {
 			let query =
-				"INSERT INTO Games (vid, fen, mainTime, addTime) " +
-				"VALUES (" + vid + ",'" + fen + "'," + mainTime + "," + increment + ")";
-			db.run(insertQuery, err => {
-				if (!!err)
-					return cb(err);
-				db.get("SELECT last_insert_rowid() AS rowid", (err2,lastId) => {
-					players.forEach(p => {
-						query =
-							"INSERT INTO Players VALUES " +
-							"(" + lastId["rowid"] + "," + p.id + "," + p.color + "," + mainTime + ")";
-						db.run(query, cb);
-					});
-				});
+				"INSERT INTO Games (vid, fenStart, fen, score, timeControl) VALUES " +
+        "(" + vid + ",'" + fen + "','" + fen + "','*','" + timeControl + "')";
+      db.run(query, function(err) {
+        if (!!err)
+          return cb(err);
+        players.forEach((p,idx) => {
+          const color = (idx==0 ? "w" : "b");
+          query =
+            "INSERT INTO Players VALUES " +
+            "(" + this.lastID + "," + p.id + ",'" + color + "')";
+          db.run(query);
+        });
+        cb(null, {gid: this.lastID});
 			});
 		});
 	},
@@ -53,40 +49,40 @@ const GameModel =
 	getOne: function(id, cb)
 	{
 		db.serialize(function() {
+      // TODO: optimize queries?
 			let query =
-				"SELECT v.name AS vname, g.fen, g.fenStart, g.score " +
+				"SELECT g.id, g.vid, g.fen, g.fenStart, g.timeControl, g.score, " +
+          "v.name AS vname " +
 				"FROM Games g " +
-				"JOIN Variants v " +
-				"  ON g.vid = v.id "
-				"WHERE id = " + id;
+        "JOIN Variants v " +
+        "  ON g.vid = v.id " +
+				"WHERE g.id = " + id;
 			db.get(query, (err,gameInfo) => {
 				if (!!err)
 					return cb(err);
 				query =
-					"SELECT p.uid AS id, p.color, p.rtime, u.name " +
+					"SELECT p.uid, p.color, u.name " +
 					"FROM Players p " +
-					"JOIN Users u " +
-					"  ON p.uid = u.id " +
+          "JOIN Users u " +
+          "  ON p.uid = u.id " +
 					"WHERE p.gid = " + id;
-				db.run(query, (err2,players) => {
+				db.all(query, (err2,players) => {
 					if (!!err2)
 						return cb(err2);
 					query =
-						"SELECT move AS desc, message, played, idx, color " +
+						"SELECT squares, message, played, idx " +
 						"FROM Moves " +
 						"WHERE gid = " + id;
-					db.run(query, (err3,moves) => {
+					db.all(query, (err3,moves) => {
 						if (!!err3)
 							return cb(err3);
-						const game = {
-							id: id,
-							vname: gameInfo.vname,
-							fenStart: gameInfo.fenStart,
-							fen: gameInfo.fen,
-							score: gameInfo.score,
-							players: players,
-							moves: moves,
-						};
+						const game = Object.assign({},
+              gameInfo,
+						  {
+							  players: players,
+							  moves: moves
+              }
+            );
 						return cb(null, game);
 					});
 				});
@@ -94,30 +90,73 @@ const GameModel =
 		});
 	},
 
-	getByUser: function(uid, cb)
+	getByUser: function(uid, excluded, cb)
 	{
 		db.serialize(function() {
 			// Next query is fine because a player appear at most once in a game
 			const query =
 				"SELECT gid " +
 				"FROM Players " +
-				"WHERE uid = " + uid;
-			db.run(query, (err,gameIds) => {
+				"WHERE uid " + (excluded ? "<>" : "=") + " " + uid;
+			db.all(query, (err,gameIds) => {
 				if (!!err)
 					return cb(err);
+        gameIds = gameIds || []; //might be empty
 				let gameArray = [];
-				gameIds.forEach(gidRow => {
-					GameModel.getOne(gidRow["gid"], (err2,game) => {
+				for (let i=0; i<gameIds.length; i++)
+				{
+					GameModel.getOne(gameIds[i]["gid"], (err2,game) => {
 						if (!!err2)
 							return cb(err2);
 						gameArray.push(game);
+						// Call callback function only when gameArray is complete:
+						if (i == gameIds.length - 1)
+							return cb(null, gameArray);
 					});
-				});
-				return cb(null, gameArray);
+				}
 			});
 		});
 	},
 
+  getPlayers: function(id, cb)
+  {
+    db.serialize(function() {
+      const query =
+        "SELECT id " +
+        "FROM Players " +
+        "WHERE gid = " + id;
+      db.all(query, (err,players) => {
+        return cb(err, players);
+      });
+    });
+  },
+
+  // obj can have fields move, fen and/or score
+  update: function(id, obj)
+  {
+		db.parallelize(function() {
+      let query =
+        "UPDATE Games " +
+        "SET ";
+      if (!!obj.fen)
+        query += "fen = '" + obj.fen + "',";
+      if (!!obj.score)
+        query += "score = '" + obj.score + "',";
+      query = query.slice(0,-1); //remove last comma
+      query += " WHERE id = " + id;
+      db.run(query);
+      if (!!obj.move)
+      {
+        const m = obj.move;
+        query =
+          "INSERT INTO Moves (gid, squares, message, played, idx) VALUES " +
+          "(" + id + ",'" + JSON.stringify(m.squares) + "','" + m.message +
+            "'," + m.played + "," + m.idx + ")";
+        db.run(query);
+      }
+    });
+  },
+
 	remove: function(id)
 	{
 		db.parallelize(function() {