Refactor getChecksByUserId to getChecksByTeamId

Client/src/Pages/Incidents/IncidentTable/index.jsx

@@ -46,9 +46,9 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
       try {
         let res;
         if (selectedMonitor === "0") {
-          res = await networkService.getChecksByUser(
+          res = await networkService.getChecksByTeam(
             authToken,
-            user._id,
+            user.teamId,
             "desc",
             null,
             null,

Client/src/Pages/Incidents/index.jsx

@@ -50,14 +50,14 @@ const Incidents = () => {
       setLoading(true);
       const res = await networkService.getMonitorsByTeamId(
         authState.authToken,
-        authState.user._id,
+        authState.user.teamId,
         1,
         null,
         null,
         null,
         null
       );
-
+      console.log(res);
       // Reduce to a lookup object for 0(1) lookup
       if (res.data && res.data.data.length > 0) {
         const monitorLookup = res.data.data.reduce((acc, monitor) => {

Client/src/Utils/NetworkService.js

@@ -409,9 +409,9 @@ class NetworkService {
    * @returns {Promise<AxiosResponse>} The response from the axios GET request.
    *
    */
-  async getChecksByUser(
+  async getChecksByTeam(
     authToken,
-    userId,
+    teamId,
     sortOrder,
     limit,
     dateRange,
@@ -427,7 +427,7 @@ class NetworkService {
     if (page) params.append("page", page);
     if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
     return this.axiosInstance.get(
-      `/checks/user/${userId}?${params.toString()}`,
+      `/checks/team/${teamId}?${params.toString()}`,
       {
         headers: { Authorization: `Bearer ${authToken}` },
       }

Server/controllers/checkController.js

@@ -3,8 +3,8 @@ const {
   createCheckBodyValidation,
   getChecksParamValidation,
   getChecksQueryValidation,
-  getUserChecksParamValidation,
-  getUserChecksQueryValidation,
+  getTeamChecksParamValidation,
+  getTeamChecksQueryValidation,
   deleteChecksParamValidation,
 } = require("../validation/joi");
 const { successMessages } = require("../utils/messages");
@@ -62,10 +62,10 @@ const getChecks = async (req, res, next) => {
   }
 };
 
-const getUserChecks = async (req, res, next) => {
+const getTeamChecks = async (req, res, next) => {
   try {
-    await getUserChecksParamValidation.validateAsync(req.params);
-    await getUserChecksQueryValidation.validateAsync(req.query);
+    await getTeamChecksParamValidation.validateAsync(req.params);
+    await getTeamChecksQueryValidation.validateAsync(req.query);
   } catch (error) {
     error.status = 422;
     error.service = SERVICE_NAME;
@@ -75,7 +75,7 @@ const getUserChecks = async (req, res, next) => {
     return;
   }
   try {
-    const checkData = await req.db.getUserChecks(req);
+    const checkData = await req.db.getTeamChecks(req);
     return res.status(200).json({
       success: true,
       msg: successMessages.CHECK_GET,
@@ -115,6 +115,6 @@ const deleteChecks = async (req, res, next) => {
 module.exports = {
   createCheck,
   getChecks,
-  getUserChecks,
+  getTeamChecks,
   deleteChecks,
 };

Server/db/mongo/MongoDB.js

@@ -92,7 +92,7 @@ const {
   createCheck,
   getChecksCount,
   getChecks,
-  getUserChecks,
+  getTeamChecks,
   deleteChecks,
 } = require("./modules/checkModule");
 
@@ -153,7 +153,7 @@ module.exports = {
   createCheck,
   getChecksCount,
   getChecks,
-  getUserChecks,
+  getTeamChecks,
   deleteChecks,
   createAlert,
   getAlertsByUserId,

Server/db/mongo/modules/checkModule.js

@@ -116,12 +116,12 @@ const getChecks = async (req) => {
   }
 };
 
-const getUserChecks = async (req) => {
-  const { userId } = req.params;
+const getTeamChecks = async (req) => {
+  const { teamId } = req.params;
   let { sortOrder, limit, dateRange, filter, page, rowsPerPage } = req.query;
 
   // Get monitorIDs
-  const userMonitors = await Monitor.find({ userId: userId });
+  const userMonitors = await Monitor.find({ teamId: teamId });
   const monitorIds = userMonitors.map((monitor) => monitor._id);
 
   //Build check query
@@ -189,6 +189,6 @@ module.exports = {
   createCheck,
   getChecksCount,
   getChecks,
-  getUserChecks,
+  getTeamChecks,
   deleteChecks,
 };

Server/routes/checkRoute.js

@@ -9,13 +9,9 @@ router.post(
   checkController.createCheck
 );
 
-router.get(
-  "/:monitorId",
-  verifyOwnership(Monitor, "monitorId"),
-  checkController.getChecks
-);
+router.get("/:monitorId", checkController.getChecks);
 
-router.get("/user/:userId", checkController.getUserChecks);
+router.get("/team/:teamId", checkController.getTeamChecks);
 
 router.delete(
   "/:monitorId",

Server/validation/joi.js

@@ -271,11 +271,11 @@ const getChecksQueryValidation = joi.object({
   rowsPerPage: joi.number(),
 });
 
-const getUserChecksParamValidation = joi.object({
-  userId: joi.string().required(),
+const getTeamChecksParamValidation = joi.object({
+  teamId: joi.string().required(),
 });
 
-const getUserChecksQueryValidation = joi.object({
+const getTeamChecksQueryValidation = joi.object({
   sortOrder: joi.string().valid("asc", "desc"),
   limit: joi.number(),
   dateRange: joi.string().valid("day", "week", "month"),
@@ -364,8 +364,8 @@ module.exports = {
   createCheckBodyValidation,
   getChecksParamValidation,
   getChecksQueryValidation,
-  getUserChecksParamValidation,
-  getUserChecksQueryValidation,
+  getTeamChecksParamValidation,
+  getTeamChecksQueryValidation,
   deleteChecksParamValidation,
   deleteUserParamValidation,
   getPageSpeedCheckParamValidation,