Merge pull request #731 from bluewave-labs/feat/monitor-team

Feat/monitor team, resolves #725
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-27 13:02:28 -07:00
commit 7372449826
9 files changed
+37 -27

No files matched your search

@@ -33,9 +33,9 @@ export const getUptimeMonitorsByUserId = createAsyncThunk(
async (token, thunkApi) => {
const user = jwtDecode(token);
try {
const res = await networkService.getMonitorsByUserId(
const res = await networkService.getMonitorsByTeamId(
token,
user._id,
user.teamId,
25,
["http", "ping"],
null,
@@ -118,9 +118,11 @@ const CreateMonitor = () => {
form = {
...form,
description: form.name,
teamId: user.teamId,
userId: user._id,
notifications: monitor.notifications,
};
console.log(form);
const action = await dispatch(
createUptimeMonitor({ authToken, monitor: form })
);
+3 -3
View File
@@ -52,9 +52,9 @@ class NetworkService {
* @param {boolean} [normalize] - Whether to normalize the retrieved monitors.
* @returns {Promise<AxiosResponse>} The response from the axios GET request.
*/
async getMonitorsByUserId(
async getMonitorsByTeamId(
authToken,
userId,
teamId,
limit,
types,
status,
@@ -74,7 +74,7 @@ class NetworkService {
if (normalize) params.append("normalize", normalize);
return this.axiosInstance.get(
`/monitors/user/${userId}?${params.toString()}`,
`/monitors/team/${teamId}?${params.toString()}`,
{
headers: {
Authorization: `Bearer ${authToken}`,
+9 -9
View File
@@ -1,10 +1,10 @@
const {
getMonitorByIdParamValidation,
getMonitorByIdQueryValidation,
getMonitorsByUserIdValidation,
getMonitorsByTeamIdValidation,
createMonitorBodyValidation,
editMonitorBodyValidation,
getMonitorsByUserIdQueryValidation,
getMonitorsByTeamIdQueryValidation,
} = require("../validation/joi");
const sslChecker = require("ssl-checker");
@@ -149,10 +149,10 @@ const getMonitorById = async (req, res, next) => {
* @returns {Promise<Express.Response>}
* @throws {Error}
*/
const getMonitorsByUserId = async (req, res, next) => {
const getMonitorsByTeamId = async (req, res, next) => {
try {
await getMonitorsByUserIdValidation.validateAsync(req.params);
await getMonitorsByUserIdQueryValidation.validateAsync(req.query);
await getMonitorsByTeamIdValidation.validateAsync(req.params);
await getMonitorsByTeamIdQueryValidation.validateAsync(req.query);
} catch (error) {
error.status = 422;
error.service = SERVICE_NAME;
@@ -163,12 +163,12 @@ const getMonitorsByUserId = async (req, res, next) => {
}
try {
const userId = req.params.userId;
const monitors = await req.db.getMonitorsByUserId(req, res);
const teamId = req.params.teamId;
const monitors = await req.db.getMonitorsByTeamId(req, res);
return res.json({
success: true,
msg: successMessages.MONITOR_GET_BY_USER_ID(userId),
msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
data: monitors,
});
} catch (error) {
@@ -342,7 +342,7 @@ module.exports = {
getMonitorStatsById,
getMonitorCertificate,
getMonitorById,
getMonitorsByUserId,
getMonitorsByTeamId,
createMonitor,
deleteMonitor,
deleteAllMonitors,
+2 -2
View File
@@ -66,7 +66,7 @@ const {
getAllMonitors,
getMonitorStatsById,
getMonitorById,
getMonitorsByUserId,
getMonitorsByTeamId,
createMonitor,
deleteMonitor,
deleteAllMonitors,
@@ -145,7 +145,7 @@ module.exports = {
getAllMonitors,
getMonitorStatsById,
getMonitorById,
getMonitorsByUserId,
getMonitorsByTeamId,
createMonitor,
deleteMonitor,
deleteAllMonitors,
+5 -5
View File
@@ -287,17 +287,17 @@ const getMonitorById = async (monitorId) => {
};
/**
* Get monitors by UserID
* Get monitors by TeamID
* @async
* @param {Express.Request} req
* @param {Express.Response} res
* @returns {Promise<Array<Monitor>>}
* @throws {Error}
*/
const getMonitorsByUserId = async (req, res) => {
const getMonitorsByTeamId = async (req, res) => {
try {
let { limit, type, status, sortOrder, normalize } = req.query || {};
const monitorQuery = { userId: req.params.userId };
const monitorQuery = { teamId: req.params.teamId };
if (type !== undefined) {
const types = Array.isArray(type) ? type : [type];
@@ -364,10 +364,10 @@ const getMonitorsByUserId = async (req, res) => {
*/
const createMonitor = async (req, res) => {
try {
console.log(req.body);
const monitor = new Monitor({ ...req.body });
// Remove notifications fom monitor as they aren't needed here
monitor.notifications = undefined;
monitor.userId = req.user._id;
await monitor.save();
return monitor;
} catch (error) {
@@ -453,7 +453,7 @@ module.exports = {
getAllMonitors,
getMonitorStatsById,
getMonitorById,
getMonitorsByUserId,
getMonitorsByTeamId,
createMonitor,
deleteMonitor,
deleteAllMonitors,
+7
View File
@@ -6,6 +6,13 @@ const MonitorSchema = mongoose.Schema(
type: mongoose.Schema.Types.ObjectId,
ref: "User",
immutable: true,
required: true,
},
teamId: {
type: mongoose.Schema.Types.ObjectId,
ref: "Team",
immutable: true,
required: true,
},
name: {
type: String,
+1 -1
View File
@@ -7,7 +7,7 @@ router.get("/", monitorController.getAllMonitors);
router.get("/stats/:monitorId", monitorController.getMonitorStatsById);
router.get("/certificate/:monitorId", monitorController.getMonitorCertificate);
router.get("/:monitorId", monitorController.getMonitorById);
router.get("/user/:userId", monitorController.getMonitorsByUserId);
router.get("/team/:teamId", monitorController.getMonitorsByTeamId);
router.post("/", monitorController.createMonitor);
router.delete(
+6 -5
View File
@@ -160,11 +160,11 @@ const getMonitorByIdQueryValidation = joi.object({
normalize: joi.boolean(),
});
const getMonitorsByUserIdValidation = joi.object({
userId: joi.string().required(),
const getMonitorsByTeamIdValidation = joi.object({
teamId: joi.string().required(),
});
const getMonitorsByUserIdQueryValidation = joi.object({
const getMonitorsByTeamIdQueryValidation = joi.object({
status: joi.boolean(),
sortOrder: joi.string().valid("asc", "desc"),
limit: joi.number(),
@@ -180,6 +180,7 @@ const getMonitorsByUserIdQueryValidation = joi.object({
const createMonitorBodyValidation = joi.object({
_id: joi.string(),
userId: joi.string().required(),
teamId: joi.string().required(),
name: joi.string().required(),
description: joi.string().required(),
type: joi.string().required(),
@@ -346,8 +347,8 @@ module.exports = {
createMonitorBodyValidation,
getMonitorByIdParamValidation,
getMonitorByIdQueryValidation,
getMonitorsByUserIdValidation,
getMonitorsByUserIdQueryValidation,
getMonitorsByTeamIdValidation,
getMonitorsByTeamIdQueryValidation,
editMonitorBodyValidation,
editUserParamValidation,
editUserBodyValidation,