projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Atomic1 & 2
[vchess.git]
/
server
/
models
/
User.js
diff --git
a/server/models/User.js
b/server/models/User.js
index
c50cdb7
..
655012d
100644
(file)
--- a/
server/models/User.js
+++ b/
server/models/User.js
@@
-2,10
+2,11
@@
const db = require("../utils/database");
const genToken = require("../utils/tokenGenerator");
const params = require("../config/parameters");
const sendEmail = require('../utils/mailer');
const genToken = require("../utils/tokenGenerator");
const params = require("../config/parameters");
const sendEmail = require('../utils/mailer');
+const { exec } = require("child_process");
/*
* Structure:
/*
* Structure:
- *
_
id: integer
+ * id: integer
* name: varchar
* email: varchar
* loginToken: token on server only
* name: varchar
* email: varchar
* loginToken: token on server only
@@
-17,6
+18,7
@@
const sendEmail = require('../utils/mailer');
*/
const UserModel = {
*/
const UserModel = {
+
checkNameEmail: function(o) {
return (
(!o.name || !!(o.name.match(/^[\w-]+$/))) &&
checkNameEmail: function(o) {
return (
(!o.name || !!(o.name.match(/^[\w-]+$/))) &&
@@
-37,11
+39,11
@@
const UserModel = {
},
// Find one user by id, name, email, or token
},
// Find one user by id, name, email, or token
- getOne: function(by, value, cb) {
+ getOne: function(by, value,
fields,
cb) {
const delimiter = (typeof value === "string" ? "'" : "");
db.serialize(function() {
const query =
const delimiter = (typeof value === "string" ? "'" : "");
db.serialize(function() {
const query =
- "SELECT
*
" +
+ "SELECT
" + fields + "
" +
"FROM Users " +
"WHERE " + by + " = " + delimiter + value + delimiter;
db.get(query, cb);
"FROM Users " +
"WHERE " + by + " = " + delimiter + value + delimiter;
db.get(query, cb);
@@
-139,7
+141,7
@@
const UserModel = {
},
tryNotify: function(id, message) {
},
tryNotify: function(id, message) {
- UserModel.getOne("id", id,
(err,
user) => {
+ UserModel.getOne("id", id,
"name, email, notify", (err,
user) => {
if (!err && user.notify) UserModel.notify(user, message);
});
},
if (!err && user.notify) UserModel.notify(user, message);
});
},
@@
-170,14
+172,18
@@
const UserModel = {
}
});
if (toRemove.length > 0) {
}
});
if (toRemove.length > 0) {
+ const remArg = toRemove.join(",");
db.run(
"DELETE FROM Users " +
db.run(
"DELETE FROM Users " +
- "WHERE id IN (" +
toRemove.join(",")
+ ")"
+ "WHERE id IN (" +
remArg
+ ")"
);
);
+ // Update tournament DB:
+ exec(params.tourneyPath + "/dbsync/delete_users.py " + remArg);
}
});
});
}
});
});
- },
-}
+ }
+
+};
module.exports = UserModel;
module.exports = UserModel;