Skip to content

Commit d08947a

Browse files
authored
Merge pull request #903 from prikshittekta/no-user-report
send email report if user not found
2 parents 6456aa0 + a3b10ef commit d08947a

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

plugins/reports/api/reports.js

+14-5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var reportsInstance = {},
1212
countlyCommon = require('../../../api/lib/countly.common.js'),
1313
localize = require('../../../api/utils/localization.js'),
1414
common = require('../../../api/utils/common.js'),
15+
log = require('../../../api/utils/log')('reports:reports'),
1516
versionInfo = require('../../../frontend/express/version.info');
1617

1718
versionInfo.page = (!versionInfo.title) ? "https://count.ly" : null;
@@ -80,12 +81,20 @@ var metrics = {
8081
* @param {func} cb - callback function
8182
*/
8283
function findMember(cb) {
83-
db.collection('members').findOne({_id: db.ObjectID(report.user)}, function(err, member) {
84-
if (err) {
85-
return cb(err);
84+
db.collection('members').findOne({_id: db.ObjectID(report.user)}, function(err1, member) {
85+
if (!err1 && member) {
86+
return cb(null, member);
8687
}
8788

88-
return cb(null, member);
89+
db.collection('members').findOne({global_admin: true}, function(err2, globalAdmin) {
90+
if (!err2 && globalAdmin) {
91+
log.d("Report user not found. Updating it to the global admin.");
92+
report.user = globalAdmin._id;
93+
return cb(null, globalAdmin);
94+
}
95+
96+
return cb(err2);
97+
});
8998
});
9099
}
91100
/**
@@ -242,7 +251,7 @@ var metrics = {
242251
}
243252
}
244253
if (err || !data[0]) {
245-
return callback("No data to report", {report: report});
254+
return callback("Report user not found.", {report: report});
246255
}
247256

248257
var member = data[0];

0 commit comments

Comments
 (0)