Add network requests and validation

Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js

@@ -53,14 +53,10 @@ export const getUptimeMonitorsByTeamId = createAsyncThunk(
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await networkService.getMonitorsByTeamId(
+      const res = await networkService.getMonitorsAndSummaryByTeamId(
         token,
         user.teamId,
-        25,
-        ["http", "ping"],
-        null,
-        "desc",
-        true
+        ["http", "ping"]
       );
       return res.data;
     } catch (error) {

Client/src/Utils/NetworkService.js

@@ -58,9 +58,28 @@ class NetworkService {
     });
   }
 
+  async getMonitorsAndSummaryByTeamId(authToken, teamId, types) {
+    const params = new URLSearchParams();
+
+    if (types) {
+      types.forEach((type) => {
+        params.append("type", type);
+      });
+    }
+    return this.axiosInstance.get(
+      `/monitors/team/summary/${teamId}?${params.toString()}`,
+      {
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          "Content-Type": "application/json",
+        },
+      }
+    );
+  }
+
   /**
    * ************************************
-   * Get all uptime monitors for a user
+   * Get all uptime monitors for a Team
    * ************************************
    *
    * @async

Server/controllers/monitorController.js

@@ -4,6 +4,8 @@ const {
   getMonitorsByTeamIdValidation,
   createMonitorBodyValidation,
   editMonitorBodyValidation,
+  getMonitorsAndSumamryByTeamIdParamValidation,
+  getMonitorsAndSummaryByTeamIdQueryValidation,
   getMonitorsByTeamIdQueryValidation,
   pauseMonitorParamValidation,
   getMonitorStatsByIdParamValidation,
@@ -16,10 +18,6 @@ const {
 const sslChecker = require("ssl-checker");
 const SERVICE_NAME = "monitorController";
 const { errorMessages, successMessages } = require("../utils/messages");
-const {
-  getMonitorsAndSummaryByTeamId,
-} = require("../db/mongo/modules/monitorModule");
-
 /**
  * Returns all monitors
  * @async
@@ -197,8 +195,12 @@ const getMonitorById = async (req, res, next) => {
  * @throws {Error}
  */
 
-const getMonitorsAndSumamryByTeamId = async (req, res, next) => {
+const getMonitorsAndSummaryByTeamId = async (req, res, next) => {
   try {
+    await getMonitorsAndSumamryByTeamIdParamValidation.validateAsync(
+      req.params
+    );
+    await getMonitorsAndSummaryByTeamIdQueryValidation.validateAsync(req.query);
     //validation
   } catch (error) {
     error.status = 422;
@@ -212,8 +214,17 @@ const getMonitorsAndSumamryByTeamId = async (req, res, next) => {
   }
 
   try {
-    const { teamId, type } = req.params;
-    await req.db.getMonitorsAndSummaryByTeamId(req, res);
+    const { teamId } = req.params;
+    const { type } = req.query;
+    const monitorsSummary = await req.db.getMonitorsAndSummaryByTeamId(
+      teamId,
+      type
+    );
+    return res.status(200).json({
+      success: true,
+      msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
+      data: monitorsSummary,
+    });
   } catch (error) {
     error.service = SERVICE_NAME;
     error.method === undefined &&

Server/db/mongo/modules/monitorModule.js

@@ -311,19 +311,21 @@ const getMonitorsAndSummaryByTeamId = async (teamId, type) => {
         }
 
         if (monitor.status === false) {
-          acc.up += 1;
+          acc.down += 1;
         }
 
         if (monitor.isActive === false) {
           acc.paused += 1;
         }
+        return acc;
       },
       { up: 0, down: 0, paused: 0 }
     );
+    console.log(monitorCounts);
     monitorCounts.total = monitors.length;
     return { monitors, monitorCounts };
   } catch (error) {
-    error.methodName = "getMonitorsAndSummaryByTeamId";
+    error.method = "getMonitorsAndSummaryByTeamId";
     throw error;
   }
 };

Server/routes/monitorRoute.js

@@ -7,6 +7,10 @@ router.get("/aggregate/:monitorId", monitorController.getMonitorAggregateStats);
 router.get("/stats/:monitorId", monitorController.getMonitorStatsById);
 router.get("/certificate/:monitorId", monitorController.getMonitorCertificate);
 router.get("/:monitorId", monitorController.getMonitorById);
+router.get(
+  "/team/summary/:teamId",
+  monitorController.getMonitorsAndSummaryByTeamId
+);
 router.get("/team/:teamId", monitorController.getMonitorsByTeamId);
 
 router.post(

Server/validation/joi.js

@@ -161,6 +161,19 @@ const getMonitorByIdQueryValidation = joi.object({
   normalize: joi.boolean(),
 });
 
+const getMonitorsAndSumamryByTeamIdParamValidation = joi.object({
+  teamId: joi.string().required(),
+});
+
+const getMonitorsAndSummaryByTeamIdQueryValidation = joi.object({
+  type: joi
+    .alternatives()
+    .try(
+      joi.string().valid("http", "ping", "pagespeed"),
+      joi.array().items(joi.string().valid("http", "ping", "pagespeed"))
+    ),
+});
+
 const getMonitorsByTeamIdValidation = joi.object({
   teamId: joi.string().required(),
 });
@@ -381,6 +394,8 @@ module.exports = {
   createMonitorBodyValidation,
   getMonitorByIdParamValidation,
   getMonitorByIdQueryValidation,
+  getMonitorsAndSumamryByTeamIdParamValidation,
+  getMonitorsAndSummaryByTeamIdQueryValidation,
   getMonitorsByTeamIdValidation,
   getMonitorsByTeamIdQueryValidation,
   getMonitorStatsByIdParamValidation,