projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes + add some debug traces
[vchess.git]
/
server
/
models
/
Challenge.js
diff --git
a/server/models/Challenge.js
b/server/models/Challenge.js
index
6f8ba0b
..
a5fbf63
100644
(file)
--- a/
server/models/Challenge.js
+++ b/
server/models/Challenge.js
@@
-78,12
+78,15
@@
const ChallengeModel =
db.get(query, (err,challengeInfo) => {
if (!!err)
return cb(err);
db.get(query, (err,challengeInfo) => {
if (!!err)
return cb(err);
+ let condition = "";
+ if (!!challengeInfo.to[0])
+ condition = " AND u.name in (" + challengeInfo.to.join(",") + ")";
query =
"SELECT w.uid AS id, u.name " +
"FROM WillPlay w " +
"JOIN Users u " +
" ON w.uid = u.id " +
query =
"SELECT w.uid AS id, u.name " +
"FROM WillPlay w " +
"JOIN Users u " +
" ON w.uid = u.id " +
- "WHERE w.cid = " + id;
+ "WHERE w.cid = " + id
+ condition
;
db.run(query, (err2,players) => {
if (!!err2)
return cb(err2);
db.run(query, (err2,players) => {
if (!!err2)
return cb(err2);
@@
-113,6
+116,7
@@
const ChallengeModel =
db.run(query, (err,challIds) => {
if (!!err)
return cb(err);
db.run(query, (err,challIds) => {
if (!!err)
return cb(err);
+ challIds = challIds || [];
let challenges = [];
challIds.forEach(cidRow => {
ChallengeModel.getOne(cidRow["cid"], (err2,chall) => {
let challenges = [];
challIds.forEach(cidRow => {
ChallengeModel.getOne(cidRow["cid"], (err2,chall) => {