moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs into 216-waiting-for-caller

This commit is contained in:
Bryan Ashby 2020-07-16 21:34:34 -06:00
parent 28cea6d0c5 24963406ea
commit c53c00c77a
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
2 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/database.js
View File

@ -183,6 +183,11 @@ const DB_INIT_TABLE = {
);`
);
dbs.user.run(
`CREATE INDEX IF NOT EXISTS user_property_id_and_name_index0
ON user_property (user_id, prop_name);`
);
dbs.user.run(
`CREATE TABLE IF NOT EXISTS user_group_member (
group_name VARCHAR NOT NULL,

53
core/user.js
View File

@ -760,45 +760,30 @@ module.exports = class User {
static getUserList(options, cb) {
const userList = [];
const orderClause = 'ORDER BY ' + (options.order || 'user_name');
options.properties = options.properties || [ UserProps.RealName ];
const asList = [];
const joinList = [];
for (let i = 0; i < options.properties.length; ++i) {
const dbProp = options.properties[i];
const propName = options.propsCamelCase ? _.camelCase(dbProp) : dbProp;
asList.push(`p${i}.prop_value AS ${propName}`);
joinList.push(`LEFT OUTER JOIN user_property p${i} ON p${i}.user_id = u.id AND p${i}.prop_name = '${dbProp}'`);
}
userDb.each(
`SELECT id, user_name
FROM user
${orderClause};`,
`SELECT u.id as userId, u.user_name as userName, ${asList.join(', ')}
FROM user u ${joinList.join(' ')}
ORDER BY u.user_name;`,
(err, row) => {
if(row) {
userList.push({
userId : row.id,
userName : row.user_name,
});
if (err) {
return cb(err);
}
userList.push(row);
},
() => {
options.properties = options.properties || [];
async.map(userList, (user, nextUser) => {
userDb.each(
`SELECT prop_name, prop_value
FROM user_property
WHERE user_id = ? AND prop_name IN ("${options.properties.join('","')}");`,
[ user.userId ],
(err, row) => {
if(row) {
if(options.propsCamelCase) {
user[_.camelCase(row.prop_name)] = row.prop_value;
} else {
user[row.prop_name] = row.prop_value;
}
}
},
err => {
return nextUser(err, user);
}
);
},
(err, transformed) => {
return cb(err, transformed);
});
err => {
return cb(err, userList);
}
);
}