add filter param, implement filter
This commit is contained in:
1 parent
637641f44f
commit
7e1a5b6ec8
3 files changed
+30
-15
No files matched your search
@@ -98,7 +98,7 @@ class NetworkService {
|
||||
limit,
|
||||
types,
|
||||
status,
|
||||
sortOrder,
|
||||
checkOrder,
|
||||
normalize,
|
||||
page,
|
||||
rowsPerPage
|
||||
@@ -112,7 +112,7 @@ class NetworkService {
|
||||
});
|
||||
}
|
||||
if (status) params.append("status", status);
|
||||
if (sortOrder) params.append("sortOrder", sortOrder);
|
||||
if (checkOrder) params.append("checkOrder", checkOrder);
|
||||
if (normalize) params.append("normalize", normalize);
|
||||
if (page) params.append("page", page);
|
||||
if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
|
||||
|
||||
@@ -347,13 +347,25 @@ const getMonitorsAndSummaryByTeamId = async (teamId, type) => {
|
||||
*/
|
||||
const getMonitorsByTeamId = async (req, res) => {
|
||||
try {
|
||||
let { limit, type, status, sortOrder, normalize, page, rowsPerPage } =
|
||||
req.query || {};
|
||||
const monitorQuery = { teamId: req.params.teamId };
|
||||
const monitorsCount = await Monitor.countDocuments({
|
||||
teamId: req.params.teamId,
|
||||
let {
|
||||
limit,
|
||||
type,
|
||||
});
|
||||
status,
|
||||
checkOrder,
|
||||
normalize,
|
||||
page,
|
||||
rowsPerPage,
|
||||
filter,
|
||||
} = req.query || {};
|
||||
const monitorQuery = { teamId: req.params.teamId, type };
|
||||
// Add filter if provided
|
||||
if (filter !== undefined) {
|
||||
monitorQuery.$or = [
|
||||
{ name: { $regex: filter, $options: "i" } },
|
||||
{ url: { $regex: filter, $options: "i" } },
|
||||
];
|
||||
}
|
||||
const monitorsCount = await Monitor.countDocuments(monitorQuery);
|
||||
|
||||
// Pagination
|
||||
let skip = 0;
|
||||
@@ -367,11 +379,11 @@ const getMonitorsByTeamId = async (req, res) => {
|
||||
}
|
||||
|
||||
// Default sort order is newest -> oldest
|
||||
if (sortOrder === "asc") {
|
||||
sortOrder = 1;
|
||||
} else if (sortOrder === "desc") {
|
||||
sortOrder = -1;
|
||||
} else sortOrder = -1;
|
||||
if (checkOrder === "asc") {
|
||||
checkOrder = 1;
|
||||
} else if (checkOrder === "desc") {
|
||||
checkOrder = -1;
|
||||
} else checkOrder = -1;
|
||||
|
||||
const monitors = await Monitor.find(monitorQuery)
|
||||
.skip(skip)
|
||||
@@ -402,7 +414,7 @@ const getMonitorsByTeamId = async (req, res) => {
|
||||
let checks = await model
|
||||
.find(checksQuery)
|
||||
.sort({
|
||||
createdAt: sortOrder,
|
||||
createdAt: checkOrder,
|
||||
})
|
||||
.limit(limit);
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ const getMonitorsByTeamIdValidation = joi.object({
|
||||
|
||||
const getMonitorsByTeamIdQueryValidation = joi.object({
|
||||
status: joi.boolean(),
|
||||
sortOrder: joi.string().valid("asc", "desc"),
|
||||
checkOrder: joi.string().valid("asc", "desc"),
|
||||
limit: joi.number(),
|
||||
normalize: joi.boolean(),
|
||||
type: joi
|
||||
@@ -191,6 +191,9 @@ const getMonitorsByTeamIdQueryValidation = joi.object({
|
||||
),
|
||||
page: joi.number(),
|
||||
rowsPerPage: joi.number(),
|
||||
filter: joi.string(),
|
||||
field: joi.string(),
|
||||
order: joi.string().valid("asc", "desc"),
|
||||
});
|
||||
|
||||
const getMonitorStatsByIdParamValidation = joi.object({
|
||||
|
||||
Reference in new issue
Block a user