zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-07-20 17:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

TopX mciMap standardized on "value" vs (propName, logName, etc.)

Browse source
This commit is contained in:
Bryan Ashby 2019-01-20 21:57:31 -07:00
parent 34f0afc175
commit 18a7a79f14
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/top_x.js
View file

@ -9,7 +9,6 @@ const { Errors } = require('./enig_error.js');
const UserDb = require('./database.js').dbs.user;
const SysDb = require('./database.js').dbs.system;
const User = require('./user.js');
const stringFormat = require('./string_format.js');
// deps
const _ = require('lodash');
@ -68,7 +67,7 @@ exports.getModule = class TopXModule extends MenuModule {
const type = o.type;
switch(type) {
case 'userProp' :
if(!userPropValues.includes(o.propName)) {
if(!userPropValues.includes(o.value)) {
return false;
}
// VM# must exist for this mci
@ -78,7 +77,7 @@ exports.getModule = class TopXModule extends MenuModule {
break;
case 'userEventLog' :
if(!userLogValues.includes(o.logName)) {
if(!userLogValues.includes(o.value)) {
return false;
}
// VM# must exist for this mci
@ -122,7 +121,7 @@ exports.getModule = class TopXModule extends MenuModule {
return cb(Errors.UnexpectedState(`Failed to get view for MCI ${mciCode}`));
}
const type = this.config.mciMap[mciCode].type;
const type = this.config.mciMap[mciCode].type;
switch(type) {
case 'userProp' : return this.populateTopXUserProp(listView, mciCode, cb);
case 'userEventLog' : return this.populateTopXUserEventLog(listView, mciCode, cb);
@ -148,9 +147,10 @@ exports.getModule = class TopXModule extends MenuModule {
}
populateTopXUserEventLog(listView, mciCode, cb) {
const count = listView.dimens.height || 1;
const daysBack = this.config.mciMap[mciCode].daysBack;
const shouldSum = _.get(this.config.mciMap[mciCode], 'sum', true);
const mciMap = this.config.mciMap[mciCode];
const count = listView.dimens.height || 1;
const daysBack = mciMap.daysBack;
const shouldSum = _.get(mciMap, 'sum', true);
const valueSql = shouldSum ? 'SUM(CAST(log_value AS INTEGER))' : 'COUNT()';
const dateSql = daysBack ? `AND DATETIME(timestamp) >= DATETIME('now', '-${daysBack} days')` : '';
@ -162,7 +162,7 @@ exports.getModule = class TopXModule extends MenuModule {
GROUP BY user_id
ORDER BY value DESC
LIMIT ${count};`,
[ this.config.mciMap[mciCode].logName ],
[ mciMap.value ],
(err, rows) => {
if(err) {
return cb(err);
@ -188,7 +188,7 @@ exports.getModule = class TopXModule extends MenuModule {
WHERE prop_name = ?
ORDER BY value DESC
LIMIT ${count};`,
[ this.config.mciMap[mciCode].propName ],
[ this.config.mciMap[mciCode].value ],
(err, rows) => {
if(err) {
return cb(err);