Merge pull request #580 from bluewave-labs/fix/incident-pagination

Fix/incident pagination, resolves #576
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-09 14:54:09 -07:00
commit b3badc7226
12 files changed
+395 -198

No files matched your search

+28
View File
@@ -3,6 +3,8 @@ const {
createCheckBodyValidation,
getChecksParamValidation,
getChecksQueryValidation,
getUserChecksParamValidation,
getUserChecksQueryValidation,
deleteChecksParamValidation,
} = require("../validation/joi");
const { successMessages } = require("../utils/messages");
@@ -60,6 +62,31 @@ const getChecks = async (req, res, next) => {
}
};
const getUserChecks = async (req, res, next) => {
try {
await getUserChecksParamValidation.validateAsync(req.params);
await getUserChecksQueryValidation.validateAsync(req.query);
} catch (error) {
error.status = 422;
error.service = SERVICE_NAME;
error.message =
error.details?.[0]?.message || error.message || "Validation Error";
next(error);
return;
}
try {
const checkData = await req.db.getUserChecks(req);
return res.status(200).json({
success: true,
msg: successMessages.CHECK_GET,
data: checkData,
});
} catch (error) {
error.service = SERVICE_NAME;
next(error);
}
};
const deleteChecks = async (req, res, next) => {
try {
await deleteChecksParamValidation.validateAsync(req.params);
@@ -88,5 +115,6 @@ const deleteChecks = async (req, res, next) => {
module.exports = {
createCheck,
getChecks,
getUserChecks,
deleteChecks,
};
+2
View File
@@ -90,6 +90,7 @@ const {
createCheck,
getChecksCount,
getChecks,
getUserChecks,
deleteChecks,
} = require("./modules/checkModule");
@@ -148,6 +149,7 @@ module.exports = {
createCheck,
getChecksCount,
getChecks,
getUserChecks,
deleteChecks,
createAlert,
getAlertsByUserId,
+106 -14
View File
@@ -1,9 +1,12 @@
const Check = require("../../../models/Check");
const filterLookup = {
const Monitor = require("../../../models/Monitor");
const mongoose = require("mongoose");
const dateRangeLookup = {
day: new Date(new Date().setDate(new Date().getDate() - 1)),
week: new Date(new Date().setDate(new Date().getDate() - 7)),
month: new Date(new Date().setMonth(new Date().getMonth() - 1)),
};
/**
* Create a check for a monitor
* @async
@@ -28,13 +31,32 @@ const createCheck = async (checkData) => {
const getChecksCount = async (req) => {
const monitorId = req.params.monitorId;
const dateRange = req.query.dateRange;
const filter = req.query.filter;
console.log(filter);
// Build query
const checksQuery = { monitorId: monitorId };
// Filter checks by "day", "week", or "month"
if (filter !== undefined) {
checksQuery.createdAt = { $gte: filterLookup[filter] };
if (dateRange !== undefined) {
checksQuery.createdAt = { $gte: dateRangeLookup[dateRange] };
}
if (filter !== undefined) {
checksQuery.status = false;
switch (filter) {
case "all":
break;
case "down":
break;
case "resolve":
checksQuery.statusCode = 5000;
break;
default:
console.log("default");
break;
}
}
const count = await Check.countDocuments(checksQuery);
return count;
};
@@ -50,23 +72,34 @@ const getChecksCount = async (req) => {
const getChecks = async (req) => {
try {
const { monitorId } = req.params;
let { sortOrder, limit, filter, page, rowsPerPage } = req.query;
let { sortOrder, limit, dateRange, filter, page, rowsPerPage } = req.query;
// Default limit to 0 if not provided
if (limit === undefined) limit = 0;
limit = limit === "undefined" ? 0 : limit;
// Default sort order is newest -> oldest
if (sortOrder === "asc") {
sortOrder = 1;
} else if (sortOrder === "desc") {
sortOrder = -1;
} else sortOrder = -1;
sortOrder = sortOrder === "asc" ? 1 : -1;
// Build query
const checksQuery = { monitorId: monitorId };
// Filter checks by "day", "week", or "month"
if (dateRange !== undefined) {
checksQuery.createdAt = { $gte: dateRangeLookup[dateRange] };
}
// Fitler checks by status
if (filter !== undefined) {
checksQuery.createdAt = { $gte: filterLookup[filter] };
checksQuery.status = false;
switch (filter) {
case "all":
break;
case "down":
break;
case "resolve":
checksQuery.statusCode = 5000;
break;
default:
console.log("default");
break;
}
}
// Need to skip and limit here
@@ -84,8 +117,61 @@ const getChecks = async (req) => {
}
};
const getUserChecks = async (req) => {
const { userId } = req.params;
let { sortOrder, limit, dateRange, filter, page, rowsPerPage } = req.query;
// Get monitorIDs
const userMonitors = await Monitor.find({ userId: userId });
const monitorIds = userMonitors.map((monitor) => monitor._id);
//Build check query
// Default limit to 0 if not provided
limit = limit === "undefined" ? 0 : limit;
// Default sort order is newest -> oldest
sortOrder = sortOrder === "asc" ? 1 : -1;
checksQuery = { monitorId: { $in: monitorIds } };
if (filter !== undefined) {
checksQuery.status = false;
switch (filter) {
case "all":
break;
case "down":
break;
case "resolve":
checksQuery.statusCode = 5000;
break;
default:
console.log("default");
break;
}
}
if (dateRange !== undefined) {
checksQuery.createdAt = { $gte: dateRangeLookup[dateRange] };
}
// Skip and limit for pagination
let skip = 0;
if (page && rowsPerPage) {
skip = page * rowsPerPage;
}
const checksCount = await Check.countDocuments(checksQuery);
const checks = await Check.find(checksQuery)
.skip(skip)
.limit(rowsPerPage)
.sort({ createdAt: sortOrder });
return { checksCount, checks };
};
/**
* Delete all checks for a monitor
* Delete all checks for a user
* @async
* @param {string} monitorId
* @returns {number}
@@ -100,4 +186,10 @@ const deleteChecks = async (monitorId) => {
throw error;
}
};
module.exports = { createCheck, getChecksCount, getChecks, deleteChecks };
module.exports = {
createCheck,
getChecksCount,
getChecks,
getUserChecks,
deleteChecks,
};
+13 -12
View File
@@ -4,7 +4,7 @@ const Notification = require("../models/Notification");
/**
* Check Schema for MongoDB collection.
*
*
* Represents a check associated with a monitor, storing information
* about the status and response of a particular check event.
*/
@@ -12,7 +12,7 @@ const CheckSchema = mongoose.Schema(
{
/**
* Reference to the associated Monitor document.
*
*
* @type {mongoose.Schema.Types.ObjectId}
*/
monitorId: {
@@ -22,7 +22,7 @@ const CheckSchema = mongoose.Schema(
},
/**
* Status of the check (true for up, false for down).
*
*
* @type {Boolean}
*/
status: {
@@ -30,23 +30,23 @@ const CheckSchema = mongoose.Schema(
},
/**
* Response time of the check in milliseconds.
*
*
* @type {Number}
*/
responseTime: {
type: Number,
type: Number,
},
/**
* HTTP status code received during the check.
*
*
* @type {Number}
*/
statusCode: {
type: Number,
type: Number,
},
/**
* Message or description of the check result.
*
*
* @type {String}
*/
message: {
@@ -54,7 +54,7 @@ const CheckSchema = mongoose.Schema(
},
/**
* Expiry date of the check, auto-calculated to expire after 30 days.
*
*
* @type {Date}
*/
expiry: {
@@ -70,7 +70,7 @@ const CheckSchema = mongoose.Schema(
/**
* Pre-save middleware to handle status change notifications.
*
*
* This middleware checks if the status of the monitor associated
* with the check has changed and sends notifications if necessary.
*/
@@ -79,7 +79,9 @@ CheckSchema.pre("save", async function (next) {
const monitor = await mongoose.model("Monitor").findById(this.monitorId);
if (monitor) {
const notifications = await Notification.find({ monitorId: this.monitorId });
const notifications = await Notification.find({
monitorId: this.monitorId,
});
// Check if there are any notifications
if (notifications && notifications.length > 0) {
@@ -128,5 +130,4 @@ CheckSchema.pre("save", async function (next) {
}
});
module.exports = mongoose.model("Check", CheckSchema);
+3 -1
View File
@@ -21,4 +21,6 @@ router.delete(
checkController.deleteChecks
);
module.exports = router;
router.get("/user/:userId", checkController.getUserChecks);
module.exports = router;
+17 -1
View File
@@ -235,7 +235,21 @@ const getChecksParamValidation = joi.object({
const getChecksQueryValidation = joi.object({
sortOrder: joi.string().valid("asc", "desc"),
limit: joi.number(),
filter: joi.string().valid("day", "week", "month"),
dateRange: joi.string().valid("day", "week", "month"),
filter: joi.string().valid("all", "down", "resolve"),
page: joi.number(),
rowsPerPage: joi.number(),
});
const getUserChecksParamValidation = joi.object({
userId: joi.string().required(),
});
const getUserChecksQueryValidation = joi.object({
sortOrder: joi.string().valid("asc", "desc"),
limit: joi.number(),
dateRange: joi.string().valid("day", "week", "month"),
filter: joi.string().valid("all", "down", "resolve"),
page: joi.number(),
rowsPerPage: joi.number(),
});
@@ -320,6 +334,8 @@ module.exports = {
createCheckBodyValidation,
getChecksParamValidation,
getChecksQueryValidation,
getUserChecksParamValidation,
getUserChecksQueryValidation,
deleteChecksParamValidation,
deleteUserParamValidation,
getPageSpeedCheckParamValidation,