diff --git a/server/diagnostics.js b/server/diagnostics.js index 7ec9c0f..ca7a376 100644 --- a/server/diagnostics.js +++ b/server/diagnostics.js @@ -9,7 +9,7 @@ let { log } = require('../common/utilities.js'); const runDailyDiagnostics = (connection) => { let dailyJob = new CronJob('0 0 * * * *', () => { - let query = 'INSERT INTO diagnostics (playerCount, totalGold, totalRecruitments, totalDeaths, totalCombats) VALUES ((SELECT COUNT(*) FROM profiles), (SELECT SUM(gold) FROM profiles), (IFNULL((SELECT SUM(quantity) FROM diagnosticsEvents WHERE eventName = "recruit"), 0)), (IFNULL((SELECT SUM(quantity) FROM diagnosticsEvents WHERE eventName = "death"), 0)), (SELECT COUNT(*) FROM pastCombat WHERE eventTime >= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 DAY)));'; + let query = 'INSERT INTO diagnostics (playerCount, returnedPlayerCount, totalGold, totalRecruitments, totalDeaths, totalCombats) VALUES ((SELECT COUNT(*) FROM profiles), (SELECT COUNT(*) FROM profiles WHERE (recruits + soldiers + spies + scientists) >= 2), (SELECT SUM(gold) FROM profiles), (IFNULL((SELECT SUM(quantity) FROM diagnosticsEvents WHERE eventName = "recruit"), 0)), (IFNULL((SELECT SUM(quantity) FROM diagnosticsEvents WHERE eventName = "death"), 0)), (SELECT COUNT(*) FROM pastCombat WHERE eventTime >= DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 DAY)));'; connection.query(query, (err) => { if (err) throw err; diff --git a/sql/create_database_structure.sql b/sql/create_database_structure.sql index da0568e..89cdaf9 100644 --- a/sql/create_database_structure.sql +++ b/sql/create_database_structure.sql @@ -4,6 +4,7 @@ CREATE TABLE IF NOT EXISTS diagnostics ( td TIMESTAMP DEFAULT CURRENT_TIMESTAMP(), playerCount INTEGER NOT NULL DEFAULT 0, + returnedPlayerCount INTEGER NOT NULL DEFAULT 0, totalGold INTEGER NOT NULL DEFAULT 0, totalRecruitments INTEGER NOT NULL DEFAULT 0, totalDeaths INTEGER NOT NULL DEFAULT 0,