Skip to content

Commit f43131c

Browse files
authored
Merge pull request #680 from waiterZen/guidelines-waiter2
[eslint] update for reports & alerts & sources
2 parents 5ee5145 + f90dfb7 commit f43131c

File tree

5 files changed

+411
-314
lines changed

5 files changed

+411
-314
lines changed

plugins/alerts/api/api.js

+33-25
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
const plugin = {};
21
const common = require('../../../api/utils/common.js');
32
const plugins = require('../../pluginManager.js');
43
const log = require('../../../api/utils/log.js')('alert:api');
@@ -7,26 +6,36 @@ const JOB = require('../../../api/parts/jobs');
76
const utils = require('./parts/utils');
87
const _ = require('lodash');
98

10-
(function(plugin) {
11-
9+
(function() {
10+
/**
11+
* delete alert job
12+
* @param {string} alertID - alert record id from db
13+
* @param {function} callback - callback after deleting
14+
*/
1215
function deleteJob(alertID, callback) {
13-
common.db.collection("jobs").remove({ 'data.alertID': alertID }, function(err, result) {
16+
common.db.collection("jobs").remove({ 'data.alertID': alertID }, function() {
1417
log.d('delete job, alertID:', alertID);
1518
if (callback) {
1619
callback();
1720
}
1821
});
1922
}
2023

24+
/**
25+
* update alert job
26+
* @param {object} alert - alert record data
27+
*/
2128
function updateJobForAlert(alert) {
2229
if (alert.enabled) {
2330
JOB.job('alerts:monitor', { alertID: alert._id }).replace().schedule(alert.period);
2431
}
2532
else {
26-
deleteJob(alert._id);
33+
deleteJob(alert._id);
2734
}
2835
}
29-
36+
/**
37+
* load job list
38+
*/
3039
function loadJobs() {
3140
common.db.collection("alerts").find({})
3241
.toArray(function(err, alertsList) {
@@ -41,7 +50,7 @@ const _ = require('lodash');
4150
}
4251

4352

44-
plugins.register("/master", function(ob) {
53+
plugins.register("/master", function() {
4554
loadJobs();
4655
});
4756

@@ -65,7 +74,7 @@ const _ = require('lodash');
6574

6675

6776
plugins.register("/i/alert/save", function(ob) {
68-
let params = ob.params;
77+
let paramsInstance = ob.params;
6978
let validateUserForWriteAPI = ob.validateUserForWriteAPI;
7079

7180
validateUserForWriteAPI(function(params) {
@@ -112,12 +121,12 @@ const _ = require('lodash');
112121
log.e('Parse alert failed', alertConfig);
113122
common.returnMessage(params, 500, "Failed to create an alert");
114123
}
115-
}, params);
124+
}, paramsInstance);
116125
return true;
117126
});
118127

119128
plugins.register("/i/alert/delete", function(ob) {
120-
let params = ob.params;
129+
let paramsInstance = ob.params;
121130
let validateUserForWriteAPI = ob.validateUserForWriteAPI;
122131

123132
validateUserForWriteAPI(function(params) {
@@ -138,12 +147,12 @@ const _ = require('lodash');
138147
log.e('delete alert failed', alertID);
139148
common.returnMessage(params, 500, "Failed to delete an alert");
140149
}
141-
}, params);
150+
}, paramsInstance);
142151
return true;
143152
});
144153

145154
plugins.register("/i/alert/status", function(ob) {
146-
let params = ob.params;
155+
let paramsInstance = ob.params;
147156
let validateUserForWriteAPI = ob.validateUserForWriteAPI;
148157
validateUserForWriteAPI(function(params) {
149158
const statusList = JSON.parse(params.qstring.status);
@@ -163,25 +172,30 @@ const _ = require('lodash');
163172
plugins.dispatch("/updateAlert", { method: "alertTrigger" });
164173
common.returnOutput(params, result);
165174
});
166-
}, params);
175+
}, paramsInstance);
167176
return true;
168177
});
169178

170179

171180
plugins.register("/o/alert/list", function(ob) {
172-
const params = ob.params;
181+
const paramsInstance = ob.params;
173182
let validateUserForWriteAPI = ob.validateUserForWriteAPI;
174183
validateUserForWriteAPI(function(params) {
175184
try {
176185
let query = {};
177186
let count_query = { _id: 'meta'};
178-
if (params.member.global_admin != true) {
187+
if (params.member.global_admin !== true) {
179188
query = { createdBy: params.member._id};
180189
count_query = {_id: 'email:' + params.member.email};
181190
}
182191
common.db.collection("alerts").find(query).toArray(function(err, alertsList) {
183-
common.db.collection('members').find({}).toArray(function(err, members) {
184-
192+
if (err) {
193+
return log.e('got error in listing alerts: %j', err);
194+
}
195+
common.db.collection('members').find({}).toArray(function(err2, members) {
196+
if (err2) {
197+
return log.e('got error in finding members: %j', err2);
198+
}
185199
utils.getAlertCount(count_query, (count) => {
186200
count.r = 0;
187201
alertsList.forEach((a) => {
@@ -198,13 +212,7 @@ const _ = require('lodash');
198212
log.e('get alert list failed');
199213
common.returnMessage(params, 500, "Failed to get alert list");
200214
}
201-
}, params);
215+
}, paramsInstance);
202216
return true;
203217
});
204-
205-
206-
207-
208-
}(plugin));
209-
210-
module.exports = plugin;
218+
}());

0 commit comments

Comments
 (0)