mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-16 10:47:32 -05:00
cache system data
This commit is contained in:
@@ -12,6 +12,9 @@ const mailjet = new Mailjet({
|
|||||||
apiSecret: process.env['MAILJET_SECRET']
|
apiSecret: process.env['MAILJET_SECRET']
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var systemList = [];
|
||||||
|
var systemListTime = Date.now();
|
||||||
|
|
||||||
exports.contact_system = async function(req, res) {
|
exports.contact_system = async function(req, res) {
|
||||||
var system = await System.findOne({
|
var system = await System.findOne({
|
||||||
shortName: req.params.shortName.toLowerCase()
|
shortName: req.params.shortName.toLowerCase()
|
||||||
@@ -97,11 +100,59 @@ exports.contact_system = async function(req, res) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.get_systems = async function (req, res) {
|
async function load_systems(systemClients) {
|
||||||
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
||||||
//const results = await System.find({lastActive: {$gte: fromDate}}).populate('userId', "screenName").catch( err => {
|
const results = await System.find({lastActive: {$gte: fromDate}}).populate('userId', "screenName").catch( err => {
|
||||||
//const results = await System.find({active: true}).populate('userId', "screenName").catch( err => {
|
//const results = await System.find({active: true}).populate('userId', "screenName").catch( err => {
|
||||||
const results = await System.find({active: true}).catch( err => {
|
//const results = await System.find({active: true}).catch( err => { // super simple query
|
||||||
|
console.error("Error - get_systems: " + err.message);
|
||||||
|
});
|
||||||
|
systemList = [];
|
||||||
|
for (var result in results) {
|
||||||
|
|
||||||
|
var clientCount = 0;
|
||||||
|
if (systemClients.hasOwnProperty(results[result].shortName)) {
|
||||||
|
clientCount = systemClients[results[result].shortName];
|
||||||
|
}
|
||||||
|
var system = {
|
||||||
|
name: results[result].name,
|
||||||
|
shortName: results[result].shortName,
|
||||||
|
systemType: results[result].systemType,
|
||||||
|
county: results[result].county,
|
||||||
|
country: results[result].country,
|
||||||
|
city: results[result].city,
|
||||||
|
state: results[result].state,
|
||||||
|
active: results[result].active,
|
||||||
|
lastActive: results[result].lastActive,
|
||||||
|
callAvg: results[result].callAvg,
|
||||||
|
description: results[result].description,
|
||||||
|
status: results[result].status,
|
||||||
|
allowContact: results[result].allowContact,
|
||||||
|
clientCount: clientCount
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
if (results[result].showScreenName && results[result].userId) {
|
||||||
|
system.screenName = results[result].userId.screenName
|
||||||
|
} else {
|
||||||
|
system.screenName = null;
|
||||||
|
}*/
|
||||||
|
system.screenName = null;
|
||||||
|
systemList.push(system);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
exports.get_systems = async function (req, res) {
|
||||||
|
if ((systemList.length == 0) || (systemListTime < (Date.now() - 60 * 1000 * 15))) {
|
||||||
|
await load_systems(req.systemClients);
|
||||||
|
systemListTime = Date.now();
|
||||||
|
}
|
||||||
|
|
||||||
|
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
||||||
|
const results = await System.find({lastActive: {$gte: fromDate}}).populate('userId', "screenName").catch( err => {
|
||||||
|
//const results = await System.find({active: true}).populate('userId', "screenName").catch( err => {
|
||||||
|
//const results = await System.find({active: true}).catch( err => { // super simple query
|
||||||
console.error("Error - get_systems: " + err.message);
|
console.error("Error - get_systems: " + err.message);
|
||||||
res.status(500);
|
res.status(500);
|
||||||
res.json({
|
res.json({
|
||||||
|
|||||||
@@ -15,19 +15,20 @@ async function updateActiveSystems() {
|
|||||||
// go through all the systems
|
// go through all the systems
|
||||||
// if you have received some calls during that last period, make the system active
|
// if you have received some calls during that last period, make the system active
|
||||||
if ((callTotals[item.shortName] != undefined) && (callTotals[item.shortName][0] > 0)) {
|
if ((callTotals[item.shortName] != undefined) && (callTotals[item.shortName][0] > 0)) {
|
||||||
//item.active = true;
|
item.active = true;
|
||||||
item.callAvg = callTotals[item.shortName][0] / timePeriod;
|
item.callAvg = callTotals[item.shortName][0] / timePeriod;
|
||||||
item.lastActive = new Date();
|
item.lastActive = new Date();
|
||||||
} else {
|
} else {
|
||||||
//item.active = false;
|
item.active = false;
|
||||||
item.callAvg = 0;
|
item.callAvg = 0;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
||||||
if ((item.lastActive != null) && (item.lastActive > fromDate)) {
|
if ((item.lastActive != null) && (item.lastActive > fromDate)) {
|
||||||
item.active = true;
|
item.active = true;
|
||||||
} else {
|
} else {
|
||||||
item.active = false;
|
item.active = false;
|
||||||
}
|
}*/
|
||||||
await item.save();
|
await item.save();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user